diff options
| author |   Liam Fallon <liam.fallon@ericsson.com> | 2018-11-13 15:04:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-13 15:04:50 +0000 |
| commit | 526388a1a38f77228e1af56984e709135cab2b72 (patch) | |
| tree | ceb99c8fe4e96f8813685bc507a9d1a88311d064 | |
| parent | 4f1a45b4ee6989a4f857f39706a415fee52d5baf (diff) | |
| parent | e51d784579da98ae10b9568c259394cfcddcb686 (diff) | |
Merge "s3p: Remove temporary workaround" into casablanca
4 files changed, 10 insertions, 14 deletions
diff --git a/s3p/templates/interfaceType/Definitions/resource-Vgw1181049-template.yml b/s3p/templates/interfaceType/Definitions/resource-Vgw1181049-template.yml index 0d4423e9..520287b4 100644 --- a/s3p/templates/interfaceType/Definitions/resource-Vgw1181049-template.yml +++ b/s3p/templates/interfaceType/Definitions/resource-Vgw1181049-template.yml @@ -213,10 +213,9 @@ topology_template: layer_protocol: - ipv4 requirements: - # Uncomment when POLICY-1254 fixed - #- virtual_link: - # capability: virtual_linkable - # node: VL_mux_gw_private_net + - virtual_link: + capability: virtual_linkable + node: VL_mux_gw_private_net - virtual_binding: capability: virtual_binding node: VDU_vgw_0 diff --git a/s3p/templates/pciDeviceId/Definitions/resource-Vgw1181049-template.yml b/s3p/templates/pciDeviceId/Definitions/resource-Vgw1181049-template.yml index edb4ba1b..76087a6e 100644 --- a/s3p/templates/pciDeviceId/Definitions/resource-Vgw1181049-template.yml +++ b/s3p/templates/pciDeviceId/Definitions/resource-Vgw1181049-template.yml @@ -210,9 +210,8 @@ topology_template: virtual_network_interface_requirements: - name: "sriov-support" support_mandatory: true - # Uncomment when POLICY-1254 fixed - #network_interface_requirements: - # interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform":"generic", "mandatory": "true", "configurationValue": "PCI-Passthrough"}' + network_interface_requirements: + interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform":"generic", "mandatory": "true", "configurationValue": "PCI-Passthrough"}' nic_io_requirements: logical_node_requirements: pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}' diff --git a/s3p/templates/pciNumDevices/Definitions/resource-Vgw1181049-template.yml b/s3p/templates/pciNumDevices/Definitions/resource-Vgw1181049-template.yml index 73c05454..62f4cae7 100644 --- a/s3p/templates/pciNumDevices/Definitions/resource-Vgw1181049-template.yml +++ b/s3p/templates/pciNumDevices/Definitions/resource-Vgw1181049-template.yml @@ -210,9 +210,8 @@ topology_template: virtual_network_interface_requirements: - name: "sriov-support" support_mandatory: true - # Uncomment when POLICY-1254 fixed - #network_interface_requirements: - # interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform":"generic", "mandatory": "true", "configurationValue": "PCI-Passthrough"}' + network_interface_requirements: + interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform":"generic", "mandatory": "true", "configurationValue": "PCI-Passthrough"}' nic_io_requirements: logical_node_requirements: pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}' diff --git a/s3p/templates/pciVendorId/Definitions/resource-Vgw1181049-template.yml b/s3p/templates/pciVendorId/Definitions/resource-Vgw1181049-template.yml index f5d3ef82..55fe2ba8 100644 --- a/s3p/templates/pciVendorId/Definitions/resource-Vgw1181049-template.yml +++ b/s3p/templates/pciVendorId/Definitions/resource-Vgw1181049-template.yml @@ -143,7 +143,7 @@ topology_template: configurable_properties: additional_vnfc_configurable_properties: { } - name: vdu_vgw_0 + name: vdu_vgw description: vgw vdu_profile: watchdog: none @@ -210,9 +210,8 @@ topology_template: virtual_network_interface_requirements: - name: "sriov-support" support_mandatory: true - # Uncomment when POLICY-1254 fixed - #network_interface_requirements: - # interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform":"generic", "mandatory": "true", "configurationValue": "PCI-Passthrough"}' + network_interface_requirements: + interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform":"generic", "mandatory": "true", "configurationValue": "PCI-Passthrough"}' nic_io_requirements: logical_node_requirements: pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}' |