From 280f8015d06af1f41a3ef12e8300801c7a5e0d54 Mon Sep 17 00:00:00 2001 From: AviZi Date: Fri, 9 Jun 2017 02:39:56 +0300 Subject: [SDC-29] Amdocs OnBoard 1707 initial commit. Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370 Signed-off-by: AviZi --- .../resourceGroupInvalid/inputs/MANIFEST.json | 19 --- .../inputs/mvs.nested.heat.yaml | 129 ---------------- .../inputs/mvs.vfmodule.heat.yaml | 166 --------------------- 3 files changed, 314 deletions(-) delete mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/MANIFEST.json delete mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.nested.heat.yaml delete mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.vfmodule.heat.yaml (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/MANIFEST.json deleted file mode 100644 index c7729c8653..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/MANIFEST.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "mvs.vfmodule.heat.yaml", - "description": "Metaswitch MVS (Metaview Server)", - "version": "2013-05-23", - "data": [ - { - "file": "mvs.vfmodule.heat.yaml", - "type": "HEAT", - "data": [ - ] - }, - { - "file": "mvs.nested.heat.yaml", - "type": "HEAT", - "data": [ - ] - } - ] -} \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.nested.heat.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.nested.heat.yaml deleted file mode 100644 index 01adb51d71..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.nested.heat.yaml +++ /dev/null @@ -1,129 +0,0 @@ -heat_template_version: 2013-05-23 - -description: > - Metaswitch MVS (Metaview Server) - -parameters: - cloud_zone_id: - type: string - description: The cloud zone for this VF instance - vf_name: - type: string - description: The VF Name; defaults to VMVM for the virtual MVM VNF. - constraints: - - allowed_pattern: "[a-zA-Z0-9]+" - - length: { min: 4, max: 4 } - description: Each VF will have a 4-character alphanumeric identifier - vf_instance_num: - type: string - description: The number for this VF instance - constraints: - - allowed_pattern: "[0-9]+" - - length: { min: 2, max: 2 } - description: VF instance number must be a two-digit numeric value - vf_component: - type: string - description: The component that this VF instance is running - constraints: - - allowed_pattern: "[a-zA-Z0-9]+" - - length: { min: 3, max: 3 } - description: Each VF component will have a 3-character alphanumeric identifier - vm_instance_num: - type: comma_delimited_list - description: VM instance number list must be a list of three-digit numeric value - vnf_id: - type: string - description: Unique ID for this VF instance - vf_module_id: - type: string - description: Unique ID for this VF_MODULE instance - bootimage: - type: string - description: Master bootimage volume id - flavor: - type: string - description: Server flavor - constraints: - - custom_constraint: nova.flavor - key_name: - type: string - description: SSH key name - constraints: - - custom_constraint: nova.keypair - - availability_zone_0: - type: comma_delimited_list - description: List of Availability Zone IDs or Names - - sec_groups: - type: comma_delimited_list - description: Security groups - mgmt_net_id: - type: string - description: Neutron UUID for the Management network - constraints: - - custom_constraint: neutron.network - virtual_mgmt_ip_0: - type: string - description: Virtual management network ip address - - mvs_mgmt_ip_0: - type: comma_delimited_list - description: List of Management network IP addresses for IPv4 - - indx: - type: number - description: Index of the current instance - -resources: - mgmt_port: - type: OS::Neutron::Port - properties: - name: - str_replace: - template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM-mgmt-port - params: - $CLOUD_ZONE_ID: { get_param: cloud_zone_id } - $VF_NAME: { get_param: vf_name } - $VF_INSTANCE_NUM: { get_param: vf_instance_num } - $VF_COMPONENT: { get_param: vf_component } - $VM_INSTANCE_NUM: { "Fn::Select" : [ { get_param: indx }, { get_param: [vm_instance_num] } ] } - network_id: { get_param: mgmt_net_id } - security_groups: [{ get_param: sec_groups }] - - fixed_ips: - - ip_address: { "Fn::Select" : [ { get_param: indx }, { get_param: [{ get_param: mvs_mgmt_ip_0 }] } ] } - - allowed_address_pairs: - - ip_address: { get_param: virtual_mgmt_ip_0 } - - - - vnfci: - type: OS::Nova::Server - properties: - name: - str_replace: - template: Z$CLOUD_ZONE_ID$VF_NAME$VF_INSTANCE_NUM$VF_COMPONENT$VM_INSTANCE_NUM - params: - $CLOUD_ZONE_ID: { get_param: cloud_zone_id } - $VF_NAME: { get_param: vf_name } - $VF_INSTANCE_NUM: { get_param: vf_instance_num } - $VF_COMPONENT: { get_param: vf_component } - $VM_INSTANCE_NUM: { "Fn::Select" : [ { get_param: indx }, { get_param: [vm_instance_num] } ] } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: mgmt_port } - - availability_zone: { "Fn::Select" : [ { get_param: indx }, { get_param: [availability_zone_0] } ] } - - metadata: - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - -outputs: - vnfci_id_1: - value: { get_resource: vnfci } - vnfci_id_2: - value: { get_resource: vnfci } \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.vfmodule.heat.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.vfmodule.heat.yaml deleted file mode 100644 index d71dd81fbf..0000000000 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupInvalid/inputs/mvs.vfmodule.heat.yaml +++ /dev/null @@ -1,166 +0,0 @@ -heat_template_version: 2013-05-23 - -description: > - Metaswitch MVS (Metaview Server) - -parameters: - cloud_zone_id: - type: string - description: The cloud zone for this VF instance - index_parameter: - type: string - vf_name: - type: string - description: The VF Name; defaults to VMVM for the virtual MVM VNF. - constraints: - - allowed_pattern: "[a-zA-Z0-9]+" - - length: { min: 4, max: 4 } - description: Each VF will have a 4-character alphanumeric identifier - vf_instance_num: - type: string - description: The number for this VF instance - constraints: - - allowed_pattern: "[0-9]+" - - length: { min: 2, max: 2 } - description: VF instance number must be a two-digit numeric value - vf_component: - type: string - description: The component that this VF instance is running - constraints: - - allowed_pattern: "[a-zA-Z0-9]+" - - length: { min: 3, max: 3 } - description: Each VF component will have a 3-character alphanumeric identifier - vm_instance_num: - type: comma_delimited_list - description: VM instance number list must be a list of three-digit numeric value - vnf_id: - type: string - description: Unique ID for this VF instance - vf_module_id: - type: string - description: Unique ID for this VF_MODULE instance - bootimage: - type: string - description: Master bootimage volume id - flavor: - type: string - description: Server flavor - constraints: - - custom_constraint: nova.flavor - key_name: - type: string - description: SSH key name - constraints: - - custom_constraint: nova.keypair - type_name: - type: string - availability_zone_0: - type: comma_delimited_list - description: List of Availability Zone IDs or Names - - sec_groups: - type: comma_delimited_list - description: Security groups - mgmt_net_id: - type: string - description: Neutron UUID for the Management network - constraints: - - custom_constraint: neutron.network - virtual_mgmt_ip_0: - type: string - description: Virtual management network ip address - - mvs_mgmt_ip_0: - type: comma_delimited_list - description: List of Management network IP addresses for IPv4 - - num_instances: - type: number - description: number of instance of the VF_module - - compute_image_name: - type: string - -resources: - mvs_modules: - type: OS::Heat::ResourceGroup - properties: - count: 3 - index_var: { get_param: index_parameter } - resource_def: - type: mvs.nested.heat.yaml - properties: - cloud_zone_id: { get_param: cloud_zone_id } - vf_name: { get_param: vf_name } - vf_instance_num: { get_param: vf_instance_num } - vf_component: { get_param: vf_component } - vm_instance_num: { get_param: vm_instance_num } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - bootimage: { get_param: bootimage } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - availability_zone_0: { get_param: availability_zone_0 } - sec_groups: { get_param: sec_groups } - mgmt_net_id: { get_param: mgmt_net_id } - virtual_mgmt_ip_0: { get_param: virtual_mgmt_ip_0 } - mvs_mgmt_ip_0: { get_param: mvs_mgmt_ip_0 } - indx: "%index%" - - not_supported_resourceGroup1: - type: OS::Heat::ResourceGroup - properties: - count: 3 - resource_def: - type: OS::Heat::ResourceGroup - properties: - cloud_zone_id: { get_param: cloud_zone_id } - vf_name: { get_param: vf_name } - vf_instance_num: { get_param: vf_instance_num } - vf_component: { get_param: vf_component } - vm_instance_num: { get_param: vm_instance_num } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - bootimage: { get_param: bootimage } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - availability_zone_0: { get_param: availability_zone_0 } - sec_groups: { get_param: sec_groups } - mgmt_net_id: { get_param: mgmt_net_id } - virtual_mgmt_ip_0: { get_param: virtual_mgmt_ip_0 } - mvs_mgmt_ip_0: { get_param: mvs_mgmt_ip_0 } - indx: "%index%" - - not_supported_resourceGroup2: - type: OS::Heat::ResourceGroup - properties: - count: 3 - resource_def: - type: { get_param: type_name } - properties: - cloud_zone_id: { get_param: cloud_zone_id } - vf_name: { get_param: vf_name } - vf_instance_num: { get_param: vf_instance_num } - vf_component: { get_param: vf_component } - vm_instance_num: { get_param: vm_instance_num } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - bootimage: { get_param: bootimage } - flavor: { get_param: flavor } - key_name: { get_param: key_name } - availability_zone_0: { get_param: availability_zone_0 } - sec_groups: { get_param: sec_groups } - mgmt_net_id: { get_param: mgmt_net_id } - virtual_mgmt_ip_0: { get_param: virtual_mgmt_ip_0 } - mvs_mgmt_ip_0: { get_param: mvs_mgmt_ip_0 } - indx: "%index%" - - server_compute_get_attr_test: - type: OS::Nova::Server - properties: - config_drive: {get_attr: [mvs_modules]} - name: compute_name - image: { get_param: compute_image_name } - flavor: compute_flavor_name - user_data_format: { get_attr: [mvs_modules , resource.1.vnfci_id_1] } - user_data: { get_attr: [mvs_modules, resource.vnfci_id_2]} -- cgit 1.2.3-korg