Add guestagent connected test

Adds the guestagent connected test. Work based on work done by rmohr. Remove GuestAgent event When calling the event callback event can be nil. Added condition for this case. Unify functional tests for agent Final grooming for the guestagent tests Signed-off-by: Petr Kotas <[email protected]>
rsevilla87 · Nov 8, 2018 · f00b1fe · f00b1fe
1 parent a687646
commit f00b1fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/images/cdi-http-import-server/Dockerfile b/images/cdi-http-import-server/Dockerfile
@@ -21,14 +21,15 @@ FROM fedora:27
 LABEL maintainer="The KubeVirt Project <[email protected]>"
 ENV container docker
 
-RUN dnf install -y nginx \
+RUN dnf install -y nginx qemu-guest-agent \
     && dnf -y clean all
 
 RUN mkdir -p /usr/share/nginx/html/images \
     && curl http://dl-cdn.alpinelinux.org/alpine/v3.7/releases/x86_64/alpine-virt-3.7.0-x86_64.iso > /usr/share/nginx/html/images/alpine.iso \
     && rm -f /etc/nginx/nginx.conf
 
+RUN cp /usr/bin/qemu-ga /usr/share/nginx/html/
+
 ADD nginx.conf /etc/nginx/
 
 EXPOSE 80
-
diff --git a/pkg/virt-launcher/notify-client/client.go b/pkg/virt-launcher/notify-client/client.go
@@ -24,9 +24,8 @@ type DomainEventClient struct {
 }
 
 type LibvirtEvent struct {
-	Domain     string
-	Event      *libvirt.DomainEventLifecycle
-	AgentEvent *libvirt.DomainEventAgentLifecycle
+	Domain string
+	Event  *libvirt.DomainEventLifecycle
 }
 
 func NewDomainEventClient(virtShareDir string) (*DomainEventClient, error) {