diff options
author | shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-12 14:43:56 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-12 14:43:56 +0000 |
commit | a8bb8cadac0822776081bd7aba51e86bc401805b (patch) | |
tree | fc711ea29ff8feac05ae3b74a3afc211bc5b839a /tosca2heat/heat-translator/translator/tests/data/hot_output/network | |
parent | 4420a794f17429f74b521f30d49e82af5794439f (diff) | |
parent | f90be03da41fa8a233ecc84f54fa59d1f2f7021f (diff) |
Merge changes from topics 'Add_property_software_config_transport_in_compute_node', 'Add_signal_transport_property_in_softwaredeployment'
* changes:
Add property of software_config_transport in compute node
Add signal_transport in software deployment resource
Diffstat (limited to 'tosca2heat/heat-translator/translator/tests/data/hot_output/network')
5 files changed, 6 insertions, 0 deletions
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_custom_network_nodes.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_custom_network_nodes.yaml index 556dcf4..a2f1e4a 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_custom_network_nodes.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_custom_network_nodes.yaml @@ -13,6 +13,7 @@ resources: networks: - port: { get_resource: CP1 } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT CP1: type: OS::Neutron::Port properties: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml index cfcd290..67653e6 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml @@ -18,6 +18,7 @@ resources: networks: - port: { get_resource: my_port } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_network: type: OS::Neutron::Net diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml index f8674e1..81f69d1 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml @@ -16,6 +16,7 @@ resources: - port: { get_resource: my_port2 } - port: { get_resource: my_port3 } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_network1: type: OS::Neutron::Net diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml index b8282b5..5b04831 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml @@ -18,6 +18,7 @@ resources: networks: - port: { get_resource: my_port } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_port: type: OS::Neutron::Port diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml index 21157bb..64fc008 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml @@ -30,6 +30,7 @@ resources: networks: - port: { get_resource: my_port } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_server2: type: OS::Nova::Server @@ -39,6 +40,7 @@ resources: networks: - port: { get_resource: my_port2 } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_network: type: OS::Neutron::Net |