Updated data model for the Prepare Connectivity feature

drivers/aws_shellPackage/DataModel/datamodel.xml

@@ -166,7 +166,7 @@
         <Rule Name="Setting" />
       </Rules>
     </AttributeInfo>
-    <AttributeInfo DefaultValue="" Description="" IsReadOnly="false" Name="AWS EC2" Type="String">
+    <AttributeInfo DefaultValue="" Description="" IsReadOnly="false" Name="Cloud Provider Resource" Type="String">
       <Rules>
         <Rule Name="Configuration" />
         <Rule Name="Setting" />
@@ -178,6 +178,12 @@
         <Rule Name="Setting" />
       </Rules>
     </AttributeInfo>
+    <AttributeInfo DefaultValue="" Description="" IsReadOnly="false" Name="Networks In Use" Type="String">
+      <Rules>
+        <Rule Name="Configuration" />
+        <Rule Name="Setting" />
+      </Rules>
+    </AttributeInfo>
   </Attributes>
   <ResourceFamilies>
     <ResourceFamily Description="" IsAdminOnly="true" IsSearchable="true" Name="Cloud Provider">
@@ -228,6 +234,9 @@
             <AttachedAttribute IsLocal="true" IsOverridable="true" Name="Default Instance Type">
               <AllowedValues />
             </AttachedAttribute>
+            <AttachedAttribute IsLocal="true" IsOverridable="true" Name="Networks In Use">
+              <AllowedValues />
+            </AttachedAttribute>
           </AttachedAttributes>
           <AttributeValues>
             <AttributeValue Name="Device Name" Value="/dev/sda1" />
@@ -293,7 +302,7 @@
       <Models>
         <ResourceModel Description="" Name="AWS EC2 Instance" SupportsConcurrentCommands="false">
           <AttachedAttributes>
-            <AttachedAttribute IsLocal="true" IsOverridable="true" Name="AWS EC2" UserInput="true">
+            <AttachedAttribute IsLocal="true" IsOverridable="true" Name="Cloud Provider Resource" UserInput="true">
               <AllowedValues />
             </AttachedAttribute>
             <AttachedAttribute IsLocal="true" IsOverridable="true" Name="AWS AMI Id" UserInput="true">

drivers/deployment_drivers/aws_ec2_ami_instance/driver.py

@@ -37,22 +37,22 @@ def Deploy(self, context, Name=None):
 
         # Calls command on the AWS cloud provider
         result = session.ExecuteCommand(context.reservation.reservation_id,
-                                        aws_ami_deployment_model.aws_ec2,
+                                        aws_ami_deployment_model.cloud_provider_resource,
                                         "Resource",
                                         "deploy_ami",
                                         self._get_command_inputs_list(deployment_info),
                                         False)
         return result.Output
 
     def vaidate_deployment_ami_model(self, aws_ami_deployment_model):
-        if aws_ami_deployment_model.aws_ec2 == '':
-            raise Exception("The name of the AWS EC2 resource is empty.")
+        if aws_ami_deployment_model.cloud_provider_resource == '':
+            raise Exception("The name of the Cloud Provider resource is empty.")
 
     # todo: remove this to a common place
     def _convert_context_to_deployment_resource_model(self, resource):
         deployedResource = DeployAWSEc2AMIInstanceResourceModel()
         deployedResource.aws_ami_id = resource.attributes['AWS AMI Id']
-        deployedResource.aws_ec2 = resource.attributes['AWS EC2']
+        deployedResource.cloud_provider_resource = resource.attributes['Cloud Provider Resource']
         deployedResource.storage_iops = resource.attributes['Storage IOPS']
         deployedResource.storage_size = resource.attributes['Storage Size']
         deployedResource.instance_type = resource.attributes['Instance Type']

package/cloudshell/cp/aws/domain/ami_management/operations/deploy_operation.py

