Merge pull request #472 from QualiSystems/develop

Merging dev to master

Author: alexazarh

.travis.yml

@@ -9,7 +9,7 @@ install:
   - pip install "cloudshell-core>=2.2.0,<2.3.0"
   - pip install "cloudshell-shell-core>=3.1.0,<3.2.0"
   - pip install "cloudshell-automation-api>=8.3.0.0,<8.3.1.0" --extra-index-url https://testpypi.python.org/simple
-
+  - pip install "cloudshell-cp-core>=1.0.0,<1.1.0" --extra-index-url https://test.pypi.org/simple
 script:
     - pushd package
     - python setup.py develop

cloudformation/2_EC2_EX_No_VPN.json

@@ -455,7 +455,7 @@
 				"InstanceId": {
 					"Ref": "CloudShellServerInstance"
 				},
-				"Domain": ""
+				"Domain": "vpc"
 			},
 			"DependsOn": "CloudShellServerInstance"
 		}

drivers/aws_shell/src/driver.py

@@ -1,7 +1,12 @@
-import jsonpickle
 from cloudshell.shell.core.driver_context import AutoLoadDetails
 from cloudshell.shell.core.resource_driver_interface import ResourceDriverInterface
 from cloudshell.cp.aws.aws_shell import AWSShell
+from cloudshell.cp.core import DriverRequestParser
+from cloudshell.cp.core.models import DeployApp, DriverResponse
+from cloudshell.cp.core.utils import single
+from cloudshell.cp.aws.models.deploy_aws_ec2_ami_instance_resource_model import DeployAWSEc2AMIInstanceResourceModel
+from cloudshell.cp.core.models import ConnectSubnet
+
 
 
 class AWSShellDriver(ResourceDriverInterface):
