ci: Add support to attach specific network
authorFilippos Giannakos <philipgian@grnet.gr>
Mon, 9 Dec 2013 16:23:35 +0000 (18:23 +0200)
committerFilippos Giannakos <philipgian@grnet.gr>
Tue, 28 Jan 2014 15:02:09 +0000 (17:02 +0200)
ci/cluster.py
ci/config

index 0e6e3ba..8814b2a 100644 (file)
@@ -445,12 +445,16 @@ class Server(CloudClient):
         else:
             return False
 
-    def create(self, wait=False):
+    def create(self, wait=False, network=None):
         if self.status and self.status != "DELETED":
             return False
         self.logger.info("Create a new server..")
+        networks = []
+        if network:
+            networks.extend([{"uuid": network.strip()}])
         server = self.cyclades_client.create_server(self.name, self.flavor_id,
-                                                    self.image_id)
+                                                    self.image_id,
+                                                    networks=networks)
         self.server = server
         self.server_id = server['id']
         self.logger.debug("Server got id %s" % _green(self.server_id))
@@ -639,12 +643,15 @@ class Cluster(ConfigClient):
     def create(self):
         if self.cleanup_servers:
             self.destroy()
+        network = None
+        if self.config.has_option('Global', 'network'):
+            network = self.config.get('Global', 'network')
 
         try:
             submitted = []
             for s in self.servers:
                 if not s.status or s.status != "ACTIVE":
-                    s.create()
+                    s.create(network=network)
                     submitted.append(s)
 
             self.wait_status(submitted, "ACTIVE")
index b7f4336..88515c4 100644 (file)
--- a/ci/config
+++ b/ci/config
@@ -14,4 +14,4 @@ update_cmd = apt-get update
 okeanos_io = True
 flavor_id = 706
 image_id = 895242b9-af8a-48c5-8218-60e1fb2e985b
-
+network = 24715