Added catherine and wormhole to config

diff --git a/exec/testcases/xenserver/tc/hotfix.py b/exec/testcases/xenserver/tc/hotfix.py
index 36b6902422205223cc28f03be74aa02091262a39..1c6d9dbe02c7b6b5f8bc5d6f38096fd688c1a588 100755 (executable)
--- a/exec/testcases/xenserver/tc/hotfix.py
+++ b/exec/testcases/xenserver/tc/hotfix.py
@@ -621,26 +621,26 @@ class _BostonBritney(_BostonRTM):
     INITIAL_HOTFIXES = ["XS60E001"]
 
 class _BostonHFd(_BostonRTM):
-    INITIAL_HOTFIXES = ["XS60E001", "XS60E002", "XS60E003", "XS60E004", "XS60E005", "XS60E006", "XS60E007", "XS60E008", "XS60E010", "XS60E012", "XS60E013", "XS60E014", "XS60E015", "XS60E016", "XS60E017", "XS60E018", "XS60E019", "XS60E020", "XS60E021", "XS60E022", "XS60E023", "XS60E024", "XS60E025", "XS60E026", "XS60E027", "XS60E028", "XS60E029", "XS60E030", "XS60E031", "XS60E032", "XS60E033", "XS60E034", "XS60E035", "XS60E036","XS60E037","XS60E038", "XS60E039","XS60E040", "XS60E041", "XS60E042", "XS60E043", "XS60E045", "XS60E046", "XS60E047", "XS60E048", "XS60E049", "XS60E050", "XS60E051", "XS60E052"]
+    INITIAL_HOTFIXES = ["XS60E001", "XS60E002", "XS60E003", "XS60E004", "XS60E005", "XS60E006", "XS60E007", "XS60E008", "XS60E010", "XS60E012", "XS60E013", "XS60E014", "XS60E015", "XS60E016", "XS60E017", "XS60E018", "XS60E019", "XS60E020", "XS60E021", "XS60E022", "XS60E023", "XS60E024", "XS60E025", "XS60E026", "XS60E027", "XS60E028", "XS60E029", "XS60E030", "XS60E031", "XS60E032", "XS60E033", "XS60E034", "XS60E035", "XS60E036","XS60E037","XS60E038", "XS60E039","XS60E040", "XS60E041", "XS60E042", "XS60E043", "XS60E045", "XS60E046", "XS60E047", "XS60E048", "XS60E049", "XS60E050", "XS60E051", "XS60E052", "XS60E053"]
 
 class _SanibelRTM(_Hotfix):
     INITIAL_VERSION = "Sanibel"
     
 class _SanibelHFd(_SanibelRTM):
-    INITIAL_HOTFIXES = ["XS602E004", "XS602E005", "XS602E006", "XS602E007", "XS602E008", "XS602E009", "XS602E010", "XS602E011", "XS602E013", "XS602E014", "XS602E016", "XS602E017", "XS602E018", "XS602E019", "XS602E020", "XS602E021", "XS602E022", "XS602E023", "XS602E024", "XS602E025", "XS602E026", "XS602E027", "XS602E028", "XS602E029", "XS602E030", "XS602E031", "XS602E032", "XS602E033", "XS602E034", "XS602E035", "XS602E036", "XS602E037", "XS602E038", "XS602E039", "XS602E041", "XS602E042", "XS602E043","XS602E044","XS602E045","XS602E046","XS602E047"]
+    INITIAL_HOTFIXES = ["XS602E004", "XS602E005", "XS602E006", "XS602E007", "XS602E008", "XS602E009", "XS602E010", "XS602E011", "XS602E013", "XS602E014", "XS602E016", "XS602E017", "XS602E018", "XS602E019", "XS602E020", "XS602E021", "XS602E022", "XS602E023", "XS602E024", "XS602E025", "XS602E026", "XS602E027", "XS602E028", "XS602E029", "XS602E030", "XS602E031", "XS602E032", "XS602E033", "XS602E034", "XS602E035", "XS602E036", "XS602E037", "XS602E038", "XS602E039", "XS602E041", "XS602E042", "XS602E043","XS602E044","XS602E045","XS602E046","XS602E047", "XS602E048"]
     
 class _SanibelCCRTM(_Hotfix):
     INITIAL_VERSION = "SanibelCC"
     CC = True
     
 class _SanibelCCHFd(_SanibelCCRTM):
