vCPE Tosca: use direct for vnic_type

Since SDC onboarding DM has added the 'direct' value for vnic_type by
patch https://gerrit.onap.org/r/#/c/86346/, we need to use 'direct' for
SRIOV use case.

Change-Id: I2858195643e970e252e357c45ad1d919764ab20f
Issue-ID: INT-1037
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>

diff --git a/tosca/vCPE/Definitions/onap_dm.yaml b/tosca/vCPE/Definitions/onap_dm.yaml
index bd185c7..80d1153 100644 (file)
--- a/tosca/vCPE/Definitions/onap_dm.yaml
+++ b/tosca/vCPE/Definitions/onap_dm.yaml
@@ -1334,7 +1334,7 @@ node_types:
         description: Describes the type of the virtual network interface realizing the CPs instantiated from this CPD
         required: false
         constraints:
-        - valid_values: [ normal, virtio, direct-physical ]
+        - valid_values: [ direct, normal, virtio, direct-physical ]
       vnic_name: # Introduced from Beijing release, aligned with ONAP resource IM, outside the scope of SOL001 v2.5.1
         type: string
         required: false

diff --git a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
index 99d217b..55c56e7 100644 (file)
--- a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
@@ -285,7 +285,7 @@ topology_template:
                   floating_ip_activated: false
                   fixed_ip_address:
                     - { get_input: vbng_private_ip_0 }
-        vnic_type: "direct-physical"
+        vnic_type: "direct"
         virtual_network_interface_requirements:
           - name: "sriov-support"
             support_mandatory: true
@@ -332,7 +332,7 @@ topology_template:
                   floating_ip_activated: false
                   fixed_ip_address:
                     - { get_input: vbng_private_ip_3 }
-        vnic_type: "direct-physical"
+        vnic_type: "direct"
         virtual_network_interface_requirements:
           - name: "sriov-support"
             support_mandatory: true

diff --git a/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml
index af778c2..abd948e 100644 (file)
--- a/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml
@@ -189,7 +189,7 @@ topology_template:
                   floating_ip_activated: false
                   fixed_ip_address:
                     - { get_input: vbrgemu_private_ip_0 }
-        vnic_type: "direct-physical"
+        vnic_type: "direct"
         virtual_network_interface_requirements:
           - name: "sriov-support"
             support_mandatory: true

diff --git a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml
index 171f878..d197fb9 100644 (file)
--- a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml
@@ -252,7 +252,7 @@ topology_template:
                   floating_ip_activated: false
                   fixed_ip_address:
                     - { get_input: vgmux_private_ip_0 }
-        vnic_type: "direct-physical"
+        vnic_type: "direct"
         virtual_network_interface_requirements:
           - name: "sriov-support"
             support_mandatory: true
@@ -281,7 +281,7 @@ topology_template:
                   floating_ip_activated: false
                   fixed_ip_address:
                     - { get_input: vgmux_private_ip_2 }
-        vnic_type: "direct-physical"
+        vnic_type: "direct"
         virtual_network_interface_requirements:
           - name: "sriov-support"
             support_mandatory: true

diff --git a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
index 4063f95..a9e2b47 100644 (file)
--- a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
@@ -252,7 +252,7 @@ topology_template:
                   floating_ip_activated: false
                   fixed_ip_address:
                     - { get_input: vgw_private_ip_0 }
-        vnic_type: "direct-physical"
+        vnic_type: "direct"
         virtual_network_interface_requirements:
           - name: "sriov-support"
             support_mandatory: true