From dbc8b2543e9c92a95b967a1abf2e5445e7799eeb Mon Sep 17 00:00:00 2001
From: Eric Multanen <eric.w.multanen@intel.com>
Date: Tue, 19 May 2020 09:44:44 -0700
Subject: Fix Network and ProviderNetwork yaml formatting

Correct yaml format of Network and ProviderNetwork
CRs produced by ncm so that they can be deployed in
a cluster.

Issue-ID: MULTICLOUD-1072
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Change-Id: I27e55c0c7428ccee6ddb720445e104054eefcee3
---
 kud/tests/ncm-test.sh                    |  2 +-
 src/ncm/api/providernethandler.go        |  2 +-
 src/ncm/pkg/module/module_definitions.go |  2 +-
 src/ncm/pkg/module/network.go            | 10 +++++-----
 src/ncm/pkg/module/providernet.go        |  6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/kud/tests/ncm-test.sh b/kud/tests/ncm-test.sh
index 363a1819..78069b14 100755
--- a/kud/tests/ncm-test.sh
+++ b/kud/tests/ncm-test.sh
@@ -128,7 +128,7 @@ providernetworkdata="$(cat<<EOF
       ],
       "providerNetType": "VLAN",
       "vlan": {
-          "vlanId": 100,
+          "vlanId": "100",
           "providerInterfaceName": "eth1",
           "logicalInterfaceName": "eth1.100",
           "vlanNodeSelector": "specific",
diff --git a/src/ncm/api/providernethandler.go b/src/ncm/api/providernethandler.go
index b38a16c5..23310c31 100644
--- a/src/ncm/api/providernethandler.go
+++ b/src/ncm/api/providernethandler.go
@@ -80,7 +80,7 @@ func validateProviderNetInputs(p moduleLib.ProviderNet) error {
 	}
 
 	// validate the VLAN ID
-	errs = validation.IsValidNumber(p.Spec.Vlan.VlanId, 0, 4095)
+	errs = validation.IsValidNumberStr(p.Spec.Vlan.VlanId, 0, 4095)
 	if len(errs) > 0 {
 		return pkgerrors.Errorf("Invalid VlAN ID %v - error: %v", p.Spec.Vlan.VlanId, errs)
 	}
diff --git a/src/ncm/pkg/module/module_definitions.go b/src/ncm/pkg/module/module_definitions.go
index 36c865a5..8d4b3ad7 100644
--- a/src/ncm/pkg/module/module_definitions.go
+++ b/src/ncm/pkg/module/module_definitions.go
@@ -65,7 +65,7 @@ const VLAN_NODE_SPECIFIC = "specific"
 var VLAN_NODE_SELECTORS = [...]string{VLAN_NODE_ANY, VLAN_NODE_SPECIFIC}
 
 type Vlan struct {
-	VlanId                int      `json:"vlanID" yaml:"vlanId"`
+	VlanId                string   `json:"vlanID" yaml:"vlanId"`
 	ProviderInterfaceName string   `json:"providerInterfaceName" yaml:"providerInterfaceName"`
 	LogicalInterfaceName  string   `json:"logicalInterfaceName" yaml:"logicalInterfaceName"`
 	VlanNodeSelector      string   `json:"vlanNodeSelector" yaml:"vlanNodeSelector"`
diff --git a/src/ncm/pkg/module/network.go b/src/ncm/pkg/module/network.go
index cfb414c5..e753905e 100644
--- a/src/ncm/pkg/module/network.go
+++ b/src/ncm/pkg/module/network.go
@@ -29,8 +29,8 @@ type Network struct {
 }
 
 type NetworkSpec struct {
-	CniType     string       `json:"cniType"`
-	Ipv4Subnets []Ipv4Subnet `json:"ipv4Subnets"`
+	CniType     string       `json:"cniType" yaml:"cniType"`
+	Ipv4Subnets []Ipv4Subnet `json:"ipv4Subnets" yaml:"ipv4Subnets"`
 }
 
 // NetworkKey is the key structure that is used in the database
@@ -42,9 +42,9 @@ type NetworkKey struct {
 
 // structure for the Network Custom Resource
 type CrNetwork struct {
-	ApiVersion string `yaml:"apiVersion"`
-	Kind       string `yaml:"kind"`
-	Network    Network
+	ApiVersion string  `yaml:"apiVersion"`
+	Kind       string  `yaml:"kind"`
+	Network    Network `yaml:",inline"`
 }
 
 const NETWORK_APIVERSION = "k8s.plugin.opnfv.org/v1alpha1"
diff --git a/src/ncm/pkg/module/providernet.go b/src/ncm/pkg/module/providernet.go
index 0435f2ba..a1cbe940 100644
--- a/src/ncm/pkg/module/providernet.go
+++ b/src/ncm/pkg/module/providernet.go
@@ -37,9 +37,9 @@ type ProviderNetSpec struct {
 
 // structure for the Network Custom Resource
 type CrProviderNet struct {
-	ApiVersion  string `yaml:"apiVersion"`
-	Kind        string `yaml:"kind"`
-	ProviderNet ProviderNet
+	ApiVersion  string      `yaml:"apiVersion"`
+	Kind        string      `yaml:"kind"`
+	ProviderNet ProviderNet `yaml:",inline"`
 }
 
 const PROVIDER_NETWORK_APIVERSION = "k8s.plugin.opnfv.org/v1alpha1"
-- 
cgit 1.2.3-korg