openstack: move net() to OpenStack

It is not only needed when provisionning the teuthology instance.

Signed-off-by: Loic Dachary <loic@dachary.org>

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index 4474aadabc1658688268683c2df89ea8fc0c1a1c..27badf85501cad793c9dc95a77b4147b72d87d96 100644 (file)
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -588,6 +588,19 @@ class OpenStack(object):
     def get_ip(self, instance_id, network):
         return OpenStackInstance(instance_id).get_ip(network)
 
+    def net(self):
+        """
+        Return the network to be used when creating an OpenStack instance.
+        By default it should not be set. But some providers such as
+        entercloudsuite require it is.
+        """
+        if self.get_provider() == 'entercloudsuite':
+            return "--nic net-id=default"
+        elif self.get_provider() == 'cloudlab':
+            return "--nic net-id=flat-lan-1-net"
+        else:
+            return ""
+
     def get_available_archs(self):
         if (self.get_provider() == 'cloudlab' or
             (self.get_provider() == 'runabove' and
@@ -946,19 +959,6 @@ ssh access           : ssh {identity}{username}@{ip} # logs in /usr/share/nginx/
 
         return self.flavor(hint, arch)
 
-    def net(self):
-        """
-        Return the network to be used when creating an OpenStack instance.
-        By default it should not be set. But some providers such as
-        entercloudsuite require it is.
-        """
-        if self.get_provider() == 'entercloudsuite':
-            return "--nic net-id=default"
-        elif self.get_provider() == 'cloudlab':
-            return "--nic net-id=flat-lan-1-net"
-        else:
-            return ""
-
     def get_user_data(self):
         """
         Create a user-data.txt file to be used to spawn the teuthology