Merge "Bux: task_id parameter from API can not pass to yardstick core"

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

diff --git a/yardstick/benchmark/contexts/model.py b/yardstick/benchmark/contexts/model.py
index d31f4af..c83a209 100644 (file)
--- a/yardstick/benchmark/contexts/model.py
+++ b/yardstick/benchmark/contexts/model.py
@@ -10,12 +10,15 @@
 """ Logical model
 
 """
+from __future__ import absolute_import
+from six.moves import range
 
 
 class Object(object):
-    '''Base class for classes in the logical model
+    """Base class for classes in the logical model
     Contains common attributes and methods
-    '''
+    """
+
     def __init__(self, name, context):
         # model identities and reference
         self.name = name
@@ -27,15 +30,15 @@ class Object(object):
 
     @property
     def dn(self):
-        '''returns distinguished name for object'''
+        """returns distinguished name for object"""
         return self.name + "." + self._context.name
 
 
 class PlacementGroup(Object):
-    '''Class that represents a placement group in the logical model
+    """Class that represents a placement group in the logical model
     Concept comes from the OVF specification. Policy should be one of
     "availability" or "affinity (there are more but they are not supported)"
-    '''
+    """
     map = {}
 
     def __init__(self, name, context, policy):
@@ -60,9 +63,10 @@ class PlacementGroup(Object):
 
 
 class Router(Object):
-    '''Class that represents a router in the logical model'''
+    """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"
@@ -70,11 +74,11 @@ class Router(Object):
 
 
 class Network(Object):
-    '''Class that represents a network in the logical model'''
+    """Class that represents a network in the logical model"""
     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')
@@ -87,22 +91,22 @@ class Network(Object):
         Network.list.append(self)
 
     def has_route_to(self, network_name):
-        '''determines if this network has a route to the named network'''
+        """determines if this network has a route to the named network"""
         if self.router and self.router.external_gateway_info == network_name:
             return True
         return False
 
     @staticmethod
     def find_by_route_to(external_network):
-        '''finds a network that has a route to the specified network'''
+        """finds a network that has a route to the specified network"""
         for network in Network.list:
             if network.has_route_to(external_network):
                 return network
 
     @staticmethod
     def find_external_network():
-        '''return the name of an external network some network in this
-        context has a route to'''
+        """return the name of an external network some network in this
+        context has a route to"""
         for network in Network.list:
             if network.router:
                 return network.router.external_gateway_info
@@ -110,11 +114,11 @@ class Network(Object):
 
 
 class Server(Object):
-    '''Class that represents a server in the logical model'''
+    """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
@@ -167,7 +171,7 @@ class Server(Object):
 
     @property
     def image(self):
-        '''returns a server's image name'''
+        """returns a server's image name"""
         if self._image:
             return self._image
         else:
@@ -175,14 +179,14 @@ class Server(Object):
 
     @property
     def flavor(self):
-        '''returns a server's flavor name'''
+        """returns a server's flavor name"""
         if self._flavor:
             return self._flavor
         else:
             return self._context.flavor
 
     def _add_instance(self, template, server_name, networks, scheduler_hints):
-        '''adds to the template one server and corresponding resources'''
+        """adds to the template one server and corresponding resources"""
         port_name_list = []
         for network in networks:
             port_name = server_name + "-" + network.name + "-port"
@@ -215,7 +219,7 @@ class Server(Object):
                             scheduler_hints=scheduler_hints)
 
     def add_to_template(self, template, networks, scheduler_hints=None):
-        '''adds to the template one or more servers (instances)'''
+        """adds to the template one or more servers (instances)"""
         if self.instances == 1:
             server_name = self.stack_name
             self._add_instance(template, server_name, networks,
@@ -229,9 +233,9 @@ class Server(Object):
 
 
 def update_scheduler_hints(scheduler_hints, added_servers, placement_group):
-    ''' update scheduler hints from server's placement configuration
+    """ update scheduler hints from server's placement configuration
     TODO: this code is openstack specific and should move somewhere else
-    '''
+    """
     if placement_group.policy == "affinity":
         if "same_host" in scheduler_hints:
             host_list = scheduler_hints["same_host"]