@@ -13,23 +18,38 @@ def __init__(self):
         ctor must be without arguments, it is created with reflection at run time
         """
         self.aws_shell = AWSShell()
+        self.request_parser = DriverRequestParser()
+        self.request_parser.add_deployment_model(deployment_model_cls=DeployAWSEc2AMIInstanceResourceModel)
         self.deployments = dict()
         self.deployments['AWS EC2 Instance'] = self.deploy_ami
 
     def initialize(self, context):
         pass
 
     def Deploy(self, context, request=None, cancellation_context=None):
-        app_request = jsonpickle.decode(request)
-        deployment_name = app_request['DeploymentServiceName']
+        actions = self.request_parser.convert_driver_request_to_actions(request)
+        deploy_action = single(actions, lambda x: isinstance(x, DeployApp))
+        deployment_name = deploy_action.actionParams.deployment.deploymentPath
+        self.parse_vnicename(actions)
+
+
         if deployment_name in self.deployments.keys():
             deploy_method = self.deployments[deployment_name]
-            return deploy_method(context, request, cancellation_context)
+            deploy_result = deploy_method(context, actions, cancellation_context)
+            return DriverResponse(deploy_result).to_driver_response_json()
         else:
             raise Exception('Could not find the deployment')
 
-    def deploy_ami(self, context, request, cancellation_context):
-        return self.aws_shell.deploy_ami(context, request, cancellation_context)
+    def parse_vnicename(self, actions):
+        network_actions = [a for a in actions if isinstance(a, ConnectSubnet)]
+        for network_action in network_actions:
+            try:
+                network_action.actionParams.vnicName = int(network_action.actionParams.vnicName)
+            except:
+                network_action.actionParams.vnicName = None
+
+    def deploy_ami(self, context, actions, cancellation_context):
+        return self.aws_shell.deploy_ami(context, actions, cancellation_context)
 
     def PowerOn(self, context, ports):
         return self.aws_shell.power_on_ami(context)
@@ -43,14 +63,17 @@ def PowerCycle(self, context, ports, delay):
     def remote_refresh_ip(self, context, ports, cancellation_context):
         return self.aws_shell.refresh_ip(context)
 
-    def destroy_vm_only(self, context, ports):
+    def DeleteInstance(self, context, ports):
         return self.aws_shell.delete_instance(context)
 
-    def PrepareConnectivity(self, context, request, cancellation_context):
-        return self.aws_shell.prepare_connectivity(context, request, cancellation_context)
+    def PrepareSandboxInfra(self, context, request, cancellation_context):
+        actions = self.request_parser.convert_driver_request_to_actions(request)
+        action_results = self.aws_shell.prepare_connectivity(context, actions, cancellation_context)
+        return DriverResponse(action_results).to_driver_response_json()
 
-    def CleanupConnectivity(self, context, request):
-        return self.aws_shell.cleanup_connectivity(context, request)
+    def CleanupSandboxInfra(self, context, request):
+        actions = self.request_parser.convert_driver_request_to_actions(request)
+        return self.aws_shell.cleanup_connectivity(context, actions)
 
     def GetApplicationPorts(self, context, ports):
         return self.aws_shell.get_application_ports(context)

drivers/aws_shell/src/drivermetadata.xml

@@ -1,17 +1,17 @@
-<Driver Description="This driver orchestrate all the command that will be executed on AWS" MainClass="driver.AWSShellDriver" Name="AWS Shell Driver" Version="2.2.1">
+<Driver Description="This driver orchestrate all the command that will be executed on AWS" MainClass="driver.AWSShellDriver" Name="AWS Shell Driver" Version="2.3.9999">
     <Layout>
         <Category Name="Deployment">
             <Command Description="" DisplayName="Deploy From AMI" EnableCancellation="true" Name="deploy_ami" Tags="allow_unreserved" />
         </Category>
         <Category Name="Connectivity">
             <Command Description="" DisplayName="Refresh IP" EnableCancellation="true" Name="remote_refresh_ip" Tags="remote_connectivity,allow_shared" />
             <Command Description="" DisplayName="Get Application Ports" Name="GetApplicationPorts" Tags="remote_connectivity,allow_shared" />
-            <Command Description="" DisplayName="Prepare Connectivity" EnableCancellation="true" Name="PrepareConnectivity" Tags="allow_unreserved" />
-            <Command Description="" DisplayName="Cleanup Connectivity" EnableCancellation="true" Name="CleanupConnectivity" Tags="allow_unreserved" />
+            <Command Description="" DisplayName="Prepare Connectivity" EnableCancellation="true" Name="PrepareSandboxInfra" Tags="allow_unreserved" />
+            <Command Description="" DisplayName="Cleanup Connectivity" EnableCancellation="true" Name="CleanupSandboxInfra" Tags="allow_unreserved" />
         </Category>
         <Category Name="Hidden Commands">
             <Command Description="" DisplayName="Power Cycle" Name="PowerCycle" Tags="power" />
-            <Command Description="" DisplayName="Delete VM Only" Name="destroy_vm_only" Tags="remote_app_management,allow_shared" />
+            <Command Description="" DisplayName="Delete VM Only" Name="DeleteInstance" Tags="remote_app_management,allow_shared" />
             <Command Description="" DisplayName="GetAccessKey" Name="GetAccessKey" Tags="remote_app_management" />
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_unreserved" />
             <Command Description="" DisplayName="Set App Security Groups" Name="SetAppSecurityGroups" Tags="allow_unreserved" />

drivers/aws_shell/src/requirements.txt

@@ -1,4 +1,5 @@
 cloudshell-automation-api>=8.3.0.0,<8.3.1.0
 cloudshell-shell-core>=3.1.0,<3.2.0
-cloudshell-cp-aws>=2.2.0,<2.3.0
+cloudshell-cp-aws>=2.3.0,<2.4.0
 jsonpickle==0.9.3
+cloudshell-cp-core>=1.0.0,<1.1.0

drivers/aws_shellPackage/DataModel/datamodel.xml

@@ -114,6 +114,12 @@
         <Rule Name="Setting" />
       </Rules>
     </AttributeInfo>
+    <AttributeInfo Name="IAM Role Name" Type="String" DefaultValue="" Description="Provide the IAM role name to be used in this instance." IsReadOnly="false" >
+      <Rules>
+        <Rule Name="Configuration" />
+        <Rule Name="Setting" />
+      </Rules>
+    </AttributeInfo>
     <AttributeInfo DefaultValue="0" Description="The max number of I/O operations per second that the volume can support. For Provisioned IOPS (SSD) volumes, you can provision up to 30 IOPS per GiB. If left empty the default in the AMI will be used. For example 240." IsReadOnly="false" Name="Max Storage IOPS" Type="Numeric">
       <Rules>
         <Rule Name="Configuration" />
@@ -226,6 +232,7 @@
             <DriverName>AWS Shell Driver</DriverName>
           </Drivers>
           <Scripts>
+
           </Scripts>
         </ResourceModel>
       </Models>
@@ -260,7 +267,7 @@
       <Models>
         <ResourceModel Description="" Name="AWS EC2 Instance" ImagePath="DeploymentTypes-AWS-EC2.png" SupportsConcurrentCommands="false">
           <AttachedAttributes>
-            <AttachedAttribute IsLocal="true" IsOverridable="true" Name="AWS AMI Id" UserInput="true">
+            <AttachedAttribute IsLocal="true" IsOverridable="true" Name="AWS AMI Id" UserInput="true" EditableOnlyInAppTemplate="true">
               <AllowedValues />
             </AttachedAttribute>
             <AttachedAttribute IsLocal="true" IsOverridable="true" Name="Allow all Sandbox Traffic" UserInput="true">
@@ -269,6 +276,9 @@
             <AttachedAttribute IsLocal="true" IsOverridable="true" Name="Instance Type" UserInput="true">
               <AllowedValues />
             </AttachedAttribute>
+            <AttachedAttribute IsLocal="true" IsOverridable="true" Name="IAM Role Name" UserInput="true">
+              <AllowedValues />
+            </AttachedAttribute>
             <AttachedAttribute IsLocal="true" IsOverridable="true" Name="Storage Size" UserInput="false">
               <AllowedValues />
             </AttachedAttribute>

drivers/version.txt

@@ -1 +1 @@
-2.2.1
+2.3.0

external_requirements.txt

@@ -1,4 +1,3 @@
-python-dateutil==2.6.1
 boto3==1.4.5
 jsonpickle==0.9.3
 enum==0.4.6