-    INITIAL_HOTFIXES = ["XS602ECC001", "XS602ECC002", "XS602ECC003", "XS602ECC004", "XS602ECC005", "XS602ECC006", "XS602ECC007", "XS602ECC008", "XS602ECC009", "XS602ECC010", "XS602ECC011", "XS602ECC012", "XS602ECC013", "XS602ECC014", "XS602ECC015", "XS602ECC017", "XS602ECC018", "XS602ECC019","XS602ECC020","XS602ECC021","XS602ECC022","XS602ECC023"]
+    INITIAL_HOTFIXES = ["XS602ECC001", "XS602ECC002", "XS602ECC003", "XS602ECC004", "XS602ECC005", "XS602ECC006", "XS602ECC007", "XS602ECC008", "XS602ECC009", "XS602ECC010", "XS602ECC011", "XS602ECC012", "XS602ECC013", "XS602ECC014", "XS602ECC015", "XS602ECC017", "XS602ECC018", "XS602ECC019","XS602ECC020","XS602ECC021","XS602ECC022","XS602ECC023", "XS602ECC024"]
 
 class _TampaRTM(_Hotfix):
     INITIAL_VERSION = "Tampa"
     
 class _TampaHFd(_TampaRTM):
-    INITIAL_HOTFIXES = ["XS61E001", "XS61E003", "XS61E004", "XS61E008", "XS61E009", "XS61E010", "XS61E013", "XS61E015", "XS61E017",  "XS61E018", "XS61E019", "XS61E020", "XS61E021", "XS61E022", "XS61E023", "XS61E024", "XS61E025", "XS61E026", "XS61E027", "XS61E028", "XS61E029", "XS61E030", "XS61E032", "XS61E033", "XS61E034", "XS61E035", "XS61E036", "XS61E037", "XS61E038", "XS61E039", "XS61E040", "XS61E041", "XS61E042", "XS61E043", "XS61E044", "XS61E045", "XS61E046", "XS61E047", "XS61E048", "XS61E050", "XS61E051", "XS61E052","XS61E053","XS61E054","XS61E055","XS61E056","XS61E057","XS61E058","XS61E059"]
+    INITIAL_HOTFIXES = ["XS61E001", "XS61E003", "XS61E004", "XS61E008", "XS61E009", "XS61E010", "XS61E013", "XS61E015", "XS61E017",  "XS61E018", "XS61E019", "XS61E020", "XS61E021", "XS61E022", "XS61E023", "XS61E024", "XS61E025", "XS61E026", "XS61E027", "XS61E028", "XS61E029", "XS61E030", "XS61E032", "XS61E033", "XS61E034", "XS61E035", "XS61E036", "XS61E037", "XS61E038", "XS61E039", "XS61E040", "XS61E041", "XS61E042", "XS61E043", "XS61E044", "XS61E045", "XS61E046", "XS61E047", "XS61E048", "XS61E050", "XS61E051", "XS61E052","XS61E053","XS61E054","XS61E055","XS61E056","XS61E057","XS61E058","XS61E059", "XS61E060"]
     
 class _ClearwaterRTM(_Hotfix):
     INITIAL_VERSION = "Clearwater"
@@ -654,21 +654,21 @@ class _ClearwaterSP1(_ClearwaterRTM):
     INITIAL_HOTFIXES = ["XS62ESP1"]
     
 class _ClearwaterSP1HFd(_ClearwaterSP1):
