diff options
Diffstat (limited to 'src/orchestrator/pkg/module/app_intent.go')
| -rw-r--r-- | src/orchestrator/pkg/module/app_intent.go | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/src/orchestrator/pkg/module/app_intent.go b/src/orchestrator/pkg/module/app_intent.go index 5f4acb4d..9da252e5 100644 --- a/src/orchestrator/pkg/module/app_intent.go +++ b/src/orchestrator/pkg/module/app_intent.go @@ -25,8 +25,8 @@ import ( "encoding/json" "reflect" + gpic "github.com/onap/multicloud-k8s/src/orchestrator/pkg/gpic" "github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/db" - pkgerrors "github.com/pkg/errors" ) @@ -44,31 +44,10 @@ type MetaData struct { UserData2 string `json:"userData2"` } -// AllOf consists of AnyOfArray and ClusterNames array -type AllOf struct { - ProviderName string `json:"provider-name,omitempty"` - ClusterName string `json:"cluster-name,omitempty"` - ClusterLabelName string `json:"cluster-label-name,omitempty"` - AnyOfArray []AnyOf `json:"anyOf,omitempty"` -} - -// AnyOf consists of Array of ProviderName & ClusterLabelNames -type AnyOf struct { - ProviderName string `json:"provider-name,omitempty"` - ClusterName string `json:"cluster-name,omitempty"` - ClusterLabelName string `json:"cluster-label-name,omitempty"` -} - -// IntentStruc consists of AllOfArray and AnyOfArray -type IntentStruc struct { - AllOfArray []AllOf `json:"allOf,omitempty"` - AnyOfArray []AnyOf `json:"anyOf,omitempty"` -} - // SpecData consists of appName and intent type SpecData struct { - AppName string `json:"app-name"` - Intent IntentStruc `json:"intent"` + AppName string `json:"app-name"` + Intent gpic.IntentStruc `json:"intent"` } // AppIntentManager is an interface which exposes the @@ -112,9 +91,9 @@ type ApplicationsAndClusterInfo struct { // AppClusterInfo is a type linking the app and the clusters // on which they need to be installed. type AppClusterInfo struct { - Name string `json:"name"` - AllOfArray []AllOf `json:"allOf,omitempty"` - AnyOfArray []AnyOf `json:"anyOf,omitempty"` + Name string `json:"name"` + AllOfArray []gpic.AllOf `json:"allOf,omitempty"` + AnyOfArray []gpic.AnyOf `json:"anyOf,omitempty"` } // We will use json marshalling to convert to string to |