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, 7 insertions, 5 deletions

diff --git a/src/orchestrator/pkg/appcontext/appcontext.go b/src/orchestrator/pkg/appcontext/appcontext.go
index d77672db..d0935d82 100644
--- a/src/orchestrator/pkg/appcontext/appcontext.go
+++ b/src/orchestrator/pkg/appcontext/appcontext.go
@@ -67,10 +67,11 @@ var AppContextStatusEnum = &statuses{
 // CompositeAppVersion, ReleaseName. This shall be used for
 // instantiation of a compositeApp
 type CompositeAppMeta struct {
-	Project      string `json:"Project"`
-	CompositeApp string `json:"CompositeApp"`
-	Version      string `json:"Version"`
-	Release      string `json:"Release"`
+	Project               string `json:"Project"`
+	CompositeApp          string `json:"CompositeApp"`
+	Version               string `json:"Version"`
+	Release               string `json:"Release"`
+	DeploymentIntentGroup string `json:"DeploymentIntentGroup"`
 }
 
 // Init app context
@@ -565,6 +566,7 @@ func (ac *AppContext) GetCompositeAppMeta() (CompositeAppMeta, error) {
 	ca := fmt.Sprintf("%v", datamap["CompositeApp"])
 	v := fmt.Sprintf("%v", datamap["Version"])
 	rn := fmt.Sprintf("%v", datamap["Release"])
+	dig := fmt.Sprintf("%v", datamap["DeploymentIntentGroup"])
 
-	return CompositeAppMeta{Project: p, CompositeApp: ca, Version: v, Release: rn}, nil
+	return CompositeAppMeta{Project: p, CompositeApp: ca, Version: v, Release: rn, DeploymentIntentGroup: dig}, nil
 }