Merge "pass user_data to heat template"

[yardstick.git] / yardstick / benchmark / contexts / model.py

diff --git a/yardstick/benchmark/contexts/model.py b/yardstick/benchmark/contexts/model.py
index 8cf3b62..816ec79 100644 (file)
--- a/yardstick/benchmark/contexts/model.py
+++ b/yardstick/benchmark/contexts/model.py
@@ -105,6 +105,8 @@ class Network(Object):
         self.subnet_stack_name = self.stack_name + "-subnet"
         self.subnet_cidr = attrs.get('cidr', '10.0.1.0/24')
         self.router = None
+        self.physical_network = attrs.get('physical_network', 'physnet1')
+        self.provider = attrs.get('provider', None)
 
         if "external_network" in attrs:
             self.router = Router("router", self.name,
@@ -148,13 +150,14 @@ class Server(Object):     # pragma: no cover
         self.context = context
         self.public_ip = None
         self.private_ip = None
+        self.user_data = ''
 
         if attrs is None:
             attrs = {}
 
         self.placement_groups = []
         placement = attrs.get("placement", [])
-        placement = placement if type(placement) is list else [placement]
+        placement = placement if isinstance(placement, list) else [placement]
         for p in placement:
             pg = PlacementGroup.get(p)
             if not pg:
@@ -166,7 +169,7 @@ class Server(Object):     # pragma: no cover
         # support servergroup attr
         self.server_group = None
         sg = attrs.get("server_group")
-        if (sg):
+        if sg:
             server_group = ServerGroup.get(sg)
             if not server_group:
                 raise ValueError("server '%s', server_group '%s' is invalid" %
@@ -200,6 +203,8 @@ class Server(Object):     # pragma: no cover
         if "flavor" in attrs:
             self._flavor = attrs["flavor"]
 
+        self.user_data = attrs.get('user_data', '')
+
         Server.list.append(self)
 
     @property
@@ -226,7 +231,8 @@ class Server(Object):     # pragma: no cover
             self.ports[network.name] = {"stack_name": port_name}
             template.add_port(port_name, network.stack_name,
                               network.subnet_stack_name,
-                              sec_group_id=self.secgroup_name)
+                              sec_group_id=self.secgroup_name,
+                              provider=network.provider)
             port_name_list.append(port_name)
 
             if self.floating_ip:
@@ -249,6 +255,7 @@ class Server(Object):     # pragma: no cover
                             ports=port_name_list,
                             user=self.user,
                             key_name=self.keypair_name,
+                            user_data=self.user_data,
                             scheduler_hints=scheduler_hints)
 
     def add_to_template(self, template, networks, scheduler_hints=None):