-    INITIAL_HOTFIXES = ["XS62ESP1", "XS62ESP1002", "XS62ESP1003", "XS62ESP1004", "XS62ESP1005", "XS62ESP1006", "XS62ESP1007", "XS62ESP1008", "XS62ESP1009", "XS62ESP1011", "XS62ESP1012", "XS62ESP1013", "XS62ESP1014", "XS62ESP1015", "XS62ESP1016", "XS62ESP1017", "XS62ESP1019", "XS62ESP1020", "XS62ESP1021", "XS62ESP1024", "XS62ESP1025", "XS62ESP1026","XS62ESP1027","XS62ESP1028","XS62ESP1030","XS62ESP1031","XS62ESP1032","XS62ESP1033"]
+    INITIAL_HOTFIXES = ["XS62ESP1", "XS62ESP1002", "XS62ESP1003", "XS62ESP1004", "XS62ESP1005", "XS62ESP1006", "XS62ESP1007", "XS62ESP1008", "XS62ESP1009", "XS62ESP1011", "XS62ESP1012", "XS62ESP1013", "XS62ESP1014", "XS62ESP1015", "XS62ESP1016", "XS62ESP1017", "XS62ESP1019", "XS62ESP1020", "XS62ESP1021", "XS62ESP1024", "XS62ESP1025", "XS62ESP1026","XS62ESP1027","XS62ESP1028","XS62ESP1030","XS62ESP1031","XS62ESP1032","XS62ESP1033", "XS62ESP1034"]
     
 class _CreedenceRTM(_Hotfix):
     INITIAL_VERSION = "Creedence"
     INITIAL_BRANCH = "RTM"
     
 class _CreedenceRTMHFd(_CreedenceRTM):
-    INITIAL_HOTFIXES = ["XS65E001", "XS65E002", "XS65E003", "XS65E005", "XS65E006", "XS65E007", "XS65E008", "XS65E009","XS65E010","XS65E011","XS65E013","XS65E014","XS65E015"]
+    INITIAL_HOTFIXES = ["XS65E001", "XS65E002", "XS65E003", "XS65E005", "XS65E006", "XS65E007", "XS65E008", "XS65E009","XS65E010","XS65E011","XS65E013","XS65E014","XS65E015", "XS65E016", "XS65E017"]
     
 class _CreedenceSP1(_CreedenceRTM):
     INITIAL_BRANCH = "SP1"
     INITIAL_HOTFIXES = ["XS65ESP1"]
     
 class _CreedenceSP1HFd(_CreedenceSP1):
-    INITIAL_HOTFIXES = ["XS65ESP1","XS65ESP1002","XS65ESP1003","XS65ESP1004","XS65ESP1005","XS65ESP1008","XS65ESP1009","XS65ESP1010","XS65ESP1011","XS65ESP1012","XS65ESP1013","XS65ESP1014"]
+    INITIAL_HOTFIXES = ["XS65ESP1","XS65ESP1002","XS65ESP1003","XS65ESP1004","XS65ESP1005","XS65ESP1008","XS65ESP1009","XS65ESP1010","XS65ESP1011","XS65ESP1012","XS65ESP1013","XS65ESP1014", "XS65ESP1016"]
     
     
 # Upgrades

diff --git a/exec/xenrt/config.py b/exec/xenrt/config.py
index d3f214536a3ea01b55d2936d27841acce265fd20..6150256ca35c124f34db5450dd1695482db0e42f 100755 (executable)
--- a/exec/xenrt/config.py
+++ b/exec/xenrt/config.py
@@ -2499,6 +2499,9 @@ class Config(object):
         # BigFootRev2: Security fixes to Xen. Rolls up XS60E014,XS60E018,XS60E020,XS60E023,XS60E024,XS60E026,XS60E028,XS60E029,XS60E033,XS60E034,XS60E035,XS60E037,XS60E039,XS60E040,XS60E042,XS60E045,XS60E046,XS60E047,XS60E048,XS60E049,XS60E050,XS60E051
         self.config["HOTFIXES"]["Boston"]["RTM"]["XS60E052"] = "/usr/groups/release/XenServer-6.x/XS-6.0.0/hotfixes/XS60E052/107944/hotfix-XS60E052/XS60E052.xsupdate"
         
+        # Catherine:  Security fixes to Xen. Rolls up XS60E014,XS60E018,XS60E020,XS60E023,XS60E024,XS60E026,XS60E028,XS60E029,XS60E033,XS60E034,XS60E035,XS60E037,XS60E039,XS60E040,XS60E042,XS60E045,XS60E046,XS60E047,XS60E048,XS60E049,XS60E050,XS60E051,XS60E052 
+        self.config["HOTFIXES"]["Boston"]["RTM"]["XS60E053"] = "/usr/groups/release/XenServer-6.x/XS-6.0.0/hotfixes/XS60E053/108221/hotfix-XS60E053/XS60E053.xsupdate"
+        
          # Sonja xen
         self.config["HOTFIXES"]["Sanibel"]["RTM"]["XS602E004"] = "/usr/groups/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E004/56521/hotfix-XS602E004/XS602E004.xsupdate"
 
