Ovnaction and vfw updates for deploy api change

Update the ovnaction controller APIs to support
the api change of including the deployment intent
group in the URL.  Also fixup:
- vfw and other test cases to support the change
- updates to emcoctl tool and examples

Issue-ID: MULTICLOUD-1218
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Change-Id: Icadacb5ec6d7c238bb3bf8a44a39c30692ecebee

1 files changed, 14 insertions, 141 deletions

diff --git a/src/ovnaction/pkg/module/netcontrolintent.go b/src/ovnaction/pkg/module/netcontrolintent.go
index c005a935..eada4be1 100644
--- a/src/ovnaction/pkg/module/netcontrolintent.go
+++ b/src/ovnaction/pkg/module/netcontrolintent.go
@@ -17,17 +17,7 @@
 package module
 
 import (
-	"encoding/json"
-	"strings"
-
-	jyaml "github.com/ghodss/yaml"
-
-	nettypes "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
-	"github.com/onap/multicloud-k8s/src/orchestrator/pkg/appcontext"
 	"github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/db"
-	log "github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/logutils"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/kubernetes/scheme"
 
 	pkgerrors "github.com/pkg/errors"
 )
@@ -43,15 +33,15 @@ type NetControlIntentKey struct {
 	Project             string `json:"project"`
 	CompositeApp        string `json:"compositeapp"`
 	CompositeAppVersion string `json:"compositeappversion"`
+	DigName             string `json:"deploymentintentgroup"`
 }
 
 // Manager is an interface exposing the NetControlIntent functionality
 type NetControlIntentManager interface {
-	CreateNetControlIntent(nci NetControlIntent, project, compositeapp, compositeappversion string, exists bool) (NetControlIntent, error)
-	GetNetControlIntent(name, project, compositeapp, compositeappversion string) (NetControlIntent, error)
-	GetNetControlIntents(project, compositeapp, compositeappversion string) ([]NetControlIntent, error)
-	DeleteNetControlIntent(name, project, compositeapp, compositeappversion string) error
-	ApplyNetControlIntent(name, project, compositeapp, compositeappversion, appContextId string) error
+	CreateNetControlIntent(nci NetControlIntent, project, compositeapp, compositeappversion, dig string, exists bool) (NetControlIntent, error)
+	GetNetControlIntent(name, project, compositeapp, compositeappversion, dig string) (NetControlIntent, error)
+	GetNetControlIntents(project, compositeapp, compositeappversion, dig string) ([]NetControlIntent, error)
+	DeleteNetControlIntent(name, project, compositeapp, compositeappversion, dig string) error
 }
 
 // NetControlIntentClient implements the Manager
@@ -72,7 +62,7 @@ func NewNetControlIntentClient() *NetControlIntentClient {
 }
 
 // CreateNetControlIntent - create a new NetControlIntent
