Modify Network Resource Information used by FT
I have confirmed that the FT results are incorrect. This is not a problem with the code, but with the test parameters. This patch will improve the test code so that the correct results are displayed. * This patch is not a bug fixed but an improvement. - Fixed the mismatch between VNFD and HOT resource information. - Fixed the parameter of the external network resource information in Instantiation. Change-Id: I41462d981caabcd742573748216149e265e8c5c4
This commit is contained in:
parent
51167c8aed
commit
533b60741b
|
@ -20,9 +20,9 @@ resources:
|
||||||
zone: { get_param: [ nfv, vdu, VDU1, zone ] }
|
zone: { get_param: [ nfv, vdu, VDU1, zone ] }
|
||||||
net1: { get_param: [ nfv, CP, VDU1_CP1, network ] }
|
net1: { get_param: [ nfv, CP, VDU1_CP1, network ] }
|
||||||
net2: { get_param: [ nfv, CP, VDU1_CP2, network ] }
|
net2: { get_param: [ nfv, CP, VDU1_CP2, network ] }
|
||||||
net3: { get_resource: extmanageNW_1 }
|
net3: { get_resource: internalVL1 }
|
||||||
net4: { get_resource: extmanageNW_2 }
|
net4: { get_resource: internalVL2 }
|
||||||
net5: { get_resource: internalNW_1 }
|
net5: { get_resource: internalVL3 }
|
||||||
subnet: { get_param: [nfv, CP, VDU1_CP2, fixed_ips, 0, subnet]}
|
subnet: { get_param: [nfv, CP, VDU1_CP2, fixed_ips, 0, subnet]}
|
||||||
VDU1_scale_scale_out:
|
VDU1_scale_scale_out:
|
||||||
type: OS::Heat::ScalingPolicy
|
type: OS::Heat::ScalingPolicy
|
||||||
|
@ -52,9 +52,9 @@ resources:
|
||||||
zone: { get_param: [ nfv, vdu, VDU2, zone ] }
|
zone: { get_param: [ nfv, vdu, VDU2, zone ] }
|
||||||
net1: { get_param: [ nfv, CP, VDU2_CP1, network ] }
|
net1: { get_param: [ nfv, CP, VDU2_CP1, network ] }
|
||||||
net2: { get_param: [ nfv, CP, VDU2_CP2, network ] }
|
net2: { get_param: [ nfv, CP, VDU2_CP2, network ] }
|
||||||
net3: { get_resource: extmanageNW_1 }
|
net3: { get_resource: internalVL1 }
|
||||||
net4: { get_resource: extmanageNW_2 }
|
net4: { get_resource: internalVL2 }
|
||||||
net5: { get_resource: internalNW_1 }
|
net5: { get_resource: internalVL3 }
|
||||||
ip1: { get_param: [nfv, CP, VDU2_CP2, fixed_ips, 0, ip_address]}
|
ip1: { get_param: [nfv, CP, VDU2_CP2, fixed_ips, 0, ip_address]}
|
||||||
subnet: { get_param: [nfv, CP, VDU2_CP2, fixed_ips, 0, subnet]}
|
subnet: { get_param: [nfv, CP, VDU2_CP2, fixed_ips, 0, subnet]}
|
||||||
VDU2_scale_scale_out:
|
VDU2_scale_scale_out:
|
||||||
|
@ -75,27 +75,31 @@ resources:
|
||||||
type: OS::Neutron::Net
|
type: OS::Neutron::Net
|
||||||
extmanageNW_2:
|
extmanageNW_2:
|
||||||
type: OS::Neutron::Net
|
type: OS::Neutron::Net
|
||||||
internalNW_1:
|
internalVL1:
|
||||||
type: OS::Neutron::Net
|
type: OS::Neutron::Net
|
||||||
extmanageNW_1_subnet:
|
internalVL2:
|
||||||
|
type: OS::Neutron::Net
|
||||||
|
internalVL3:
|
||||||
|
type: OS::Neutron::Net
|
||||||
|
internalVL1_subnet:
|
||||||
type: OS::Neutron::Subnet
|
type: OS::Neutron::Subnet
|
||||||
properties:
|
properties:
|
||||||
ip_version: 4
|
ip_version: 4
|
||||||
network:
|
network:
|
||||||
get_resource: extmanageNW_1
|
get_resource: internalVL1
|
||||||
cidr: 192.168.3.0/24
|
cidr: 192.168.3.0/24
|
||||||
extmanageNW_2_subnet:
|
internalVL2_subnet:
|
||||||
type: OS::Neutron::Subnet
|
type: OS::Neutron::Subnet
|
||||||
properties:
|
properties:
|
||||||
ip_version: 4
|
ip_version: 4
|
||||||
network:
|
network:
|
||||||
get_resource: extmanageNW_2
|
get_resource: internalVL2
|
||||||
cidr: 192.168.4.0/24
|
cidr: 192.168.4.0/24
|
||||||
internalNW_1_subnet:
|
internalVL3_subnet:
|
||||||
type: OS::Neutron::Subnet
|
type: OS::Neutron::Subnet
|
||||||
properties:
|
properties:
|
||||||
ip_version: 4
|
ip_version: 4
|
||||||
network:
|
network:
|
||||||
get_resource: internalNW_1
|
get_resource: internalVL3
|
||||||
cidr: 192.168.5.0/24
|
cidr: 192.168.5.0/24
|
||||||
outputs: {}
|
outputs: {}
|
||||||
|
|
|
@ -106,6 +106,7 @@ def _set_ext_virtual_link_cp1(networks_id, external_ports_id):
|
||||||
ext_virtual_link_cp1 = {
|
ext_virtual_link_cp1 = {
|
||||||
"id": uuidsentinel.evl1_id,
|
"id": uuidsentinel.evl1_id,
|
||||||
"resourceId": networks_id[0],
|
"resourceId": networks_id[0],
|
||||||
|
"vimConnectionId": uuidsentinel.vim_connection_id,
|
||||||
"extCps": [ext_vdu1_cp1, ext_vdu2_cp1],
|
"extCps": [ext_vdu1_cp1, ext_vdu2_cp1],
|
||||||
"extLinkPorts": [
|
"extLinkPorts": [
|
||||||
_set_ext_link_port1(external_ports_id),
|
_set_ext_link_port1(external_ports_id),
|
||||||
|
@ -194,6 +195,7 @@ def _set_ext_virtual_link_cp2(networks_id, external_subnets_id):
|
||||||
ext_virtual_link_cp2 = {
|
ext_virtual_link_cp2 = {
|
||||||
"id": uuidsentinel.evl2_id,
|
"id": uuidsentinel.evl2_id,
|
||||||
"resourceId": networks_id[1],
|
"resourceId": networks_id[1],
|
||||||
|
"vimConnectionId": uuidsentinel.vim_connection_id,
|
||||||
"extCps": [
|
"extCps": [
|
||||||
_set_ext_cps_vdu1_cp2(external_subnets_id),
|
_set_ext_cps_vdu1_cp2(external_subnets_id),
|
||||||
_set_ext_cps_vdu2_cp2(external_subnets_id)
|
_set_ext_cps_vdu2_cp2(external_subnets_id)
|
||||||
|
@ -206,6 +208,7 @@ def _set_ext_virtual_link_cp2_in_num_dynamic(networks_id, external_subnets_id):
|
||||||
ext_virtual_link_cp2_in_num_dynamic = {
|
ext_virtual_link_cp2_in_num_dynamic = {
|
||||||
"id": uuidsentinel.evl2_id,
|
"id": uuidsentinel.evl2_id,
|
||||||
"resourceId": networks_id[1],
|
"resourceId": networks_id[1],
|
||||||
|
"vimConnectionId": uuidsentinel.vim_connection_id,
|
||||||
"extCps": [
|
"extCps": [
|
||||||
_set_ext_cps_vdu1_cp2_in_num_dynamic(external_subnets_id),
|
_set_ext_cps_vdu1_cp2_in_num_dynamic(external_subnets_id),
|
||||||
_set_ext_cps_vdu2_cp2_in_num_dynamic(external_subnets_id)
|
_set_ext_cps_vdu2_cp2_in_num_dynamic(external_subnets_id)
|
||||||
|
|
Loading…
Reference in New Issue