<div dir="ltr">Signed-off-by: Ryan Goodfellow <<a href="mailto:rgoodfel@isi.edu">rgoodfel@isi.edu</a>> </div><div class="gmail_extra"> <div class="gmail_quote">On Mon, Mar 5, 2018 at 4:25 AM, Daniel P. Berrangé <<a href="mailto:berrange@redhat.com" target="_blank">berrange@redhat.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Sun, Mar 04, 2018 at 10:41:43AM -0500, Ryan Goodfellow wrote: > The current behavior is to generate a type="vnc" tag in the <graphics> > element generated from either a DomainGrapicRDP or DomainGraphicDesktop. > The correct tags should be type="rdp" and type="desktop" respectively. > This commit emits the correct tags and adds a test for correct graphics > device tagging. The patch looks good, but we recently started to require all contributors to indicate their compliance with the DCO <a href="https://developercertificate.org/" rel="noreferrer" target="_blank">https://developercertificate.org/</a> you can do this by simply by adding 'Signed-off-by: Your Name <your@email>' in commit message for patches you submit - in this case no need to re-submit the patch - just reply to my email here with a Signed-off-by under your name and then I'll merge it. <div><div class="h5"> > --- > domain.go | 4 ++-- > domain_test.go | 26 ++++++++++++++++++++++++++ > 2 files changed, 28 insertions(+), 2 deletions(-) > > diff --git a/domain.go b/domain.go > index ea53dfc..1de4ade 100644 > --- a/domain.go > +++ b/domain.go > @@ -4226,12 +4226,12 @@ func (a *DomainGraphic) MarshalXML(e *xml.Encoder, start xml.StartElement) error > return e.EncodeElement(a.VNC, start) > } else if a.RDP != nil { > start.Attr = append(start.Attr, xml.Attr{ > - xml.Name{Local: "type"}, "vnc", > + xml.Name{Local: "type"}, "rdp", > }) > return e.EncodeElement(a.RDP, start) > } else if a.Desktop != nil { > start.Attr = append(start.Attr, xml.Attr{ > - xml.Name{Local: "type"}, "vnc", > + xml.Name{Local: "type"}, "desktop", > }) > return e.EncodeElement(a.Desktop, start) > } else if a.Spice != nil { > diff --git a/domain_test.go b/domain_test.go > index 7c9d3a2..1715e01 100644 > --- a/domain_test.go > +++ b/domain_test.go > @@ -3782,6 +3782,32 @@ var domainTestData = []struct { > `</domain>`, > }, > }, > + { > + Object: &Domain{ > + Name: "demo", > + Devices: &DomainDeviceList{ > + Graphics: []DomainGraphic{ > + DomainGraphic{SDL: &DomainGraphicSDL{}}, > + DomainGraphic{VNC: &DomainGraphicVNC{}}, > + DomainGraphic{RDP: &DomainGraphicRDP{}}, > + DomainGraphic{Desktop: &DomainGraphicDesktop{}}, > + DomainGraphic{Spice: &DomainGraphicSpice{}}, > + }, > + }, > + }, > + Expected: []string{ > + `<domain>`, > + ` <name>demo</name>`, > + ` <devices>`, > + ` <graphics type="sdl"></graphics>`, > + ` <graphics type="vnc"></graphics>`, > + ` <graphics type="rdp"></graphics>`, > + ` <graphics type="desktop"></graphics>`, > + ` <graphics type="spice"></graphics>`, > + ` </devices>`, > + `</domain>`, > + }, > + }, > } > > func TestDomain(t *testing.T) { > -- > 2.14.3 > </div></div>> -- > libvir-list mailing list > <a href="mailto:libvir-list@redhat.com">libvir-list@redhat.com</a> > <a href="https://www.redhat.com/mailman/listinfo/libvir-list" rel="noreferrer" target="_blank">https://www.redhat.com/mailman/listinfo/libvir-list</a> Regards, Daniel -- |: <a href="https://berrange.com" rel="noreferrer" target="_blank">https://berrange.com</a> -o- <a href="https://www.flickr.com/photos/dberrange" rel="noreferrer" target="_blank">https://www.flickr.com/photos/dberrange</a> :| |: <a href="https://libvirt.org" rel="noreferrer" target="_blank">https://libvirt.org</a> -o- <a href="https://fstop138.berrange.com" rel="noreferrer" target="_blank">https://fstop138.berrange.com</a> :| |: <a href="https://entangle-photo.org" rel="noreferrer" target="_blank">https://entangle-photo.org</a> -o- <a href="https://www.instagram.com/dberrange" rel="noreferrer" target="_blank">https://www.instagram.com/dberrange</a> :| -- libvir-list mailing list <a href="mailto:libvir-list@redhat.com">libvir-list@redhat.com</a> <a href="https://www.redhat.com/mailman/listinfo/libvir-list" rel="noreferrer" target="_blank">https://www.redhat.com/mailman/listinfo/libvir-list</a> </blockquote></div> -- <div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr">ry@isi</div></div></div></div> </div>