@@ -58,7 +58,7 @@ def deploy(self, ec2_session, name, reservation_id, aws_ec2_cp_resource_model, a
 
         return DeployResult(vm_name=self._get_name_from_tags(result),
                             vm_uuid=result.instance_id,
-                            cloud_provider_resource_name=ami_deployment_model.aws_ec2,
+                            cloud_provider_resource_name=ami_deployment_model.cloud_provider_resource,
                             auto_power_on=ami_deployment_model.auto_power_on,
                             auto_power_off=ami_deployment_model.auto_power_off,
                             wait_for_ip=ami_deployment_model.wait_for_ip,

package/cloudshell/cp/aws/domain/services/model_parser/aws_model_parser.py

@@ -35,7 +35,7 @@ def convert_to_deployment_resource_model(deployment_request):
         data = jsonpickle.decode(deployment_request)
         data_holder = DeployDataHolder(data)
         deployment_resource_model = DeployAWSEc2AMIInstanceResourceModel()
-        deployment_resource_model.aws_ec2 = data_holder.ami_params.aws_ec2
+        deployment_resource_model.cloud_provider_resource = data_holder.ami_params.cloud_provider_resource
         deployment_resource_model.aws_ami_id = data_holder.ami_params.aws_ami_id
         deployment_resource_model.storage_size = data_holder.ami_params.storage_size
         deployment_resource_model.storage_iops = data_holder.ami_params.storage_iops

package/cloudshell/cp/aws/models/deploy_aws_ec2_ami_instance_resource_model.py

@@ -1,6 +1,6 @@
 class DeployAWSEc2AMIInstanceResourceModel(object):
     def __init__(self):
-        self.aws_ec2 = ''
+        self.cloud_provider_resource = ''
         self.aws_ami_id = ''
         self.storage_size = ''
         self.storage_iops = ''

package/tests/test_ami_management/test_operations/test_deploy_operation.py

@@ -37,7 +37,7 @@ def test_deploy(self):
         ami_credentials = self.credentials_manager.get_windows_credentials()
 
         self.assertEqual(res.vm_name, 'my name')
-        self.assertEqual(res.cloud_provider_resource_name, ami_datamodel.aws_ec2)
+        self.assertEqual(res.cloud_provider_resource_name, ami_datamodel.cloud_provider_resource)
         self.assertEqual(res.auto_power_on, ami_datamodel.auto_power_on)
         self.assertEqual(res.auto_power_off, ami_datamodel.auto_power_off)
         self.assertEqual(res.wait_for_ip, ami_datamodel.wait_for_ip)

package/tests/test_aws_shell.py

@@ -45,11 +45,11 @@ def test_deploying_ami_returns_deploy_result(self):
         deploymock.wait_for_ip = "True"
         deploymock.auto_delete = "True"
         deploymock.autoload = "True"
-        deploymock.aws_ec2 = "some_name"
+        deploymock.cloud_provider_resource = "some_name"
 
         result = DeployResult(vm_name=name,
                               vm_uuid='my instance id',
-                              cloud_provider_resource_name=deploymock.aws_ec2,
+                              cloud_provider_resource_name=deploymock.cloud_provider_resource,
                               autoload=deploymock.autoload,
                               auto_delete=deploymock.auto_delete,
                               wait_for_ip=deploymock.wait_for_ip,
@@ -76,7 +76,7 @@ def test_deploying_ami_returns_deploy_result(self):
         self.assertEqual(decoded_res['wait_for_ip'], deploymock.wait_for_ip)
         self.assertEqual(decoded_res['auto_delete'], deploymock.auto_delete)
         self.assertEqual(decoded_res['autoload'], deploymock.autoload)
-        self.assertEqual(decoded_res['cloud_provider_resource_name'], deploymock.aws_ec2)
+        self.assertEqual(decoded_res['cloud_provider_resource_name'], deploymock.cloud_provider_resource)
 
     def test_power_on(self):
         deployed_model = DeployDataHolder({'vmdetails': {'uid': 'id'}})