Merge "Basic Security Groups implementation" into release-0.5

functionaltests/api/v1/DummyTestApp/Classes/Dummy.yaml

@@ -26,8 +26,16 @@ Properties:
     Default: P@ssw0rd
 
 Workflow:
+  initialize:
+    Body:
+      - $.environment: $.find(std:Environment).require()
+      - $.resources: new(sys:Resources)
+
   deploy:
     Body:
+      - $securityGroupIngress: $.resources.json('DomainSecurity.json')
+      - $.environment.securityGroups.addGroupIngress($securityGroupIngress)
+
       - $.primaryController.deploy()
       - $.secondaryControllers.pselect($.deploy())
       - $.reportDeployed(title => 'Dummy',

meta/io.murano.lib.networks.Neutron/Classes/NewNetwork.yaml

@@ -54,6 +54,9 @@ Workflow:
       - assignFloatingIp:
           Contract: $.bool().notNull()
           Default: false
+      - securityGroupName:
+          Contract: $.string()
+          Default: null
     Body:
       - $.ensureNetworkConfigured()
       - $portname: $instance.name + '-port-to-' + $.id()
@@ -64,6 +67,8 @@ Workflow:
               Properties:
                 network_id: {Ref: $.net_res_name}
                 fixed_ips: [{subnet_id: {Ref: $.subnet_res_name}}]
+                security_groups:
+                  - Ref: $securityGroupName
             $instance.name:
               Properties:
                 NetworkInterfaces:

meta/io.murano/Classes/Environment.yaml

@@ -30,6 +30,10 @@ Properties:
       flat: $.class(res:Network)
     Usage: In
 
+  securityGroupManager:
+    Contract: $.class(sys:SecurityGroupManager)
+    Usage: Runtime
+
 Workflow:
   initialize:
     Body:
@@ -37,6 +41,8 @@ Workflow:
       - $this.stack: new(sys:HeatStack, name => $.name)
       - $this.instanceNotifier: new(sys:InstanceNotifier, environment => $this)
       - $this.reporter: new(sys:StatusReporter, environment => $this)
+      - $this.securityGroupManager: new(sys:SecurityGroupManager, environment => $this)
+
 
   deploy:
     Body:

meta/io.murano/Classes/SecurityGroupManager.yaml

@@ -0,0 +1,69 @@
+Namespaces:
+    =: io.murano.system
+    std: io.murano
+
+Name: SecurityGroupManager
+
+Properties:
+  environment:
+    Contract: $.class(std:Environment).notNull()
+
+  defaultGroupName:
+    Contract: $.string()
+    Usage: Runtime
+    Default: format('MuranoSecurityGroup-{0}', $.environment.name)
+
+Workflow:
+  addGroupIngress:
+    Arguments:
+      - rules:
+          Contract:
+            - FromPort: $.int().notNull()
+              ToPort: $.int().notNull()
+              IpProtocol: $.string().notNull()
+              External: $.bool().notNull()
+      - groupName:
+          Contract: $.string().notNull()
+          Default: $this.defaultGroupName
+    Body:
+      - $ext_keys:
+          true:
+            ext_key: remote_ip_prefix
+            ext_val: '0.0.0.0/0'
+          false:
+            ext_key: remote_mode
+            ext_val: remote_group_id
+
+      - $stack: $.environment.stack
+      - $template:
+          Resources:
+            $groupName:
+              Type: 'OS::Neutron::SecurityGroup'
+              Properties:
+                description: format('Composite security group of Murano environment {0}', $.environment.name)
+                rules:
+                  - port_range_min: null
+                    port_range_max: null
+                    protocol: icmp
+                    remote_ip_prefix: '0.0.0.0/0'
+      - $.environment.stack.updateTemplate($template)
+
+      - $ingress: $rules.select(dict(
+            port_range_min => $.FromPort,
+            port_range_max => $.ToPort,
+            protocol => $.IpProtocol,
+            $ext_keys.get($.External).ext_key => $ext_keys.get($.External).ext_val
+          ))
+
+      - $template:
+          Resources:
+            $groupName:
+              Type: 'OS::Neutron::SecurityGroup'
+              Properties:
+                rules: $ingress
+      - $.environment.stack.updateTemplate($template)
+
+
+
+
+

meta/io.murano/Classes/resources/Instance.yaml

@@ -39,6 +39,9 @@ Properties:
   floatingIpAddress:
     Contract: $.string()
     Usage: Out
+  securityGroupName:
+    Contract: $.string()
+    Default: null
 
 Workflow:
   initialize:
@@ -49,15 +52,22 @@ Workflow:
 
   deploy:
     Body:
+      - $securityGroupName: coalesce(
+            $.securityGroupName,
+            $.environment.securityGroupManager.defaultGroupName
+          )
+      - $.createDefaultInstanceSecurityGroupRules($securityGroupName)
+
       - If: $.networks.useEnvironmentNetwork
         Then:
-          $.joinNet($.environment.defaultNetworks.environment)
+          $.joinNet($.environment.defaultNetworks.environment, $securityGroupName)
       - If: $.networks.useFlatNetwork
         Then:
-          $.joinNet($.environment.defaultNetworks.flat)
-      - $.networks.customNetworks.select($this.joinNet($))
+          $.joinNet($.environment.defaultNetworks.flat, $securityGroupName)
+      - $.networks.customNetworks.select($this.joinNet($, $securityGroupName))
 
       - $userData: $.prepareUserData()
+
       - $template:
           Resources:
             $.name:
@@ -67,7 +77,8 @@ Workflow:
                 ImageId: $.image
                 UserData: $userData
                 KeyName: $.keyname
-                    
+
+
           Outputs:
             format('{0}-PublicIp', $.name):
               Value:
@@ -83,6 +94,8 @@ Workflow:
     Arguments:
       - net:
           Contract: $.class(Network)
+      - securityGroupName:
+          Contract: $.string()
     Body:
       - If: $net != null
         Then:
@@ -92,11 +105,43 @@ Workflow:
               - $.setAttr(fipAssigned, true)
             Else:
               - $assignFip: false
-          - $net.addHostToNetwork($, $assignFip)
+          - $net.addHostToNetwork($, $assignFip, $securityGroupName)
 
 
+  createDefaultInstanceSecurityGroupRules:
+    Arguments:
+      - groupName:
+          Contract: $.string().notNull()
+    Body:
+      # TODO: This is a temporary (and quite dirty) workaround. It should be
+      # implemented using polymorphism, by overriding parts of this method in
+      # derived classes related to particular OS type
+      # However bug #1314618 does not allow to do it
+
+      - If: !yaql "'w' in toLower($.image)"
+        Then:
+          - $rules:
+              - ToPort: 3389
+                IpProtocol: tcp
+                FromPort: 3389
+                External: true
+        Else:
+          - $rules:
+              - ToPort: 22
+                IpProtocol: tcp
+                FromPort: 22
+                External: true
+      - $.environment.securityGroupManager.addGroupIngress(
+          rules => $rules, groupName => $groupName)
+
+  getDefaultSecurityRules:
   prepareUserData:
     Body:
+      # TODO: This is a temporary (and quite dirty) workaround. It should be
+      # implemented using polymorphism, by overriding parts of this method in
+      # derived classes related to particular OS type
+      # However bug #1314618 does not allow to do it
+
       - If: !yaql "'w' in toLower($.image)"
         Then:
           - $configFile: $.resources.string('Agent-v1.template')

meta/io.murano/Classes/resources/Network.yaml

@@ -8,3 +8,9 @@ Workflow:
     Arguments:
       - instance:
           Contract: $.class(Instance).notNull()
+      - assignFloatingIp:
+          Contract: $.bool().notNull()
+          Default: false
+      - securityGroupName:
+          Contract: $.string()
+          Default: null

meta/io.murano/manifest.yaml

@@ -18,5 +18,7 @@ Classes:
   io.murano.Environment: Environment.yaml
   io.murano.Application: Application.yaml
 
+  io.murano.system.SecurityGroupManager: SecurityGroupManager.yaml
+
   io.murano.resources.Network: resources/Network.yaml
   io.murano.resources.Instance: resources/Instance.yaml