diff options
| author |   xiaodong shang <shang.xiaodong@zte.com.cn> | 2016-09-02 06:22:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-02 06:22:56 +0000 |
| commit | 2ec2be8ecc35d22f61cadbb6f8ab1bc22dbaf8ae (patch) | |
| tree | b4f91dbc1925ad1a8d9da2bdb8cb08d1a04d38dc | |
| parent | 843b0222bc3171db78d8f5fcf45ff1d0c4a72731 (diff) | |
| parent | bb5a9e6ffd25eefd7aee562940f9004d08c8d66d (diff) | |
Merge "[NFV] Reduce instance requirements"
| -rw-r--r-- | tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml | 4 | ||||
| -rw-r--r-- | tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml | 8 |
2 files changed, 6 insertions, 6 deletions
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 44647c6..79750d4 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 @@ -8,7 +8,7 @@ resources: VDU1: type: OS::Nova::Server properties: - flavor: m1.medium + flavor: m1.tiny image: rhel-6.5-test-image networks: - port: { get_resource: CP1 } @@ -20,7 +20,7 @@ resources: VDU2: type: OS::Nova::Server properties: - flavor: m1.medium + flavor: m1.tiny image: rhel-6.5-test-image networks: - port: { get_resource: CP2 } 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 d953fe7..5803bd2 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 @@ -10,8 +10,8 @@ topology_template: capabilities: host: properties: - num_cpus: 2 - disk_size: 10 GB + num_cpus: 1 + disk_size: 1 GB mem_size: 512 MB # Guest Operating System properties os: @@ -40,8 +40,8 @@ topology_template: capabilities: host: properties: - num_cpus: 2 - disk_size: 10 GB + num_cpus: 1 + disk_size: 1 GB mem_size: 512 MB # Guest Operating System properties os: |