@@ -2631,6 +2634,9 @@ class Config(object):
         #BigFootRev2 : Security fixes to Xen. Rolls up XS62E014,XS62E017,XS62ESP1002,XS62ESP1004,XS62ESP1006,XS62ESP1007,XS62ESP1008,XS62ESP1011,XS62ESP1013,XS62ESP1015,XS62ESP1016,XS62ESP1019,XS62ESP1021,XS62ESP1022,XS62ESP1025,XS62ESP1026,XS62ESP1027,XS62ESP1029,XS62ESP1030,XS62ESP1031,XS62ESP1032
         self.config["HOTFIXES"]["Sanibel"]["RTM"]["XS602E047"] = "/usr/groups/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E047/107948/hotfix-XS602E047/XS602E047.xsupdate"
       
+        #Catherine : Security fixes to Xen. Rolls up XS602E001,XS602E003,XS602E004,XS602E005,XS602E007,XS602E008,XS602E011,XS602E013,XS602E014,XS602E016,XS602E017,XS602E018,XS602E020,XS602E021,XS602E022,XS602E023,XS602E0025,XS602E0026,XS602E0027,XS602E0028,XS602E0029,XS602E0030,XS602E0032,XS602E0033,XS602E0034,XS602E0035,XS602E0036,XS602E0038,XS602E0041,XS602E0042,XS602E0043,XS602E0044,XS602E0045,XS602E0046,XS602E0047 
+        self.config["HOTFIXES"]["Sanibel"]["RTM"]["XS602E048"] = "/usr/groups/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E048/108222/hotfix-XS602E048/XS602E048.xsupdate"
+      
         # Adam: sm. Rolls up Nothing
         self.config["HOTFIXES"]["Tampa"]["RTM"]["XS61E001"] = "/usr/groups/release/XenServer-6.x/XS-6.1/hotfixes/XS61E001/61121/hotfix-XS61E001/XS61E001.xsupdate"
       
@@ -2808,6 +2814,9 @@ class Config(object):
         # BigFootRev2: Security fixes to Xen. Rolls up XS61E003,XS61E004,XS61E006,XS61E008,XS61E009,XS61E012,XS61E013,XS61E017,XS61E019,XS61E020,XS61E021,XS61E022,XS61E023,XS61E024,XS61E025,XS61E026,XS61E027,XS61E032,XS61E033,XS61E036,XS61E037,XS61E041,XS61E043,XS61E045,XS61E046,XS61E050,XS61E051,XS61E052,XS61E053,XS61E054,XS61E056,XS61E057,XS61E058 
         self.config["HOTFIXES"]["Tampa"]["RTM"]["XS61E059"] = "/usr/groups/release/XenServer-6.x/XS-6.1/hotfixes/XS61E059/107952/hotfix-XS61E059/XS61E059.xsupdate"
         
+        # Catherine: Security fixes to Xen. Rolls up  XS61E003,XS61E004,XS61E006,XS61E008,XS61E009,XS61E012,XS61E013,XS61E017,XS61E019,XS61E020,XS61E021,XS61E022,XS61E023,XS61E024,XS61E025,XS61E026,XS61E027,XS61E032,XS61E033,XS61E036,XS61E037,XS61E041,XS61E043,XS61E045,XS61E046,XS61E050,XS61E051,XS61E052,XS61E053,XS61E054,XS61E056,XS61E057,XS61E058,XS61E059 
+        self.config["HOTFIXES"]["Tampa"]["RTM"]["XS61E060"] = "/usr/groups/release/XenServer-6.x/XS-6.1/hotfixes/XS61E060/108224/hotfix-XS61E060/XS61E060.xsupdate"
+        
         # Viola: Xen 
         self.config["HOTFIXES"]["SanibelCC"]["RTM"]["XS602ECC001"] = "/usr/groups/release/XenServer-6.x/sweeney/hotfixes/XS602ECC001/61625/hotfix-XS602ECC001/XS602ECC001.xsupdate"
       
