X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fbenchmark%2Fcontexts%2Fmodel.py;h=71ee1f3c200592d8b811daabacc63fb77f73481f;hb=refs%2Fchanges%2F89%2F32789%2F11;hp=636abfa355c02cee8800012f0499aa316741798b;hpb=fa3afbcac13e1aa3ae9cc2977dcb4cd882112f6f;p=yardstick.git

diff --git a/yardstick/benchmark/contexts/model.py b/yardstick/benchmark/contexts/model.py
index 636abfa35..71ee1f3c2 100644
--- a/yardstick/benchmark/contexts/model.py
+++ b/yardstick/benchmark/contexts/model.py
@@ -56,17 +56,39 @@ class PlacementGroup(Object):
 
     @staticmethod
     def get(name):
-        if name in PlacementGroup.map:
-            return PlacementGroup.map[name]
-        else:
-            return None
+        return PlacementGroup.map.get(name)
+
+
+class ServerGroup(Object):     # pragma: no cover
+    """Class that represents a server group in the logical model
+    Policy should be one of "anti-affinity" or "affinity"
+    """
+    map = {}
+
+    def __init__(self, name, context, policy):
+        super(ServerGroup, self).__init__(name, context)
+        if policy not in {"affinity", "anti-affinity"}:
+            raise ValueError("server group '%s', policy '%s' is not valid" %
+                             (name, policy))
+        self.name = name
+        self.members = set()
+        self.stack_name = context.name + "-" + name
+        self.policy = policy
+        ServerGroup.map[name] = self
+
+    def add_member(self, name):
+        self.members.add(name)
+
+    @staticmethod
+    def get(name):
+        return ServerGroup.map.get(name)
 
 
 class Router(Object):
     """Class that represents a router in the logical model"""
 
     def __init__(self, name, network_name, context, external_gateway_info):
-        super(self.__class__, self).__init__(name, context)
+        super(Router, self).__init__(name, context)
 
         self.stack_name = context.name + "-" + network_name + "-" + self.name
         self.stack_if_name = self.stack_name + "-if0"
@@ -78,11 +100,13 @@ class Network(Object):
     list = []
 
     def __init__(self, name, context, attrs):
-        super(self.__class__, self).__init__(name, context)
+        super(Network, self).__init__(name, context)
         self.stack_name = context.name + "-" + self.name
         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,
@@ -113,12 +137,12 @@ class Network(Object):
         return None
 
 
-class Server(Object):
+class Server(Object):     # pragma: no cover
     """Class that represents a server in the logical model"""
     list = []
 
     def __init__(self, name, context, attrs):
-        super(self.__class__, self).__init__(name, context)
+        super(Server, self).__init__(name, context)
         self.stack_name = self.name + "." + context.name
         self.keypair_name = context.keypair_name
         self.secgroup_name = context.secgroup_name
@@ -132,7 +156,7 @@ class Server(Object):
 
         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:
@@ -141,6 +165,17 @@ class Server(Object):
             self.placement_groups.append(pg)
             pg.add_member(self.stack_name)
 
+        # support servergroup attr
+        self.server_group = None
+        sg = attrs.get("server_group")
+        if sg:
+            server_group = ServerGroup.get(sg)
+            if not server_group:
+                raise ValueError("server '%s', server_group '%s' is invalid" %
+                                 (name, sg))
+            self.server_group = server_group
+            server_group.add_member(self.stack_name)
+
         self.instances = 1
         if "instances" in attrs:
             self.instances = attrs["instances"]
@@ -193,7 +228,8 @@ class Server(Object):
             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: