Merge "Closes-Bug: #1640464 - Kernel Upgrade flag not set in new para…

…ms format (SMLITE)" into R3.1
Juniper · Nov 10, 2016 · 0039176 · 0039176
2 parents 2afb891 + fe9464d
commit 0039176
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/client/testbed_parser.py b/src/client/testbed_parser.py
@@ -657,18 +657,19 @@ def __init__(self, testsetup, **kwargs):
     def _initialize(self, hostobj):
         # set kernel upgrade 'yes' by default
         kernel_upgrade_flag = self.testsetup.testbed.env.get('kernel_upgrade', True)
+        kernel_version = self.testsetup.testbed.env.get('kernel_version', None)
         if kernel_upgrade_flag:
-            kernel_upgrade = 'yes'
+            kernel_upgrade =  True
         else:
-            kernel_upgrade = 'no'
+            kernel_upgrade = False
+        if not kernel_version:
+            kernel_version = ''
         server_dict = {"id": hostobj.hostname,
                        "roles": hostobj.roles,
                        "cluster_id": self.cluster_id,
                        "password": hostobj.password,
                        "domain": hostobj.domain_name,
-                       "parameters": {
-                           "kernel_upgrade" : kernel_upgrade,
-                            },
+                       "parameters": {},
                        "network": {
                            "management_interface": hostobj.interface,
                            "provisioning": "kickstart",
@@ -683,6 +684,8 @@ def _initialize(self, hostobj):
                         }
         server_dict['parameters']['provision'] = {}
         server_dict['parameters']['provision']['contrail'] = {}
+        server_dict['parameters']['provision']['contrail']['kernel_upgrade'] = kernel_upgrade
+        server_dict['parameters']['provision']['contrail']['kernel_version'] = str(kernel_version)
         server_dict['parameters']['provision']['contrail']['storage'] = {}
         server_dict['parameters']['provision']['contrail']['compute'] = {}
         static_route_list = []