Containerization feature of SO

Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18
Issue-ID: SO-670
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

8 files changed, 71 insertions, 68 deletions

diff --git a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/BeanMultiTest.java b/cloudify-client/src/test/java/org/onap/so/cloudify/BeanMultiTest.java
index 5eaa27f11f..d38c7468db 100644
--- a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/BeanMultiTest.java
+++ b/cloudify-client/src/test/java/org/onap/so/cloudify/BeanMultiTest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,8 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.cloudify;
-
+package org.onap.so.cloudify;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -52,7 +51,8 @@ public class BeanMultiTest {
   }
   @Test
   public void validateBeansMsoApihandlerBeans() {
-      validator.validate("org.openecomp.mso.cloudify.v3.model",enumFilter);
+	  
+	  validator.validate("org.onap.so.cloudify.v3.model",enumFilter);
   }
   
   private static class FilterTestClasses implements PojoClassFilter {
@@ -60,4 +60,4 @@ public class BeanMultiTest {
 	      return !pojoClass.getSourcePath().contains("/src/test/java");
 	    }
 	  }
-}
\ No newline at end of file
+}
diff --git a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/base/client/CloudifyClientTest.java b/cloudify-client/src/test/java/org/onap/so/cloudify/base/client/CloudifyClientTest.java
index 1836bc5d6e..fc55eaf19c 100644
--- a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/base/client/CloudifyClientTest.java
+++ b/cloudify-client/src/test/java/org/onap/so/cloudify/base/client/CloudifyClientTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.cloudify.base.client;
+package org.onap.so.cloudify.base.client;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
@@ -30,7 +30,7 @@ import org.apache.http.HttpStatus;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.openecomp.mso.cloudify.v3.model.Execution;
+import org.onap.so.cloudify.v3.model.Execution;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 
diff --git a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/base/client/CloudifyClientTokenProviderTest.java b/cloudify-client/src/test/java/org/onap/so/cloudify/base/client/CloudifyClientTokenProviderTest.java
index c28b6b91aa..ba43dc9e78 100644
--- a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/base/client/CloudifyClientTokenProviderTest.java
+++ b/cloudify-client/src/test/java/org/onap/so/cloudify/base/client/CloudifyClientTokenProviderTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.cloudify.base.client;
+package org.onap.so.cloudify.base.client;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
@@ -42,7 +42,7 @@ public class CloudifyClientTokenProviderTest {
 
 	@Test
 	public void createTokenProvider() {
-		wireMockRule.stubFor(get(urlPathEqualTo("/testUrl")).willReturn(aResponse()
+		wireMockRule.stubFor(get(urlPathEqualTo("/testUrl/api/v3/tokens")).willReturn(aResponse()
 				.withHeader("Content-Type", "application/json").withBody("{\"role\": \"user\", \"value\": \"tokenVal\"}").withStatus(HttpStatus.SC_OK)));
 		int port = wireMockRule.port();
 
diff --git a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnectorTest.java b/cloudify-client/src/test/java/org/onap/so/cloudify/connector/http/HttpClientConnectorTest.java
index 72d2de6e9d..4475fff093 100644
--- a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnectorTest.java
+++ b/cloudify-client/src/test/java/org/onap/so/cloudify/connector/http/HttpClientConnectorTest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.cloudify.connector.http;
+package org.onap.so.cloudify.connector.http;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
@@ -48,12 +48,12 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
-import org.openecomp.mso.cloudify.base.client.CloudifyConnectException;
-import org.openecomp.mso.cloudify.base.client.CloudifyRequest;
-import org.openecomp.mso.cloudify.base.client.CloudifyResponseException;
-import org.openecomp.mso.cloudify.base.client.Entity;
-import org.openecomp.mso.cloudify.base.client.HttpMethod;
-import org.openecomp.mso.cloudify.v3.model.Deployment;
+import org.onap.so.cloudify.base.client.CloudifyConnectException;
+import org.onap.so.cloudify.base.client.CloudifyRequest;
+import org.onap.so.cloudify.base.client.CloudifyResponseException;
+import org.onap.so.cloudify.base.client.Entity;
+import org.onap.so.cloudify.base.client.HttpMethod;
+import org.onap.so.cloudify.v3.model.Deployment;
 
 public class HttpClientConnectorTest {
 	
@@ -236,7 +236,10 @@ public class HttpClientConnectorTest {
 	}
 
 	@Test
-	public void rainyDayEmptyResponse(){			
+	public void rainyDayEmptyResponse(){
+		wireMockRule.stubFor(get(urlPathEqualTo("/testUrl")).willReturn(aResponse()
+				.withHeader("Content-Type", "application/json").withBody("TEST").withStatus(HttpStatus.SC_NOT_FOUND)));
+		
 		thrown.expect(HttpClientException.class);
 		int port = wireMockRule.port();
 		HttpClientConnector conector = new HttpClientConnector();
diff --git a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/BlueprintsResourceTest.java b/cloudify-client/src/test/java/org/onap/so/cloudify/v3/client/BlueprintsResourceTest.java
index 5e443a5c69..6155cf287c 100644
--- a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/BlueprintsResourceTest.java
+++ b/cloudify-client/src/test/java/org/onap/so/cloudify/v3/client/BlueprintsResourceTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.cloudify.v3.client;
+package org.onap.so.cloudify.v3.client;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.delete;
@@ -36,12 +36,12 @@ import org.apache.http.HttpStatus;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.openecomp.mso.cloudify.v3.client.BlueprintsResource.DeleteBlueprint;
-import org.openecomp.mso.cloudify.v3.client.BlueprintsResource.GetBlueprint;
-import org.openecomp.mso.cloudify.v3.client.BlueprintsResource.ListBlueprints;
-import org.openecomp.mso.cloudify.v3.client.BlueprintsResource.UploadBlueprint;
-import org.openecomp.mso.cloudify.v3.model.Blueprint;
-import org.openecomp.mso.cloudify.v3.model.Blueprints;
+import org.onap.so.cloudify.v3.client.BlueprintsResource.DeleteBlueprint;
+import org.onap.so.cloudify.v3.client.BlueprintsResource.GetBlueprint;
+import org.onap.so.cloudify.v3.client.BlueprintsResource.ListBlueprints;
+import org.onap.so.cloudify.v3.client.BlueprintsResource.UploadBlueprint;
+import org.onap.so.cloudify.v3.model.Blueprint;
+import org.onap.so.cloudify.v3.model.Blueprints;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 
@@ -54,7 +54,7 @@ public class BlueprintsResourceTest {
 
 	@Test
 	public void cloudifyClientBlueprintFromStream() {
-		wireMockRule.stubFor(put(urlPathEqualTo("/api/v3/blueprints/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+		wireMockRule.stubFor(put(urlPathEqualTo("/api/v3/blueprints/123")).willReturn(aResponse().withHeader("Content-Type", "application/json")
 				.withBody("{\"id\": \"123\"}")
 				.withStatus(HttpStatus.SC_OK)));
 		
@@ -70,7 +70,7 @@ public class BlueprintsResourceTest {
 
 	@Test
 	public void cloudifyClientBlueprintFromUrl() {
-		wireMockRule.stubFor(put(urlPathEqualTo("/api/v3/blueprints/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+		wireMockRule.stubFor(put(urlPathEqualTo("/api/v3/blueprints/123")).willReturn(aResponse().withHeader("Content-Type", "application/json")
 				.withBody("{\"id\": \"123\"}")
 				.withStatus(HttpStatus.SC_OK)));
 		
@@ -85,7 +85,7 @@ public class BlueprintsResourceTest {
 
 	@Test
 	public void cloudifyClientBlueprintDelete() {
-		wireMockRule.stubFor(delete(urlPathEqualTo("/api/v3/blueprints/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+		wireMockRule.stubFor(delete(urlPathEqualTo("/api/v3/blueprints/123")).willReturn(aResponse().withHeader("Content-Type", "application/json")
 				.withBody("{\"id\": \"123\"}")
 				.withStatus(HttpStatus.SC_OK)));
 		
@@ -115,7 +115,7 @@ public class BlueprintsResourceTest {
 
 	@Test
 	public void cloudifyClientBlueprintGetById() {
-		wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/blueprints/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+		wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/blueprints/123")).willReturn(aResponse().withHeader("Content-Type", "application/json")
 				.withBody("{\"id\": \"123\"}")
 				.withStatus(HttpStatus.SC_OK)));
 		
@@ -130,7 +130,7 @@ public class BlueprintsResourceTest {
 
 	@Test
 	public void cloudifyClientBlueprintGetMetadataById() {
-		wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/blueprints/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+		wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/blueprints/123")).willReturn(aResponse().withHeader("Content-Type", "application/json")
 				.withBody("{\"id\": \"123\"}")
 				.withStatus(HttpStatus.SC_OK)));
 		
diff --git a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/DeploymentsResourceTest.java b/cloudify-client/src/test/java/org/onap/so/cloudify/v3/client/DeploymentsResourceTest.java
index f4741b9b08..071b7638e6 100644
--- a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/DeploymentsResourceTest.java
+++ b/cloudify-client/src/test/java/org/onap/so/cloudify/v3/client/DeploymentsResourceTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.cloudify.v3.client;
+package org.onap.so.cloudify.v3.client;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.delete;
@@ -36,15 +36,15 @@ import org.apache.http.HttpStatus;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.openecomp.mso.cloudify.v3.client.DeploymentsResource.CreateDeployment;
-import org.openecomp.mso.cloudify.v3.client.DeploymentsResource.DeleteDeployment;
-import org.openecomp.mso.cloudify.v3.client.DeploymentsResource.GetDeployment;
-import org.openecomp.mso.cloudify.v3.client.DeploymentsResource.GetDeploymentOutputs;
-import org.openecomp.mso.cloudify.v3.client.DeploymentsResource.ListDeployments;
-import org.openecomp.mso.cloudify.v3.model.CreateDeploymentParams;
-import org.openecomp.mso.cloudify.v3.model.Deployment;
-import org.openecomp.mso.cloudify.v3.model.Deployments;
-import org.openecomp.mso.cloudify.v3.model.DeploymentOutputs;
+import org.onap.so.cloudify.v3.client.DeploymentsResource.CreateDeployment;
+import org.onap.so.cloudify.v3.client.DeploymentsResource.DeleteDeployment;
+import org.onap.so.cloudify.v3.client.DeploymentsResource.GetDeployment;
+import org.onap.so.cloudify.v3.client.DeploymentsResource.GetDeploymentOutputs;
+import org.onap.so.cloudify.v3.client.DeploymentsResource.ListDeployments;
+import org.onap.so.cloudify.v3.model.CreateDeploymentParams;
+import org.onap.so.cloudify.v3.model.Deployment;
+import org.onap.so.cloudify.v3.model.Deployments;
+import org.onap.so.cloudify.v3.model.DeploymentOutputs;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 
@@ -57,7 +57,7 @@ public class DeploymentsResourceTest {
 
 	@Test
 	public void cloudifyDeploymentsCreate() {
-		wireMockRule.stubFor(put(urlPathEqualTo("/api/v3/deployments/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+		wireMockRule.stubFor(put(urlPathEqualTo("/api/v3/deployments/123")).willReturn(aResponse().withHeader("Content-Type", "application/json")
 				.withBody("{ \"id\": \"123\" }")
 				.withStatus(HttpStatus.SC_OK)));
 		
@@ -92,7 +92,7 @@ public class DeploymentsResourceTest {
 
 	@Test
 	public void cloudifyDeploymentsGet() {
-		wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/deployments/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+		wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/deployments/123")).willReturn(aResponse().withHeader("Content-Type", "application/json")
 				.withBody("{ \"id\": \"123\" }")
 				.withStatus(HttpStatus.SC_OK)));
 		
@@ -107,7 +107,7 @@ public class DeploymentsResourceTest {
 
 	@Test
 	public void cloudifyDeploymentsGetOutputs() {
-		wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/deployments/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+		wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/deployments/123/outputs")).willReturn(aResponse().withHeader("Content-Type", "application/json")
 				.withBody("{ \"deployment_id\": \"123\" }")
 				.withStatus(HttpStatus.SC_OK)));
 		
@@ -132,7 +132,7 @@ public class DeploymentsResourceTest {
 
 	@Test
 	public void cloudifyDeploymentsDelete() {
-		wireMockRule.stubFor(delete(urlPathEqualTo("/api/v3/deployments/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+		wireMockRule.stubFor(delete(urlPathEqualTo("/api/v3/deployments/name")).willReturn(aResponse().withHeader("Content-Type", "application/json")
 				.withBody("{ \"id\": \"123\" }")
 				.withStatus(HttpStatus.SC_OK)));
 		
diff --git a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/ExecutionsResourceTest.java b/cloudify-client/src/test/java/org/onap/so/cloudify/v3/client/ExecutionsResourceTest.java
index 93f5473159..098b5cf387 100644
--- a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/ExecutionsResourceTest.java
+++ b/cloudify-client/src/test/java/org/onap/so/cloudify/v3/client/ExecutionsResourceTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.cloudify.v3.client;
+package org.onap.so.cloudify.v3.client;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
@@ -32,16 +32,16 @@ import org.apache.http.HttpStatus;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.openecomp.mso.cloudify.connector.http.HttpClientException;
-import org.openecomp.mso.cloudify.v3.client.ExecutionsResource.CancelExecution;
-import org.openecomp.mso.cloudify.v3.client.ExecutionsResource.GetExecution;
-import org.openecomp.mso.cloudify.v3.client.ExecutionsResource.ListExecutions;
-import org.openecomp.mso.cloudify.v3.client.ExecutionsResource.StartExecution;
-import org.openecomp.mso.cloudify.v3.client.ExecutionsResource.UpdateExecution;
-import org.openecomp.mso.cloudify.v3.model.CancelExecutionParams;
-import org.openecomp.mso.cloudify.v3.model.Execution;
-import org.openecomp.mso.cloudify.v3.model.Executions;
-import org.openecomp.mso.cloudify.v3.model.StartExecutionParams;
+import org.onap.so.cloudify.connector.http.HttpClientException;
+import org.onap.so.cloudify.v3.client.ExecutionsResource.CancelExecution;
+import org.onap.so.cloudify.v3.client.ExecutionsResource.GetExecution;
+import org.onap.so.cloudify.v3.client.ExecutionsResource.ListExecutions;
+import org.onap.so.cloudify.v3.client.ExecutionsResource.StartExecution;
+import org.onap.so.cloudify.v3.client.ExecutionsResource.UpdateExecution;
+import org.onap.so.cloudify.v3.model.CancelExecutionParams;
+import org.onap.so.cloudify.v3.model.Execution;
+import org.onap.so.cloudify.v3.model.Executions;
+import org.onap.so.cloudify.v3.model.StartExecutionParams;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 
@@ -99,7 +99,7 @@ public class ExecutionsResourceTest {
 
 	@Test
 	public void cloudifyClientExecutionById() {
-		wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/executions")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+		wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/executions/123")).willReturn(aResponse().withHeader("Content-Type", "application/json")
 				.withBody("{ \"id\": \"123\" }")
 				.withStatus(HttpStatus.SC_OK)));
 		
@@ -150,7 +150,7 @@ public class ExecutionsResourceTest {
 
 	@Test
 	public void cloudifyClientCancelExecution() {
-		wireMockRule.stubFor(post(urlPathEqualTo("/api/v3/executions")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+		wireMockRule.stubFor(post(urlPathEqualTo("/api/v3/executions/123")).willReturn(aResponse().withHeader("Content-Type", "application/json")
 				.withBody("{ \"id\": \"123\" }")
 				.withStatus(HttpStatus.SC_OK)));
 		
diff --git a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/NodeInstancesResourceTest.java b/cloudify-client/src/test/java/org/onap/so/cloudify/v3/client/NodeInstancesResourceTest.java
index 66616e9c8a..c5f3be4ce2 100644
--- a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/NodeInstancesResourceTest.java
+++ b/cloudify-client/src/test/java/org/onap/so/cloudify/v3/client/NodeInstancesResourceTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.cloudify.v3.client;
+package org.onap.so.cloudify.v3.client;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
@@ -31,13 +31,13 @@ import org.apache.http.HttpStatus;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.openecomp.mso.cloudify.connector.http.HttpClientException;
-import org.openecomp.mso.cloudify.v3.client.NodeInstancesResource.GetNodeInstance;
-import org.openecomp.mso.cloudify.v3.client.NodeInstancesResource.ListNodeInstances;
-import org.openecomp.mso.cloudify.v3.client.NodeInstancesResource.UpdateNodeInstance;
-import org.openecomp.mso.cloudify.v3.model.NodeInstance;
-import org.openecomp.mso.cloudify.v3.model.NodeInstances;
-import org.openecomp.mso.cloudify.v3.model.UpdateNodeInstanceParams;
+import org.onap.so.cloudify.connector.http.HttpClientException;
+import org.onap.so.cloudify.v3.client.NodeInstancesResource.GetNodeInstance;
+import org.onap.so.cloudify.v3.client.NodeInstancesResource.ListNodeInstances;
+import org.onap.so.cloudify.v3.client.NodeInstancesResource.UpdateNodeInstance;
+import org.onap.so.cloudify.v3.model.NodeInstance;
+import org.onap.so.cloudify.v3.model.NodeInstances;
+import org.onap.so.cloudify.v3.model.UpdateNodeInstanceParams;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 
@@ -50,7 +50,7 @@ public class NodeInstancesResourceTest {
 
 	@Test
 	public void nodeInstanceGet() {
-		wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/node-instances/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+		wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/node-instances/123")).willReturn(aResponse().withHeader("Content-Type", "application/json")
 				.withBody("{ \"node_instance\": { \"id\": \"123\" } }")
 				.withStatus(HttpStatus.SC_OK)));