@@ -2876,6 +2885,9 @@ class Config(object):
         # BigFootRev2 - Security fixes to Xen. Rolls up  XS602ECC001,XS602ECC002,XS602ECC003,XS602ECC005,XS602ECC006,XS602ECC007,XS602ECC008,XS602ECC011,XS602ECC012,XS602ECC014,XS602ECC017,XS602ECC018,XS602ECC019,XS602ECC020,XS602ECC021,XS602ECC022
         self.config["HOTFIXES"]["SanibelCC"]["RTM"]["XS602ECC023"] = "/usr/groups/release/XenServer-6.x/sweeney/hotfixes/XS602ECC023/107946/hotfix-XS602ECC023/XS602ECC023.xsupdate"
         
+        # Catherine - Security fixes to Xen. Rolls up   XS602ECC001,XS602ECC002,XS602ECC003,XS602ECC005,XS602ECC006,XS602ECC007,XS602ECC008,XS602ECC011,XS602ECC012,XS602ECC014,XS602ECC017,XS602ECC018,XS602ECC019,XS602ECC020,XS602ECC021,XS602ECC022,XS602ECC023 
+        self.config["HOTFIXES"]["SanibelCC"]["RTM"]["XS602ECC024"] = "/usr/groups/release/XenServer-6.x/sweeney/hotfixes/XS602ECC024/108223/hotfix-XS602ECC024/XS602ECC024.xsupdate"
+        
         # vGPU Tech Preview hotfix, Rolls up XS62E001 and XS62E002
         self.config["HOTFIXES"]["Clearwater"]["RTM"]["XS62ETP001"] = "/usr/groups/release/XenServer-6.x/XS-6.2/tech-preview/hotfix-XS62ETP001/XS62ETP001.xsupdate"
       
@@ -3027,6 +3039,9 @@ class Config(object):
         # BigFootRev2: Security fixes to Xen. Rolls up  XS62E014,XS62E017,XS62ESP1002,XS62ESP1004,XS62ESP1006,XS62ESP1007,XS62ESP1008,XS62ESP1011,XS62ESP1013,XS62ESP1015,XS62ESP1016,XS62ESP1019,XS62ESP1021,XS62ESP1022,XS62ESP1025,XS62ESP1026,XS62ESP1027,XS62ESP1029,XS62ESP1030,XS62ESP1031,XS62ESP1032 
         self.config["HOTFIXES"]["Clearwater"]["SP1"]["XS62ESP1033"] = "/usr/groups/release/XenServer-6.x/XS-6.2-SP1/hotfixes/XS62ESP1033/107949/hotfix-XS62ESP1033/XS62ESP1033.xsupdate"
         
+        # Catherine: Security fixes to Xen. Rolls up   XS62E014,XS62E017,XS62ESP1002,XS62ESP1004,XS62ESP1006,XS62ESP1007,XS62ESP1008,XS62ESP1011,XS62ESP1013,XS62ESP1015,XS62ESP1016,XS62ESP1019,XS62ESP1021,XS62ESP1022,XS62ESP1025,XS62ESP1026,XS62ESP1027,XS62ESP1029,XS62ESP1030,XS62ESP1031,XS62ESP1032,XS62ESP1033 
+        self.config["HOTFIXES"]["Clearwater"]["SP1"]["XS62ESP1034"] = "/usr/groups/release/XenServer-6.x/XS-6.2-SP1/hotfixes/XS62ESP1034/108226/hotfix-XS62ESP1034/XS62ESP1034.xsupdate"
+        
         #Creedence hotfixes
         # Gloss: XenCenter, Rolls up nothing
         self.config["HOTFIXES"]["Creedence"]["RTM"]["XS65E001"] = "/usr/groups/release/XenServer-6.x/XS-6.5/hotfixes/XS65E001/91026/hotfix-XS65E001/XS65E001.xsupdate"
@@ -3068,6 +3083,12 @@ class Config(object):
         # BigFootRev2 : Security fixes to Xen.  Rolls up XS65E006,XS65E007,XS65E009,XS65E010,XS65E013, XS65E014 
         self.config["HOTFIXES"]["Creedence"]["RTM"]["XS65E015"] = "/usr/groups/release/XenServer-6.x/XS-6.5/hotfixes/XS65E015/107947/hotfix-XS65E015/XS65E015.xsupdate"
         
