From 36852516fac11727c2fd4ee429214d6346628f32 Mon Sep 17 00:00:00 2001 From: shangxdy Date: Mon, 22 Aug 2016 15:22:56 +0800 Subject: Add high_availability test case As a template designer; I want to define a vdu with high availability; So i will add test case to violate high_availability requirement in VDU; JIRA:PARSER-94 Change-Id: Icd35e5a533231395a2174cdc20b747a9ab803599 Signed-off-by: shangxdy --- .../tests/data/hot_output/hot_nfv_sample.yaml | 17 ++++++++++++ .../tests/data/test_tosca_nfv_sample.yaml | 32 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml index 2103d43..f2d14ed 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml @@ -13,12 +13,29 @@ resources: networks: - port: { get_resource: CP1 } user_data_format: SOFTWARE_CONFIG + depends_on: + - VDU2 + VDU2: + type: OS::Nova::Server + properties: + flavor: m1.medium + image: rhel-6.5-test-image + networks: + - port: { get_resource: CP2 } + user_data_format: SOFTWARE_CONFIG + CP1: type: OS::Neutron::Port properties: fixed_ips: - ip_address: '192.168.0.55' network: { get_resource: VL1 } + CP2: + type: OS::Neutron::Port + properties: + fixed_ips: + - ip_address: '192.168.0.56' + network: { get_resource: VL1 } VL1: type: OS::Neutron::Net VL1_subnet: diff --git a/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml b/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml index 1112234..538d63d 100644 --- a/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml @@ -21,6 +21,26 @@ topology_template: type: Linux distribution: RHEL version: 6.5 + requirements: + - high_availability: VDU2 + + VDU2: + type: tosca.nodes.nfv.VDU + capabilities: + host: + properties: + num_cpus: 2 + disk_size: 10 GB + mem_size: 512 MB + # Guest Operating System properties + os: + properties: + # host Operating System image properties + architecture: x86_64 + type: Linux + distribution: RHEL + version: 6.5 + CP1: type: tosca.nodes.nfv.CP properties: @@ -33,6 +53,18 @@ topology_template: node: VDU1 relationship: tosca.relationships.nfv.VirtualBindsTo + CP2: + type: tosca.nodes.nfv.CP + properties: + ip_address: 192.168.0.56 + requirements: + - virtualLink: + node: VL1 +# relationship: tosca.relationships.nfv.VirtualLinksTo + - virtualBinding: + node: VDU2 + relationship: tosca.relationships.nfv.VirtualBindsTo + VL1: type: tosca.nodes.nfv.VL properties: -- cgit 1.2.3-korg