X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fosaggregate.py;h=60a2e923ab10c2958650b33bed3da591b9cd9b0e;hb=b60b76a541ae33ec0ae8f084997a5a5a53499da9;hp=2872aa335c16b059d966780e026abcf8ea7aa9cd;hpb=3a7bcf1d8c90594d8361570680d51b4280b83eae;p=sfa.git

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index 2872aa33..60a2e923 100644
--- a/sfa/openstack/osaggregate.py
+++ b/sfa/openstack/osaggregate.py
@@ -181,23 +181,25 @@ class OSAggregate:
                     self.driver.shell.db.key_pair_destroy(username, key.name)
 
 
-    def create_security_group(self, group_name, fw_rules=[]):
-        security_group = SecurityGroup(self.driver)
-        security_group.create_security_group(group_name)
-        if not fw_rules:
-            # open port 22 by default
-            security_group.add_rule_to_group(group_name,
-                                             protocol='tcp',
-                                             cidr_ip = '0.0.0.0/0',
-                                             port_range='22',
-                                             icmp_type_code="-1")
-        elif isinstance(fw_rules, list): 
+    def create_security_group(self, slicename, fw_rules=[]):
+        # use default group by default
+        group_name = 'default' 
+        if isinstance(fw_rules, list) and fw_rules:
+            # Each sliver get's its own security group.
+            # Keep security group names unique by appending some random
+            # characters on end.
+            random_name = "".join([random.choice(string.letters+string.digits)
+                                           for i in xrange(6)])
+            group_name = slicename + random_name 
+            security_group = SecurityGroup(self.driver)
+            security_group.create_security_group(group_name)
             for rule in fw_rules:
                 security_group.add_rule_to_group(group_name, 
                                              protocol = rule.get('protocol'), 
                                              cidr_ip = rule.get('cidr_ip'), 
                                              port_range = rule.get('port_range'), 
                                              icmp_type_code = rule.get('icmp_type_code'))
+        return group_name
 
     def add_rule_to_security_group(self, group_name, **kwds):
         security_group = SecurityGroup(self.driver)
@@ -258,13 +260,7 @@ class OSAggregate:
                 # iterate over sliver/instance types
                 for instance_type in instance_types:
                     fw_rules = instance_type.get('fw_rules', [])
-                    # Each sliver get's its own security group.  
-                    # Keep security group names unique by appending some random 
-                    # characters on end.
-                    random_name = "".join([random.choice(string.letters+string.digits) 
-                                           for i in xrange(6)])
-                    group_name = slicename + random_name
-                    self.create_security_group(group_name, fw_rules)
+                    group_name = self.create_security_group(slicename, fw_rules)
                     ami_id = default_image_id
                     aki_id = default_aki_id
                     ari_id = default_ari_id