+        # WormHole :  Xen Fix for Netscaler SDX .Rolls up  XS65E006,XS65E007,XS65E009,XS65E010,XS65E013, XS65E014, XS65E015 
+        self.config["HOTFIXES"]["Creedence"]["RTM"]["XS65E016"] = "/usr/groups/release/XenServer-6.x/XS-6.5/hotfixes/XS65E016/108030/hotfix-XS65E016/XS65E016.xsupdate"
+        
+        # Catherine : Security fixes to Xen.  Rolls up  XS65E006,XS65E007,XS65E009,XS65E010,XS65E013, XS65E014, XS65E015, XS65E016 
+        self.config["HOTFIXES"]["Creedence"]["RTM"]["XS65E017"] = "/usr/groups/release/XenServer-6.x/XS-6.5/hotfixes/XS65E017/108228/hotfix-XS65E017/XS65E017.xsupdate"
+        
         # 6.5 SP1 (Cream) - start of SP1 branch, rolls up all previous hotfixes (till XS65E008)
         self.config["HOTFIXES"]["Creedence"]["SP1"]["XS65ESP1"] = "/usr/groups/release/XenServer-6.x/XS-6.5-SP1/RTM-101064/hotfix-XS65ESP1/XS65ESP1.xsupdate"
         self.config["TOOLS_HOTFIXES"]["Creedence"]["SP1"].append("XS65ESP1")
@@ -3110,6 +3131,9 @@ class Config(object):
         
         # BigFootRev2 : Security fixes to Xen. Rolls up  XS65E009,XS65E010,XS65E013,XS65E014,XS65E015, XS65ESP1002,XS65ESP1004,XS65ESP1008, XS65ESP1009, XS65ESP1011 
         self.config["HOTFIXES"]["Creedence"]["SP1"]["XS65ESP1014"] = "/usr/groups/release/XenServer-6.x/XS-6.5-SP1/hotfixes/XS65ESP1014/107953/hotfix-XS65ESP1014/XS65ESP1014.xsupdate"
+        
+        # BigFootRev2 : Security fixes to Xen. Rolls up  XS65E009,XS65E010,XS65E013,XS65E014,XS65E015,XS65E016,XS65E017,XS65ESP1002,XS65ESP1004,XS65ESP1008, XS65ESP1009, XS65ESP1011,XS65ESP1014  
+        self.config["HOTFIXES"]["Creedence"]["SP1"]["XS65ESP1016"] = "/usr/groups/release/XenServer-6.x/XS-6.5-SP1/hotfixes/XS65ESP1016/108231/hotfix-XS65ESP1016/XS65ESP1016.xsupdate"
         return
 
     def setSecondaryVariables(self):
@@ -3221,7 +3245,7 @@ class Config(object):
         self.config["CARBON_PATCHES_BOSTON"]["HF38"] = self.config["HOTFIXES"]["Boston"]["RTM"]["XS60E038"]
         self.config["CARBON_PATCHES_BOSTON"]["HF41"] = self.config["HOTFIXES"]["Boston"]["RTM"]["XS60E041"]
         self.config["CARBON_PATCHES_BOSTON"]["HF43"] = self.config["HOTFIXES"]["Boston"]["RTM"]["XS60E043"]
-        self.config["CARBON_PATCHES_BOSTON"]["HF52"] = self.config["HOTFIXES"]["Boston"]["RTM"]["XS60E052"]
+        self.config["CARBON_PATCHES_BOSTON"]["HF53"] = self.config["HOTFIXES"]["Boston"]["RTM"]["XS60E053"]
         
         if not self.config.has_key("CARBON_PATCHES_SANIBEL"):
             self.config["CARBON_PATCHES_SANIBEL"] = {}
@@ -3232,7 +3256,7 @@ class Config(object):
         self.config["CARBON_PATCHES_SANIBEL"]["HF31"] = self.config["HOTFIXES"]["Sanibel"]["RTM"]["XS602E031"]
         self.config["CARBON_PATCHES_SANIBEL"]["HF37"] = self.config["HOTFIXES"]["Sanibel"]["RTM"]["XS602E037"]
         self.config["CARBON_PATCHES_SANIBEL"]["HF39"] = self.config["HOTFIXES"]["Sanibel"]["RTM"]["XS602E039"]
