Code Review
/
vvp
/
validation-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[VVP] Updated network param validations per reqts
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
fixtures
/
test_neutron_port_network_attachment
/
fail
/
fail_external_get_param_with_list
/
vnf_base.yaml
diff --git
a/ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/fail/get_resource_used_for_external_network.yaml
b/ice_validator/tests/fixtures/test_neutron_port_network_attachment/fail/fail_external_get_param_with_list/vnf_base.yaml
similarity index 70%
rename from
ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/fail/get_resource_used_for_external_network.yaml
rename to
ice_validator/tests/fixtures/test_neutron_port_network_attachment/fail/fail_external_get_param_with_list/vnf_base.yaml
index
8268b66
..
8f9ff53
100644
(file)
--- a/
ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/fail/get_resource_used_for_external_network.yaml
+++ b/
ice_validator/tests/fixtures/test_neutron_port_network_attachment/fail/fail_external_get_param_with_list/vnf_base.yaml
@@
-1,5
+1,5
@@
# -*- coding: utf8 -*-
# -*- coding: utf8 -*-
-# ============LICENSE_START====================================================
===
+# ============LICENSE_START====================================================
# org.onap.vvp/validation-scripts
# ===================================================================
# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
# org.onap.vvp/validation-scripts
# ===================================================================
# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
@@
-36,29
+36,18
@@
# ============LICENSE_END============================================
#
#
# ============LICENSE_END============================================
#
#
----
-resources:
- vm_type_1_int_intranet_0_port:
- type: OS::Neutron::Port
- properties:
- network: { get_param: int_intranet_net_name }
+# VERSION: '1.0.0'
- vm_type_1_int_vpnnet_0_port:
- type: OS::Neutron::Port
- properties:
- network: { get_param: int_vpnnet_net_id }
+parameters:
+ external_net_id:
+ type: string
- vm_type_1_external_net_0_port:
- type: OS::Neutron::Port
- properties:
- network: { get_param: external_net_name }
+ external_net_name:
+ type: string
- vm_type_1_extnet_0_port:
- type: OS::Neutron::Port
- properties:
- network: { get_param: extnet_net_id }
+resources:
- vm
_type_0_extnet_0_port
:
-
type: OS::Neutron::Port
-
properties:
-
network: { get_resource: extnet_net_id
}
+ vm
type_0_external_port_0
:
+ type: OS::Neutron::Port
+ properties:
+
network: { get_param: [ {get_param: external_net_id}, 0 ]
}