From: Vinod Pademar <vinod.pademar@citrix.com>
Date: Fri, 20 Nov 2015 12:43:52 +0000 (+0000)
Subject: After a guest reboot, Ubuntu containers goes offline which was not the case earlier
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0d9e8506bdef2b4db52a8088d41f5a82cd707148;p=xenrt-citrix%2Fxenrt.git

After a guest reboot, Ubuntu containers goes offline which was not the case earlier
---

diff --git a/exec/testcases/xenserver/tc/docker.py b/exec/testcases/xenserver/tc/docker.py
index 3ad97a847..3f3b98adb 100644
--- a/exec/testcases/xenserver/tc/docker.py
+++ b/exec/testcases/xenserver/tc/docker.py
@@ -50,6 +50,11 @@ class TCContainerLifeCycle(TCDockerBase):
         # Create some containers (say 5) of your choice in every guest.
         [docker.createContainer(ContainerType.SLEEP_BUSYBOX) for cnum in range(self.NO_OF_CONTAINERS) for docker in self.docker]
 
+    def startAllContainers(self):
+
+        # After a guest reboot/shutdown all the running containers goes offline.
+        [docker.startAllContainers() for docker in self.docker]
+
     def lifeCycleDockerContainers(self):
 
         # Lifecycle tests on all containers in every guest.
@@ -78,16 +83,6 @@ class TCGuestsLifeCycle(TCContainerLifeCycle):
             guest.start()
             xenrt.sleep(90)
 
-    def startAllContainers(self, arglist):
-
-        args = self.parseArgsKeyValue(arglist)
-
-        # After a guest reboot/shutdown all the running containers goes offline.
-        if args.has_key('containersstarted') and args["containersstarted"].lower() == "yes": 
-            pass # exception in case of Ubuntu guests.
-        else:
-            [docker.startAllContainers() for docker in self.docker]
-
     def run(self, arglist=None):
 
         xenrt.TEC().logverbose("Create enough containers in every guests")
@@ -99,8 +94,8 @@ class TCGuestsLifeCycle(TCContainerLifeCycle):
         xenrt.TEC().logverbose("Guests [having docker containers] Life Cycle Operations")
         self.lifeCycleDockerGuest()
 
-        # The running containers goes offline after a reboot, except in case of Ubuntu.
-        self.startAllContainers(arglist)
+        xenrt.TEC().logverbose("Starting containers again which goes offline after a reboot")
+        self.startAllContainers()
 
         xenrt.TEC().logverbose("Perform life cycle operations on all containers after guests reboots")
         self.lifeCycleDockerContainers()
@@ -128,8 +123,8 @@ class TCGuestsMigration(TCGuestsLifeCycle):
         xenrt.TEC().logverbose("Life Cycle Operations of guest before migrating to slave")
         self.lifeCycleDockerGuest()
 
-        # The running containers goes offline after a reboot, except in case of Ubuntu.
-        self.startAllContainers(arglist)
+        xenrt.TEC().logverbose("Starting containers again which goes offline after a reboot")
+        self.startAllContainers()
 
         xenrt.TEC().logverbose("Perform life cycle operations on all containers - (2)")
         self.lifeCycleDockerContainers()
@@ -143,8 +138,8 @@ class TCGuestsMigration(TCGuestsLifeCycle):
         xenrt.TEC().logverbose("Life Cycle Operations of guest after migrating to slave")
         self.lifeCycleDockerGuest()
 
-        # The running containers goes offline after a reboot, except in case of Ubuntu.
-        self.startAllContainers(arglist)
+        xenrt.TEC().logverbose("Starting containers again which goes offline after a reboot")
+        self.startAllContainers()
 
         xenrt.TEC().logverbose("Perform life cycle operations on all containers - (4)")
         self.lifeCycleDockerContainers()
@@ -158,8 +153,8 @@ class TCGuestsMigration(TCGuestsLifeCycle):
         xenrt.TEC().logverbose("Life Cycle Operations of guest after migrating back to master")
         self.lifeCycleDockerGuest()
 
-        # The running containers goes offline after a reboot, except in case of Ubuntu.
-        self.startAllContainers(arglist)
+        xenrt.TEC().logverbose("Starting containers again which goes offline after a reboot")
+        self.startAllContainers()
 
         xenrt.TEC().logverbose("Perform life cycle operations on all containers - (6)")
         self.lifeCycleDockerContainers()
diff --git a/seqs/dundeedockerubuntu14.seq b/seqs/dundeedockerubuntu14.seq
index 6b6eff9df..413ee09c1 100644
--- a/seqs/dundeedockerubuntu14.seq
+++ b/seqs/dundeedockerubuntu14.seq
@@ -30,9 +30,7 @@
     <serial group="Ubuntu14">
 
       <testcase id="xenserver.tc.docker.TCContainerLifeCycle" tc="TC-23918" name="ContainerLifeCycle" sku="Ubuntu14" />
-      <testcase id="xenserver.tc.docker.TCGuestsLifeCycle" tc="TC-26443" name="GuestsLifeCycle" sku="Ubuntu14">
-        <arg>containersstarted=yes</arg>
-      </testcase>
+      <testcase id="xenserver.tc.docker.TCGuestsLifeCycle" tc="TC-26443" name="GuestsLifeCycle" sku="Ubuntu14" />
       <testcase id="xenserver.tc.docker.TCScaleContainers" tc="TC-26523" name="ScaleContainers" sku="Ubuntu14" />
 
     </serial>