refactored app_ports_operation to move the get custom params method t…

…o a domain service

package/cloudshell/cp/aws/aws_shell.py

@@ -12,6 +12,7 @@
 from cloudshell.cp.aws.domain.services.session_providers.aws_session_provider import AWSSessionProvider
 from cloudshell.cp.aws.domain.services.storage_services.ec2_storage_service import EC2StorageService
 from cloudshell.cp.aws.domain.services.task_manager.instance_waiter import EC2InstanceWaiter
+from cloudshell.cp.aws.domain.services.model_parser.custom_param_extractor import VmCustomParamsExtractor
 
 
 class AWSShell(object):
@@ -23,6 +24,7 @@ def __init__(self):
         self.model_parser = AWSModelsParser()
         self.cloudshell_session_helper = CloudshellDriverHelper()
         self.aws_session_manager = AWSSessionProvider()
+        self.vm_custom_params_extractor = VmCustomParamsExtractor()
 
         self.security_group_service = AWSSecurityGroupService()
 
@@ -38,7 +40,7 @@ def __init__(self):
                                                        ec2_storage_service=self.ec2_storage_service,
                                                        security_group_service=self.security_group_service)
 
-        self.deployed_app_ports_operation = DeployedAppPortsOperation()
+        self.deployed_app_ports_operation = DeployedAppPortsOperation(self.vm_custom_params_extractor)
 
     def deploy_ami(self, command_context, deployment_request):
         """

package/cloudshell/cp/aws/domain/deployed_app/operations/app_ports_operation.py

@@ -1,18 +1,23 @@
 from cloudshell.cp.aws.domain.services.model_parser.port_group_attribute_parser import PortGroupAttributeParser
 from cloudshell.cp.aws.models.port_data import PortData
+from cloudshell.cp.aws.domain.services.model_parser.custom_param_extractor import VmCustomParamsExtractor
 
 
 class DeployedAppPortsOperation(object):
-    def __init__(self):
-        pass
+    def __init__(self, vm_custom_params_extractor):
+        """
+        :param VmCustomParamsExtractor vm_custom_params_extractor:
+        :return:
+        """
+        self.vm_custom_params_extractor = vm_custom_params_extractor
 
     def get_formated_deployed_app_ports(self, custom_params):
         """
         :param custom_params:
         :return:
         """
-        inbound_ports_value = self._get_custom_param_value(custom_params, "inbound_ports")
-        outbound_ports_value = self._get_custom_param_value(custom_params, "outbound_ports")
+        inbound_ports_value = self.vm_custom_params_extractor.get_custom_param_value(custom_params, "inbound_ports")
+        outbound_ports_value = self.vm_custom_params_extractor.get_custom_param_value(custom_params, "outbound_ports")
 
         if not inbound_ports_value and not outbound_ports_value:
             return ""
@@ -36,13 +41,6 @@ def get_formated_deployed_app_ports(self, custom_params):
 
         return '\n'.join(result_str_list).strip()
 
-    def _get_custom_param_value(self, custom_params, name):
-        name = name.lower()
-        params = filter(lambda x: x.name.lower() == name, custom_params)
-        if len(params) == 1:
-            return params[0].value
-        return False
-
     def _port_rule_to_string(self, port_rule):
         """
         :param PortData port_rule:

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

@@ -0,0 +1,17 @@
+class VmCustomParamsExtractor(object):
+    def __init__(self):
+        pass
+
+    def get_custom_param_value(self, custom_params, name):
+        """
+        Returns the value of the requested custom param
+        :param custom_params: The VMCustomParams array that is created by the DeployDataHolder from the deployed app json
+        :param str name: the name of the custom param to extract
+        :return: the value of the custom param or None if custom param not found
+        :rtype str:
+        """
+        name = name.lower()
+        params = filter(lambda x: x.name.lower() == name, custom_params)
+        if len(params) == 1:
+            return params[0].value
+        return None

package/tests/test_deployed_app/test_operations/test_app_ports_operation.py

@@ -4,11 +4,12 @@
 from cloudshell.cp.aws.common.deploy_data_holder import DeployDataHolder
 
 from cloudshell.cp.aws.domain.deployed_app.operations.app_ports_operation import DeployedAppPortsOperation
+from cloudshell.cp.aws.domain.services.model_parser.custom_param_extractor import VmCustomParamsExtractor
 
 
 class TestDeployedAppPortsOperation(TestCase):
     def setUp(self):
-        self.operation = DeployedAppPortsOperation()
+        self.operation = DeployedAppPortsOperation(VmCustomParamsExtractor())
 
     def test_format_single_inbound(self):
         json_str = '{"vmCustomParams":[{"name": "inbound_ports", "value": "80"}]}'

package/tests/test_domain_services/test_vm_custom_params_extractor.py

@@ -0,0 +1,22 @@
+from unittest import TestCase
+
+import jsonpickle
+from cloudshell.cp.aws.common.deploy_data_holder import DeployDataHolder
+from cloudshell.cp.aws.domain.services.model_parser.custom_param_extractor import VmCustomParamsExtractor
+
+
+class TestVmCustomParamsExtractor(TestCase):
+    def setUp(self):
+        pass
+
+    def test_extracor(self):
+        json_str = '{"vmCustomParams":[{"name": "param", "value": "some_value"}]}'
+        dict = jsonpickle.decode(json_str)
+        vmdetails = DeployDataHolder(dict)
+
+        extracotr = VmCustomParamsExtractor()
+        param_value = extracotr.get_custom_param_value(vmdetails.vmCustomParams, "param")
+
+        self.assertEqual(param_value, "some_value")
+
+