-        self.config["CARBON_PATCHES_SANIBEL"]["HF47"] = self.config["HOTFIXES"]["Sanibel"]["RTM"]["XS602E047"]
+        self.config["CARBON_PATCHES_SANIBEL"]["HF48"] = self.config["HOTFIXES"]["Sanibel"]["RTM"]["XS602E048"]
         
         if not self.config.has_key("CARBON_PATCHES_SANIBELCC"):
             self.config["CARBON_PATCHES_SANIBELCC"] = {}
@@ -3241,7 +3265,7 @@ class Config(object):
         self.config["CARBON_PATCHES_SANIBELCC"]["HF10"] = self.config["HOTFIXES"]["SanibelCC"]["RTM"]["XS602ECC010"]
         self.config["CARBON_PATCHES_SANIBELCC"]["HF13"] = self.config["HOTFIXES"]["SanibelCC"]["RTM"]["XS602ECC013"]
         self.config["CARBON_PATCHES_SANIBELCC"]["HF15"] = self.config["HOTFIXES"]["SanibelCC"]["RTM"]["XS602ECC015"]
-        self.config["CARBON_PATCHES_SANIBELCC"]["HF23"] = self.config["HOTFIXES"]["SanibelCC"]["RTM"]["XS602ECC023"]
+        self.config["CARBON_PATCHES_SANIBELCC"]["HF24"] = self.config["HOTFIXES"]["SanibelCC"]["RTM"]["XS602ECC024"]
         
         if not self.config.has_key("CARBON_PATCHES_TAMPA"):
             self.config["CARBON_PATCHES_TAMPA"] = {}
@@ -3253,7 +3277,7 @@ class Config(object):
         self.config["CARBON_PATCHES_TAMPA"]["HF47"] = self.config["HOTFIXES"]["Tampa"]["RTM"]["XS61E047"]
         self.config["CARBON_PATCHES_TAMPA"]["HF48"] = self.config["HOTFIXES"]["Tampa"]["RTM"]["XS61E048"]
         self.config["CARBON_PATCHES_TAMPA"]["HF55"] = self.config["HOTFIXES"]["Tampa"]["RTM"]["XS61E055"]
-        self.config["CARBON_PATCHES_TAMPA"]["HF59"] = self.config["HOTFIXES"]["Tampa"]["RTM"]["XS61E059"]
+        self.config["CARBON_PATCHES_TAMPA"]["HF60"] = self.config["HOTFIXES"]["Tampa"]["RTM"]["XS61E060"]
         
         if not self.config.has_key("CARBON_PATCHES_CLEARWATER"):
             self.config["CARBON_PATCHES_CLEARWATER"] = {}
@@ -3272,7 +3296,7 @@ class Config(object):
             self.config["CARBON_PATCHES_CLEARWATER"]["HF17"] = self.config["HOTFIXES"]["Clearwater"]["SP1"]["XS62ESP1017"]
             self.config["CARBON_PATCHES_CLEARWATER"]["HF24"] = self.config["HOTFIXES"]["Clearwater"]["SP1"]["XS62ESP1024"]
             self.config["CARBON_PATCHES_CLEARWATER"]["HF28"] = self.config["HOTFIXES"]["Clearwater"]["SP1"]["XS62ESP1028"]
-            self.config["CARBON_PATCHES_CLEARWATER"]["HF33"] = self.config["HOTFIXES"]["Clearwater"]["SP1"]["XS62ESP1033"]
+            self.config["CARBON_PATCHES_CLEARWATER"]["HF34"] = self.config["HOTFIXES"]["Clearwater"]["SP1"]["XS62ESP1034"]
             
         if not self.config.has_key("CARBON_PATCHES_CREEDENCE"):
             self.config["CARBON_PATCHES_CREEDENCE"] = {}
@@ -3292,7 +3316,7 @@ class Config(object):
             self.config["CARBON_PATCHES_CREEDENCE"]["HF10"] = self.config["HOTFIXES"]["Creedence"]["SP1"]["XS65ESP1010"]
             self.config["CARBON_PATCHES_CREEDENCE"]["HF12"] = self.config["HOTFIXES"]["Creedence"]["SP1"]["XS65ESP1012"]
             self.config["CARBON_PATCHES_CREEDENCE"]["HF13"] = self.config["HOTFIXES"]["Creedence"]["SP1"]["XS65ESP1013"]
