summaryrefslogtreecommitdiffstats
path: root/tosca
diff options
context:
space:
mode:
authorHuang Haibin <haibin.huang@intel.com>2018-11-01 16:30:24 +0800
committerHuang Haibin <haibin.huang@intel.com>2018-11-01 16:30:24 +0800
commit8d9ae22976d022e2da392ecb48e4c0c38eaa6d9f (patch)
tree75efd75ee29f1d181c2d272073adeb63268f3dca /tosca
parentc1aae8bb8b148b18f1da33b59fdfb95f727619e1 (diff)
Fix sriov model error
Change-Id: I3c14ddb45dc6357e8043dfd4f7d8d6fdf602b8cf Issue-ID: INT-706 Signed-off-by: Huang Haibin <haibin.huang@intel.com>
Diffstat (limited to 'tosca')
-rw-r--r--tosca/vCPE/infra/MainServiceTemplate.yaml6
-rw-r--r--tosca/vCPE/infra/MainServiceTemplate_sriov.yaml2
-rw-r--r--tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml14
-rw-r--r--tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml11
-rw-r--r--tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml14
-rw-r--r--tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml7
6 files changed, 30 insertions, 24 deletions
diff --git a/tosca/vCPE/infra/MainServiceTemplate.yaml b/tosca/vCPE/infra/MainServiceTemplate.yaml
index bfb4c7e4..0aca66a6 100644
--- a/tosca/vCPE/infra/MainServiceTemplate.yaml
+++ b/tosca/vCPE/infra/MainServiceTemplate.yaml
@@ -77,12 +77,12 @@ topology_template:
default: 10.0.0.0/16
mr_ip_addr:
type: string
- description: message router ip for vDHCP configuration
+ description: message router ip that for vDHCP configuration
default: 10.0.11.1
mr_ip_port:
type: string
- label: Message Router Port
- description: message router port for vDHCP configuration
+ description: IP port of the Message Router that for vDHCP configuration
+ default: "3904"
dcae_collector_ip:
type: string
description: dcae collector ip
diff --git a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml
index 52b44f69..05c7258c 100644
--- a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml
@@ -81,8 +81,8 @@ topology_template:
default: 10.0.11.1
mr_ip_port:
type: string
- label: Message Router Port
description: IP port of the Message Router that for vDHCP configuration
+ default: "3904"
dcae_collector_ip:
type: string
description: dcae collector ip
diff --git a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
index 2684899d..61ca67ce 100644
--- a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
@@ -293,9 +293,10 @@ topology_template:
network_interface_requirements:
interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "SR-IOV"}'
nic_io_requirements:
- pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
- pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
- pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
+ logical_node_requirements:
+ pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
+ pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
+ pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
requirements:
- virtual_binding: VDU_vbng_0
- virtual_link: VL_brgemu_bng_private_net
@@ -339,9 +340,10 @@ topology_template:
network_interface_requirements:
interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "SR-IOV"}'
nic_io_requirements:
- pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
- pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
- pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
+ logical_node_requirements:
+ pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
+ pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
+ pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
requirements:
- virtual_binding: VDU_vbng_0
- virtual_link: VL_bng_gmux_private_net
diff --git a/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml
index 3af42434..29498e65 100644
--- a/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml
@@ -207,9 +207,10 @@ topology_template:
network_interface_requirements:
interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "SR-IOV"}'
nic_io_requirements:
- pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
- pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
- pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
+ logical_node_requirements:
+ pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
+ pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
+ pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
requirements:
- virtual_binding: VDU_vbrgemu_0
- virtual_link: VL_vbrgemu_bng_private_net
@@ -233,7 +234,7 @@ topology_template:
max_number_of_instances: 1
watchdog: none
inject_files: #TODO SDC bug
- source_path: ../Artifacts/keys/authorized_keys #SSH authorized_keys
+ source_path: ../Artifcats/keys/authorized_keys #SSH authorized_keys
dest_path: /home/ubuntu/.ssh/authorized_keys
meta_data:
vnf_id: { get_input: vnf_id }
@@ -289,5 +290,5 @@ topology_template:
artifacts:
sw_image: #TODO need to put glance image name here
#file: { get_input: vcpe_image_name }
- file: ../Artifacats/images/ubuntu_16.04
+ file: ../Artifacts/images/ubuntu_16.04
type: tosca.artifacts.nfv.SwImage
diff --git a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml
index ff109750..78f24927 100644
--- a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml
@@ -264,9 +264,10 @@ topology_template:
network_interface_requirements:
interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "SR-IOV"}'
nic_io_requirements:
- pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
- pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
- pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
+ logical_node_requirements:
+ pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
+ pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
+ pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
requirements:
- virtual_binding: VDU_vgmux_0
- virtual_link: VL_bng_gmux_private_net
@@ -292,9 +293,10 @@ topology_template:
network_interface_requirements:
interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "SR-IOV"}'
nic_io_requirements:
- pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
- pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
- pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
+ logical_node_requirements:
+ pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
+ pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
+ pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
requirements:
- virtual_binding: VDU_vgmux_0
- virtual_link: VL_mux_gw_private_net
diff --git a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
index 94ca7316..4a3a3429 100644
--- a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
@@ -267,9 +267,10 @@ topology_template:
network_interface_requirements:
interfaceType: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "SR-IOV"}'
nic_io_requirements:
- pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
- pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
- pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
+ logical_node_requirements:
+ pciVendorId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1234"}'
+ pciDeviceId: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "5678"}'
+ pciNumDevices: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1"}'
requirements:
- virtual_binding: VDU_vgw_0
- virtual_link: VL_mux_gw_private_net