Change metadata from integer to string

Change-Id: Iebc1d670fdf79b2700b164a9edad8d15b7d9209f
Issue-ID: INT-746
Signed-off-by: Haibin Huang <haibin.huang@intel.com>
(cherry picked from commit e1b63938ca5f50812936abc79858929a876ced0d)

diff --git a/tosca/vCPE/infra/MainServiceTemplate.yaml b/tosca/vCPE/infra/MainServiceTemplate.yaml
index 728cb21..945d64d 100644 (file)
--- a/tosca/vCPE/infra/MainServiceTemplate.yaml
+++ b/tosca/vCPE/infra/MainServiceTemplate.yaml
@@ -52,9 +52,9 @@ topology_template:
       description: dcae collector ip
       default: 10.0.4.102
     dcae_collector_port:
-      type: integer
+      type: string
       description: dcae collector port
-      default: 8080
+      default: "8080"
     nexus_artifact_repo:
       type: string
       description: Root URL for the Nexus repository for Maven artifacts

diff --git a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml
index b362d4c..33ee971 100644 (file)
--- a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml
@@ -51,9 +51,9 @@ topology_template:
       description: dcae collector ip
       default: 10.0.4.102
     dcae_collector_port:
-      type: integer
+      type: string
       description: dcae collector port
-      default: 8080
+      default: "8080"
     nexus_artifact_repo:
       type: string
       description: Root URL for the Nexus repository for Maven artifacts

diff --git a/tosca/vCPE/vbng/MainServiceTemplate.yaml b/tosca/vCPE/vbng/MainServiceTemplate.yaml
index a466614..c18af9d 100644 (file)
--- a/tosca/vCPE/vbng/MainServiceTemplate.yaml
+++ b/tosca/vCPE/vbng/MainServiceTemplate.yaml
@@ -89,9 +89,9 @@ topology_template:
       description: dcae collector ip
       default: 10.0.4.102
     dcae_collector_port:
-      type: integer
+      type: string
       description: dcae collector port
-      default: 8080
+      default: "8080"
     pub_key:
       type: string
       description: ssh public key

diff --git a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
index cc81add..b1894a9 100644 (file)
--- a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
@@ -87,9 +87,9 @@ topology_template:
       description: dcae collector ip
       default: 10.0.4.102
     dcae_collector_port:
-      type: integer
+      type: string
       description: dcae collector port
-      default: 8080
+      default: "8080"
     pub_key:
       type: string
       description: ssh public key

diff --git a/tosca/vCPE/vgmux/MainServiceTemplate.yaml b/tosca/vCPE/vgmux/MainServiceTemplate.yaml
index b028db5..7075c51 100644 (file)
--- a/tosca/vCPE/vgmux/MainServiceTemplate.yaml
+++ b/tosca/vCPE/vgmux/MainServiceTemplate.yaml
@@ -85,9 +85,9 @@ topology_template:
       description: dcae collector ip
       default: 10.0.4.102
     dcae_collector_port:
-      type: integer
+      type: string
       description: dcae collector port
-      default: 8080
+      default: "8080"
     pub_key:
       type: string
       description: ssh public key

diff --git a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml
index 392f105..83ef37a 100644 (file)
--- a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml
@@ -84,9 +84,9 @@ topology_template:
       description: dcae collector ip
       default: 10.0.4.102
     dcae_collector_port:
-      type: integer
+      type: string
       description: dcae collector port
-      default: 8080
+      default: "8080"
     pub_key:
       type: string
       description: ssh public key

diff --git a/tosca/vCPE/vgw/MainServiceTemplate.yaml b/tosca/vCPE/vgw/MainServiceTemplate.yaml
index 4925f38..802c383 100644 (file)
--- a/tosca/vCPE/vgw/MainServiceTemplate.yaml
+++ b/tosca/vCPE/vgw/MainServiceTemplate.yaml
@@ -69,9 +69,9 @@ topology_template:
       description: dcae collector ip
       default: 10.0.4.102
     dcae_collector_port:
-      type: integer
+      type: string
       description: dcae collector port
-      default: 8080
+      default: "8080"
     pub_key:
       type: string
       description: ssh public key
@@ -97,9 +97,9 @@ topology_template:
       description: IP address of vGMUX
       default: 10.5.0.20
     vg_vgmux_tunnel_vni:
-      type: integer
+      type: string
       description: vni value of vG-vGMUX vxlan tunnel
-      default: 100
+      default: "100"
     vnf_id:
       type: string
       description: The VNF ID is provided by ONAP

diff --git a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
index 804e2c4..64bb5db 100644 (file)
--- a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
@@ -67,9 +67,9 @@ topology_template:
       description: dcae collector ip
       default: 10.0.4.102
     dcae_collector_port:
-      type: integer
+      type: string
       description: dcae collector port
-      default: 8080
+      default: "8080"
     pub_key:
       type: string
       description: ssh public key
@@ -95,9 +95,9 @@ topology_template:
       description: IP address of vGMUX
       default: 10.5.0.20
     vg_vgmux_tunnel_vni:
-      type: integer
+      type: string
       description: vni value of vG-vGMUX vxlan tunnel
-      default: 100
+      default: "100"
     vnf_id:
       type: string
       description: The VNF ID is provided by ONAP