1 files changed, 3 insertions, 40 deletions
diff --git a/src/orchestrator/pkg/module/module.go b/src/orchestrator/pkg/module/module.go
index 463a55b3..5ac704e6 100644
--- a/src/orchestrator/pkg/module/module.go
+++ b/src/orchestrator/pkg/module/module.go
@@ -17,8 +17,7 @@
 package module
 
 import (
-	"github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/validation"
-	pkgerrors "github.com/pkg/errors"
+	"github.com/onap/multicloud-k8s/src/orchestrator/pkg/module/controller"
 )
 
 // Client for using the services in the orchestrator
@@ -26,7 +25,7 @@ type Client struct {
 	Project                *ProjectClient
 	CompositeApp           *CompositeAppClient
 	App                    *AppClient
-	Controller             *ControllerClient
+	Controller             *controller.ControllerClient
 	GenericPlacementIntent *GenericPlacementIntentClient
 	AppIntent              *AppIntentClient
 	DeploymentIntentGroup  *DeploymentIntentGroupClient
@@ -43,7 +42,7 @@ func NewClient() *Client {
 	c.Project = NewProjectClient()
 	c.CompositeApp = NewCompositeAppClient()
 	c.App = NewAppClient()
-	c.Controller = NewControllerClient()
+	c.Controller = controller.NewControllerClient()
 	c.GenericPlacementIntent = NewGenericPlacementIntentClient()
 	c.AppIntent = NewAppIntentClient()
 	c.DeploymentIntentGroup = NewDeploymentIntentGroupClient()
@@ -54,39 +53,3 @@ func NewClient() *Client {
 	c.Instantiation = NewInstantiationClient()
 	return c
 }
-
-// It implements the interface for managing the ClusterProviders
-const MAX_DESCRIPTION_LEN int = 1024
-const MAX_USERDATA_LEN int = 4096
-
-type Metadata struct {
-	Name        string `json:"name" yaml:"name"`
-	Description string `json:"description" yaml:"-"`
-	UserData1   string `json:"userData1" yaml:"-"`
-	UserData2   string `json:"userData2" yaml:"-"`
-}
-
-// Check for valid format Metadata
-func IsValidMetadata(metadata Metadata) error {
-	errs := validation.IsValidName(metadata.Name)
-	if len(errs) > 0 {
-		return pkgerrors.Errorf("Invalid Metadata name=[%v], errors: %v", metadata.Name, errs)
-	}
-
-	errs = validation.IsValidString(metadata.Description, 0, MAX_DESCRIPTION_LEN, validation.VALID_ANY_STR)
-	if len(errs) > 0 {
-		return pkgerrors.Errorf("Invalid Metadata description=[%v], errors: %v", metadata.Description, errs)
-	}
-
-	errs = validation.IsValidString(metadata.UserData1, 0, MAX_DESCRIPTION_LEN, validation.VALID_ANY_STR)
-	if len(errs) > 0 {
-		return pkgerrors.Errorf("Invalid Metadata description=[%v], errors: %v", metadata.UserData1, errs)
-	}
-
-	errs = validation.IsValidString(metadata.UserData2, 0, MAX_DESCRIPTION_LEN, validation.VALID_ANY_STR)
-	if len(errs) > 0 {
-		return pkgerrors.Errorf("Invalid Metadata description=[%v], errors: %v", metadata.UserData2, errs)
-	}
-
-	return nil
-}