From f74ad24c6034294c1915f5778adb259dd65c9208 Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Thu, 28 Mar 2019 12:53:13 -0700 Subject: Refactor instance code Issue-ID: MULTICLOUD-350 Change-Id: I2574d94e4ebada1e138913b2a03549dd90906d7b Signed-off-by: Kiran Kamineni --- src/k8splugin/plugins/deployment/plugin.go | 2 -- src/k8splugin/plugins/deployment/plugin_test.go | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/k8splugin/plugins/deployment') diff --git a/src/k8splugin/plugins/deployment/plugin.go b/src/k8splugin/plugins/deployment/plugin.go index b500c86e..7ac31753 100644 --- a/src/k8splugin/plugins/deployment/plugin.go +++ b/src/k8splugin/plugins/deployment/plugin.go @@ -41,8 +41,6 @@ func Create(data *utils.ResourceData, client kubernetes.Interface) (string, erro return "", pkgerrors.New("Decoded object contains another resource different than Deployment") } deployment.Namespace = namespace - deployment.Name = data.VnfId + "-" + deployment.Name - result, err := client.AppsV1().Deployments(namespace).Create(deployment) if err != nil { return "", pkgerrors.Wrap(err, "Create Deployment error") diff --git a/src/k8splugin/plugins/deployment/plugin_test.go b/src/k8splugin/plugins/deployment/plugin_test.go index 55e0c803..446f3329 100644 --- a/src/k8splugin/plugins/deployment/plugin_test.go +++ b/src/k8splugin/plugins/deployment/plugin_test.go @@ -28,7 +28,6 @@ import ( func TestCreateDeployment(t *testing.T) { namespace := "test1" name := "mock-deployment" - internalVNFID := "1" testCases := []struct { label string input *utils.ResourceData @@ -47,7 +46,6 @@ func TestCreateDeployment(t *testing.T) { { label: "Successfully create a deployment", input: &utils.ResourceData{ - VnfId: internalVNFID, YamlFilePath: "../../mock_files/mock_yamls/deployment.yaml", }, clientOutput: &appsV1.Deployment{ @@ -56,7 +54,7 @@ func TestCreateDeployment(t *testing.T) { Namespace: namespace, }, }, - expectedResult: internalVNFID + "-" + name, + expectedResult: name, }, } -- cgit 1.2.3-korg