-            self.config["CARBON_PATCHES_CREEDENCE"]["HF14"] = self.config["HOTFIXES"]["Creedence"]["SP1"]["XS65ESP1014"]
+            self.config["CARBON_PATCHES_CREEDENCE"]["HF16"] = self.config["HOTFIXES"]["Creedence"]["SP1"]["XS65ESP1016"]
 
             
     def readFromFile(self, filename, path=None):

diff --git a/seqs/dundeeWindowsToolsUpgradeStaticIP2.seq b/seqs/dundeeWindowsToolsUpgradeStaticIP2.seq
index 2ac4690da91ed8059ad1c4c0064f6af026111804..53667340111fce09c781b21e9e94bfcda10cbd48 100644 (file)
--- a/seqs/dundeeWindowsToolsUpgradeStaticIP2.seq
+++ b/seqs/dundeeWindowsToolsUpgradeStaticIP2.seq
@@ -78,13 +78,13 @@
         <arg>input=DEFAULT</arg>
       </testcase>
     </serial>
-    <parallel group="UpgVM">
+    <serial group="UpgVM">
       <testcase id="xenserver.tc.upgrade.TC15223"/>
       <testcase id="xenserver.tc.upgrade.TC15225"/>
       <testcase id="xenserver.tc.upgrade.TC15227"/>
       <testcase id="xenserver.tc.upgrade.TC15229"/>
       <testcase id="xenserver.tc.upgrade.TC15230"/>
-    </parallel>
+    </serial>
   </testsequence>
 
 </xenrt>

diff --git a/seqs/dundeeWindowsToolsUpgradeStaticIP3.seq b/seqs/dundeeWindowsToolsUpgradeStaticIP3.seq
index 43b29da6f7b485dfa58e44dc1c88b4e3ad80059c..aa99dadaa6e24c5aa1e2af5f6cd79132a0b0eaf5 100644 (file)
--- a/seqs/dundeeWindowsToolsUpgradeStaticIP3.seq
+++ b/seqs/dundeeWindowsToolsUpgradeStaticIP3.seq
@@ -108,7 +108,7 @@
         <arg>input=DEFAULT</arg>
       </testcase>
     </serial>
-    <parallel group="UpgVM">
+    <serial group="UpgVM">
       <testcase id="xenserver.tc.upgrade.TC19900" sku="RTM" name="TC19900_RTM"/>
       <testcase id="xenserver.tc.upgrade.TC19901" sku="RTM" name="TC19901_RTM"/>
       <testcase id="xenserver.tc.upgrade.TC19902" sku="RTM" name="TC19902_RTM"/>
@@ -117,7 +117,7 @@
       <testcase id="xenserver.tc.upgrade.TC20717" sku="RTM" name="TC20717_RTM"/>
       <testcase id="xenserver.tc.upgrade.TC20718" sku="RTM" name="TC20718_RTM"/>
       <testcase id="xenserver.tc.upgrade.TC20719" sku="RTM" name="TC20719_RTM"/>
-    </parallel>
+    </serial>
   </testsequence>
 
 </xenrt>

diff --git a/seqs/dundeeWindowsToolsUpgradeStaticIPv6.seq b/seqs/dundeeWindowsToolsUpgradeStaticIPv6.seq
index 79465293ab6d8064e5a666927f3481001d3044a7..60454b7d7459054d987646585cb81cb3f534406b 100644 (file)
--- a/seqs/dundeeWindowsToolsUpgradeStaticIPv6.seq
+++ b/seqs/dundeeWindowsToolsUpgradeStaticIPv6.seq
@@ -60,11 +60,11 @@
         <arg>input=DEFAULT</arg>
       </testcase>
     </serial>
-    <parallel group="UpgVM">
+    <serial group="UpgVM">
       <testcase id="xenserver.tc.upgrade.TC18826"/>
       <testcase id="xenserver.tc.upgrade.TC18827"/>
       <testcase id="xenserver.tc.upgrade.TC18829"/>
-    </parallel>
+    </serial>
   </testsequence>
 
 </xenrt>