Merge "This patch is used to update the time range in dashboard config from "now...

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

diff --git a/yardstick/benchmark/contexts/model.py b/yardstick/benchmark/contexts/model.py
index 91020b9..d31f4af 100644 (file)
--- a/yardstick/benchmark/contexts/model.py
+++ b/yardstick/benchmark/contexts/model.py
@@ -118,6 +118,7 @@ class Server(Object):
         self.stack_name = self.name + "." + context.name
         self.keypair_name = context.keypair_name
         self.secgroup_name = context.secgroup_name
+        self.user = context.user
         self.context = context
         self.public_ip = None
         self.private_ip = None
@@ -144,8 +145,10 @@ class Server(Object):
         self.ports = {}
 
         self.floating_ip = None
+        self.floating_ip_assoc = None
         if "floating_ip" in attrs:
             self.floating_ip = {}
+            self.floating_ip_assoc = {}
 
         if self.floating_ip is not None:
             ext_net = Network.find_external_network()
@@ -198,9 +201,16 @@ class Server(Object):
                                              port_name,
                                              network.router.stack_if_name,
                                              self.secgroup_name)
+                    self.floating_ip_assoc["stack_name"] = \
+                        server_name + "-fip-assoc"
+                    template.add_floating_ip_association(
+                        self.floating_ip_assoc["stack_name"],
+                        self.floating_ip["stack_name"],
+                        port_name)
 
         template.add_server(server_name, self.image, self.flavor,
                             ports=port_name_list,
+                            user=self.user,
                             key_name=self.keypair_name,
                             scheduler_hints=scheduler_hints)