-func (v *NetControlIntentClient) CreateNetControlIntent(nci NetControlIntent, project, compositeapp, compositeappversion string, exists bool) (NetControlIntent, error) {
+func (v *NetControlIntentClient) CreateNetControlIntent(nci NetControlIntent, project, compositeapp, compositeappversion, dig string, exists bool) (NetControlIntent, error) {
 
 	//Construct key and tag to select the entry
 	key := NetControlIntentKey{
@@ -80,10 +70,11 @@ func (v *NetControlIntentClient) CreateNetControlIntent(nci NetControlIntent, pr
 		Project:             project,
 		CompositeApp:        compositeapp,
 		CompositeAppVersion: compositeappversion,
+		DigName:             dig,
 	}
 
 	//Check if this NetControlIntent already exists
-	_, err := v.GetNetControlIntent(nci.Metadata.Name, project, compositeapp, compositeappversion)
+	_, err := v.GetNetControlIntent(nci.Metadata.Name, project, compositeapp, compositeappversion, dig)
 	if err == nil && !exists {
 		return NetControlIntent{}, pkgerrors.New("NetControlIntent already exists")
 	}
@@ -97,7 +88,7 @@ func (v *NetControlIntentClient) CreateNetControlIntent(nci NetControlIntent, pr
 }
 
 // GetNetControlIntent returns the NetControlIntent for corresponding name
-func (v *NetControlIntentClient) GetNetControlIntent(name, project, compositeapp, compositeappversion string) (NetControlIntent, error) {
+func (v *NetControlIntentClient) GetNetControlIntent(name, project, compositeapp, compositeappversion, dig string) (NetControlIntent, error) {
 
 	//Construct key and tag to select the entry
 	key := NetControlIntentKey{
@@ -105,6 +96,7 @@ func (v *NetControlIntentClient) GetNetControlIntent(name, project, compositeapp
 		Project:             project,
 		CompositeApp:        compositeapp,
 		CompositeAppVersion: compositeappversion,
+		DigName:             dig,
 	}
 
 	value, err := db.DBconn.Find(v.db.storeName, key, v.db.tagMeta)
@@ -126,7 +118,7 @@ func (v *NetControlIntentClient) GetNetControlIntent(name, project, compositeapp
 }
 
 // GetNetControlIntentList returns all of the NetControlIntent for corresponding name
-func (v *NetControlIntentClient) GetNetControlIntents(project, compositeapp, compositeappversion string) ([]NetControlIntent, error) {
+func (v *NetControlIntentClient) GetNetControlIntents(project, compositeapp, compositeappversion, dig string) ([]NetControlIntent, error) {
 
 	//Construct key and tag to select the entry
 	key := NetControlIntentKey{
@@ -134,6 +126,7 @@ func (v *NetControlIntentClient) GetNetControlIntents(project, compositeapp, com
 		Project:             project,
 		CompositeApp:        compositeapp,
 		CompositeAppVersion: compositeappversion,
+		DigName:             dig,
 	}
 
 	var resp []NetControlIntent
@@ -155,7 +148,7 @@ func (v *NetControlIntentClient) GetNetControlIntents(project, compositeapp, com
 }
 
 // Delete the  NetControlIntent from database
-func (v *NetControlIntentClient) DeleteNetControlIntent(name, project, compositeapp, compositeappversion string) error {
+func (v *NetControlIntentClient) DeleteNetControlIntent(name, project, compositeapp, compositeappversion, dig string) error {
 
 	//Construct key and tag to select the entry
 	key := NetControlIntentKey{
@@ -163,6 +156,7 @@ func (v *NetControlIntentClient) DeleteNetControlIntent(name, project, composite
 		Project:             project,
 		CompositeApp:        compositeapp,
 		CompositeAppVersion: compositeappversion,
+		DigName:             dig,
 	}
 
 	err := db.DBconn.Remove(v.db.storeName, key)
@@ -172,124 +166,3 @@ func (v *NetControlIntentClient) DeleteNetControlIntent(name, project, composite
 
 	return nil
 }
-
-// (Test Routine) - Apply network-control-intent
-func (v *NetControlIntentClient) ApplyNetControlIntent(name, project, compositeapp, compositeappversion, appContextId string) error {
-	// TODO: Handle all Network Chain Intents for the Network Control Intent
-
-	// Handle all Workload Intents for the Network Control Intent
-	wis, err := NewWorkloadIntentClient().GetWorkloadIntents(project, compositeapp, compositeappversion, name)
-	if err != nil {
-		return pkgerrors.Wrapf(err, "Error getting Workload Intents for Network Control Intent %v for %v/%v%v not found", name, project, compositeapp, compositeappversion)
-	}
-
-	// Setup the AppContext
-	var context appcontext.AppContext
-	_, err = context.LoadAppContext(appContextId)
-	if err != nil {
-		return pkgerrors.Wrapf(err, "Error getting AppContext with Id: %v for %v/%v%v",
-			appContextId, project, compositeapp, compositeappversion)
-	}
-
-	// Handle all intents (currently just Interface intents) for each Workload Intent
-	for _, wi := range wis {
-		// The app/resource identified in the workload intent needs to be updated with two annotations.
-		// 1 - The "k8s.v1.cni.cncf.io/networks" annotation will have {"name": "ovn-networkobj", "namespace": "default"} added
-		//     to it (preserving any existing values for this annotation.
-		// 2 - The "k8s.plugin.opnfv.org/nfn-network" annotation will add any network interfaces that are provided by the
-		//     workload/interfaces intents.
-
-		// Prepare the list of interfaces from the workload intent
-		wifs, err := NewWorkloadIfIntentClient().GetWorkloadIfIntents(project,
-			compositeapp,
-			compositeappversion,
-			name,
-			wi.Metadata.Name)
-		if err != nil {
-			return pkgerrors.Wrapf(err,
-				"Error getting Workload Interface Intents for Workload Intent %v under Network Control Intent %v for %v/%v%v not found",
-				wi.Metadata.Name, name, project, compositeapp, compositeappversion)
-		}
-		if len(wifs) == 0 {
-			log.Warn("No interface intents provided for workload intent", log.Fields{
-				"project":                project,
-				"composite app":          compositeapp,
-				"composite app version":  compositeappversion,
-				"network control intent": name,
-				"workload intent":        wi.Metadata.Name,
-			})
-			continue
-		}
-
-		// Get all clusters for the current App from the AppContext
-		clusters, err := context.GetClusterNames(wi.Spec.AppName)
-		for _, c := range clusters {
-			rh, err := context.GetResourceHandle(wi.Spec.AppName, c,
-				strings.Join([]string{wi.Spec.WorkloadResource, wi.Spec.Type}, "+"))
-			if err != nil {
-				log.Warn("App Context resource handle not found", log.Fields{
-					"project":                project,
-					"composite app":          compositeapp,
-					"composite app version":  compositeappversion,
-					"network control intent": name,
-					"workload name":          wi.Metadata.Name,
-					"app":                    wi.Spec.AppName,
-					"resource":               wi.Spec.WorkloadResource,
-					"resource type":          wi.Spec.Type,
-				})
-				continue
-			}
-			r, err := context.GetValue(rh)
-			if err != nil {
-				log.Error("Error retrieving resource from App Context", log.Fields{
-					"error":           err,
-					"resource handle": rh,
-				})
-			}
-
-			// Unmarshal resource to K8S object
-			robj, err := runtime.Decode(scheme.Codecs.UniversalDeserializer(), []byte(r.(string)))
-
-			// Add network annotation to object
-			netAnnot := nettypes.NetworkSelectionElement{
-				Name:      "ovn-networkobj",
-				Namespace: "default",
-			}
-			AddNetworkAnnotation(robj, netAnnot)
-
-			// Add nfn interface annotations to object
-			var newNfnIfs []WorkloadIfIntentSpec
-			for _, i := range wifs {
-				newNfnIfs = append(newNfnIfs, i.Spec)
-			}
-			AddNfnAnnotation(robj, newNfnIfs)
-
-			// Marshal object back to yaml format (via json - seems to eliminate most clutter)
-			j, err := json.Marshal(robj)
-			if err != nil {
-				log.Error("Error marshalling resource to JSON", log.Fields{
-					"error": err,
-				})
-				continue
-			}
-			y, err := jyaml.JSONToYAML(j)
-			if err != nil {
-				log.Error("Error marshalling resource to YAML", log.Fields{
-					"error": err,
-				})
-				continue
-			}
-
-			// Update resource in AppContext
-			err = context.UpdateResourceValue(rh, string(y))
-			if err != nil {
-				log.Error("Network updating app context resource handle", log.Fields{
-					"error":           err,
-					"resource handle": rh,
-				})
-			}
-		}
-	}
-
-	return nil
-}