summaryrefslogtreecommitdiffstats
path: root/cloudify-client
diff options
context:
space:
mode:
authorBenjamin, Max (mb388a) <mb388a@us.att.com>2018-07-30 15:56:09 -0400
committerBenjamin, Max (mb388a) <mb388a@us.att.com>2018-07-31 11:09:25 -0400
commit5a6a6de6f1a26a1897e4917a0df613e25a24eb70 (patch)
tree59a968f27b4b603aacc9d5e7b51fb598aeec5321 /cloudify-client
parentb6dc38501f3b746426b42d9de4cc883d894149e8 (diff)
Containerization feature of SO
Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18 Issue-ID: SO-670 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Diffstat (limited to 'cloudify-client')
-rw-r--r--cloudify-client/pom.xml42
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyBaseException.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyBaseException.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClient.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyClient.java)14
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClientConnector.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyClientConnector.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClientTokenProvider.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyClientTokenProvider.java)12
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyConnectException.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyConnectException.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyRequest.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyRequest.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyResponse.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyResponse.java)9
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyResponseException.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyResponseException.java)8
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyResponseStatus.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyResponseStatus.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifySimpleTokenProvider.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifySimpleTokenProvider.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyTokenProvider.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyTokenProvider.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/Entity.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/Entity.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/base/client/HttpMethod.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/HttpMethod.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientConnector.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnector.java)20
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientException.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientException.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientRedirectStrategy.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientRedirectStrategy.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientResponse.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientResponse.java)12
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/BlueprintsResource.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/BlueprintsResource.java)20
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/Cloudify.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/Cloudify.java)10
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/DeploymentsResource.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/DeploymentsResource.java)22
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/ExecutionsResource.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/ExecutionsResource.java)24
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/NodeInstancesResource.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/NodeInstancesResource.java)20
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/TokensResource.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/TokensResource.java)14
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/AzureConfig.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/AzureConfig.java)148
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Blueprint.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Blueprint.java)14
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Blueprints.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Blueprints.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/CancelExecutionParams.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/CancelExecutionParams.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/CloudifyError.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/CloudifyError.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/CreateDeploymentParams.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/CreateDeploymentParams.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Deployment.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Deployment.java)40
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/DeploymentOutputs.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/DeploymentOutputs.java)8
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Deployments.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Deployments.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Execution.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Execution.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Executions.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Executions.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Metadata.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Metadata.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/NodeInstance.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/NodeInstance.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/NodeInstances.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/NodeInstances.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/OpenstackConfig.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/OpenstackConfig.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Pagination.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Pagination.java)8
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/ParameterDefinition.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/ParameterDefinition.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/StartExecutionParams.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/StartExecutionParams.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Token.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Token.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/UpdateExecutionParams.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/UpdateExecutionParams.java)6
-rw-r--r--cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/UpdateNodeInstanceParams.java (renamed from cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/UpdateNodeInstanceParams.java)6
-rw-r--r--cloudify-client/src/test/java/org/onap/so/cloudify/BeanMultiTest.java (renamed from cloudify-client/src/test/java/org/openecomp/mso/cloudify/BeanMultiTest.java)12
-rw-r--r--cloudify-client/src/test/java/org/onap/so/cloudify/base/client/CloudifyClientTest.java (renamed from cloudify-client/src/test/java/org/openecomp/mso/cloudify/base/client/CloudifyClientTest.java)4
-rw-r--r--cloudify-client/src/test/java/org/onap/so/cloudify/base/client/CloudifyClientTokenProviderTest.java (renamed from cloudify-client/src/test/java/org/openecomp/mso/cloudify/base/client/CloudifyClientTokenProviderTest.java)4
-rw-r--r--cloudify-client/src/test/java/org/onap/so/cloudify/connector/http/HttpClientConnectorTest.java (renamed from cloudify-client/src/test/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnectorTest.java)23
-rw-r--r--cloudify-client/src/test/java/org/onap/so/cloudify/v3/client/BlueprintsResourceTest.java (renamed from cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/BlueprintsResourceTest.java)24
-rw-r--r--cloudify-client/src/test/java/org/onap/so/cloudify/v3/client/DeploymentsResourceTest.java (renamed from cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/DeploymentsResourceTest.java)28
-rw-r--r--cloudify-client/src/test/java/org/onap/so/cloudify/v3/client/ExecutionsResourceTest.java (renamed from cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/ExecutionsResourceTest.java)26
-rw-r--r--cloudify-client/src/test/java/org/onap/so/cloudify/v3/client/NodeInstancesResourceTest.java (renamed from cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/NodeInstancesResourceTest.java)18
53 files changed, 366 insertions, 380 deletions
diff --git a/cloudify-client/pom.xml b/cloudify-client/pom.xml
index 057a1ed98f..38aff4c43d 100644
--- a/cloudify-client/pom.xml
+++ b/cloudify-client/pom.xml
@@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.so</groupId>
<artifactId>so</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
-
+
<groupId>org.onap.so</groupId>
<artifactId>cloudify-client</artifactId>
<packaging>jar</packaging>
@@ -25,7 +25,7 @@
</plugin>
</plugins>
</build>
-
+
<dependencies>
<dependency>
<groupId>org.onap.so</groupId>
@@ -41,35 +41,9 @@
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
</dependencies>
-
-
-</project>
+</project> \ No newline at end of file
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyBaseException.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyBaseException.java
index 1fe933b174..a6e0cc3680 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyBaseException.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyBaseException.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.base.client;
+package org.onap.so.cloudify.base.client;
/**
* A common abstract parent of all Openstack Exception types, allowing
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyClient.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClient.java
index 03f5a9907b..8387557c24 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyClient.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClient.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,11 +18,11 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.mso.cloudify.base.client;
+package org.onap.so.cloudify.base.client;
import java.util.Properties;
-import org.openecomp.mso.cloudify.connector.http.HttpClientConnector;
+import org.onap.so.cloudify.connector.http.HttpClientConnector;
public class CloudifyClient {
@@ -81,7 +81,11 @@ public class CloudifyClient {
}
}
- throw authException;
+ if (authException != null) {
+ throw authException;
+ }
+
+ return null;
}
/**
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyClientConnector.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClientConnector.java
index 12162c3d4f..2e00c4c396 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyClientConnector.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClientConnector.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.base.client;
+package org.onap.so.cloudify.base.client;
public interface CloudifyClientConnector {
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyClientTokenProvider.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClientTokenProvider.java
index 946720bb45..7676afa6c7 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyClientTokenProvider.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyClientTokenProvider.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,15 +18,15 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.mso.cloudify.base.client;
+package org.onap.so.cloudify.base.client;
import java.util.Date;
import org.apache.commons.lang.time.DateUtils;
-import org.openecomp.mso.cloudify.v3.client.Cloudify;
-import org.openecomp.mso.cloudify.v3.client.TokensResource.GetToken;
-import org.openecomp.mso.cloudify.v3.model.Token;
+import org.onap.so.cloudify.v3.client.Cloudify;
+import org.onap.so.cloudify.v3.client.TokensResource.GetToken;
+import org.onap.so.cloudify.v3.model.Token;
/**
* Cloudify Token Provider that uses the Cloudify client API itself to obtain a token
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyConnectException.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyConnectException.java
index 3b28b6e3f9..3f378fd10f 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyConnectException.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyConnectException.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.base.client;
+package org.onap.so.cloudify.base.client;
/**
* Custom RuntimeException to report connection errors to Openstack endpoints.
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyRequest.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyRequest.java
index 6b0a4c1d13..ffa89fe4a3 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyRequest.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyRequest.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.base.client;
+package org.onap.so.cloudify.base.client;
import java.util.Arrays;
import java.util.HashMap;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyResponse.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyResponse.java
index 7ddeaa8c4b..2d920734b5 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyResponse.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyResponse.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,12 +18,13 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.mso.cloudify.base.client;
+package org.onap.so.cloudify.base.client;
import java.io.InputStream;
+import java.io.Serializable;
import java.util.Map;
-public interface CloudifyResponse {
+public interface CloudifyResponse extends Serializable{
public <T> T getEntity(Class<T> returnType);
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyResponseException.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyResponseException.java
index 27e61f9581..f7c42d3957 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyResponseException.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyResponseException.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,9 +18,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.mso.cloudify.base.client;
+package org.onap.so.cloudify.base.client;
-import org.openecomp.mso.cloudify.v3.model.CloudifyError;
+import org.onap.so.cloudify.v3.model.CloudifyError;
public class CloudifyResponseException extends CloudifyBaseException {
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyResponseStatus.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyResponseStatus.java
index 38079d6f26..af6940c041 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyResponseStatus.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyResponseStatus.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.base.client;
+package org.onap.so.cloudify.base.client;
public class CloudifyResponseStatus {
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifySimpleTokenProvider.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifySimpleTokenProvider.java
index 8f37e069d9..074d164b48 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifySimpleTokenProvider.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifySimpleTokenProvider.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.base.client;
+package org.onap.so.cloudify.base.client;
public class CloudifySimpleTokenProvider implements CloudifyTokenProvider {
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyTokenProvider.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyTokenProvider.java
index ee32f9321d..8915a0393b 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/CloudifyTokenProvider.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/CloudifyTokenProvider.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.base.client;
+package org.onap.so.cloudify.base.client;
public interface CloudifyTokenProvider {
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/Entity.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/Entity.java
index db2587937b..15a913a4c4 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/Entity.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/Entity.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.base.client;
+package org.onap.so.cloudify.base.client;
public class Entity<T> {
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/HttpMethod.java b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/HttpMethod.java
index a8c0cab2d8..aa991dfcf8 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/base/client/HttpMethod.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/base/client/HttpMethod.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.base.client;
+package org.onap.so.cloudify.base.client;
public enum HttpMethod {
HEAD, GET, POST, PUT, PATCH, DELETE, OPTIONS, TRACE
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnector.java b/cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientConnector.java
index 17904adf7b..a10945e855 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnector.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientConnector.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 java.io.IOException;
import java.io.InputStream;
@@ -48,12 +48,12 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
-import org.openecomp.mso.cloudify.base.client.CloudifyClientConnector;
-import org.openecomp.mso.cloudify.base.client.CloudifyConnectException;
-import org.openecomp.mso.cloudify.base.client.CloudifyRequest;
-import org.openecomp.mso.cloudify.base.client.CloudifyResponse;
-import org.openecomp.mso.cloudify.base.client.CloudifyResponseException;
-import org.openecomp.mso.logger.MsoLogger;
+import org.onap.so.cloudify.base.client.CloudifyClientConnector;
+import org.onap.so.cloudify.base.client.CloudifyConnectException;
+import org.onap.so.cloudify.base.client.CloudifyRequest;
+import org.onap.so.cloudify.base.client.CloudifyResponse;
+import org.onap.so.cloudify.base.client.CloudifyResponseException;
+import org.onap.so.logger.MsoLogger;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonRootName;
@@ -67,7 +67,7 @@ public class HttpClientConnector implements CloudifyClientConnector {
public static ObjectMapper DEFAULT_MAPPER;
public static ObjectMapper WRAPPED_MAPPER;
- private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+ private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA, HttpClientConnector.class);
static {
DEFAULT_MAPPER = new ObjectMapper();
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientException.java b/cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientException.java
index d5eb675257..eb967af996 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientException.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientException.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;
/*
* Declare a RuntimeException since the Interface does not declare any
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientRedirectStrategy.java b/cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientRedirectStrategy.java
index 809c5d0175..a7575ff499 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientRedirectStrategy.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientRedirectStrategy.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 java.net.URI;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientResponse.java b/cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientResponse.java
index a49f96cf0d..0c1743fc5f 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientResponse.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientResponse.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,14 +18,14 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.mso.cloudify.connector.http;
+package org.onap.so.cloudify.connector.http;
import org.apache.http.Header;
import org.apache.http.HttpResponse;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.mso.cloudify.base.client.CloudifyResponse;
-import org.openecomp.mso.logger.MsoLogger;
+import org.onap.so.cloudify.base.client.CloudifyResponse;
+import org.onap.so.logger.MsoLogger;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -36,7 +36,7 @@ import java.util.Map;
public class HttpClientResponse implements CloudifyResponse {
- private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
+ private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA, HttpClientResponse.class);
private HttpResponse response = null;
private String entityBody = null;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/BlueprintsResource.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/BlueprintsResource.java
index 988f8214d1..03c130e4c5 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/BlueprintsResource.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/BlueprintsResource.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,16 +18,16 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.mso.cloudify.v3.client;
+package org.onap.so.cloudify.v3.client;
import java.io.InputStream;
-import org.openecomp.mso.cloudify.v3.model.Blueprint;
-import org.openecomp.mso.cloudify.v3.model.Blueprints;
-import org.openecomp.mso.cloudify.base.client.Entity;
-import org.openecomp.mso.cloudify.base.client.HttpMethod;
-import org.openecomp.mso.cloudify.base.client.CloudifyClient;
-import org.openecomp.mso.cloudify.base.client.CloudifyRequest;
+import org.onap.so.cloudify.v3.model.Blueprint;
+import org.onap.so.cloudify.v3.model.Blueprints;
+import org.onap.so.cloudify.base.client.Entity;
+import org.onap.so.cloudify.base.client.HttpMethod;
+import org.onap.so.cloudify.base.client.CloudifyClient;
+import org.onap.so.cloudify.base.client.CloudifyRequest;
public class BlueprintsResource {
@@ -54,7 +54,7 @@ public class BlueprintsResource {
}
public GetBlueprint getById(String id) {
- return new GetBlueprint(id, null);
+ return new GetBlueprint(id, "");
}
// Return all of the metadata, but not the plan
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/Cloudify.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/Cloudify.java
index c0669b9919..cd47e1937a 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/Cloudify.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/Cloudify.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,10 +18,10 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.mso.cloudify.v3.client;
+package org.onap.so.cloudify.v3.client;
-import org.openecomp.mso.cloudify.base.client.CloudifyClient;
-import org.openecomp.mso.cloudify.base.client.CloudifyClientConnector;
+import org.onap.so.cloudify.base.client.CloudifyClient;
+import org.onap.so.cloudify.base.client.CloudifyClientConnector;
/**
* Reference: http://docs.getcloudify.org/api/v3/
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/DeploymentsResource.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/DeploymentsResource.java
index e115370243..1160bee420 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/DeploymentsResource.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/DeploymentsResource.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,16 +18,16 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.mso.cloudify.v3.client;
+package org.onap.so.cloudify.v3.client;
-import org.openecomp.mso.cloudify.v3.model.CreateDeploymentParams;
-import org.openecomp.mso.cloudify.v3.model.Deployment;
-import org.openecomp.mso.cloudify.v3.model.DeploymentOutputs;
-import org.openecomp.mso.cloudify.v3.model.Deployments;
-import org.openecomp.mso.cloudify.base.client.Entity;
-import org.openecomp.mso.cloudify.base.client.HttpMethod;
-import org.openecomp.mso.cloudify.base.client.CloudifyClient;
-import org.openecomp.mso.cloudify.base.client.CloudifyRequest;
+import org.onap.so.cloudify.v3.model.CreateDeploymentParams;
+import org.onap.so.cloudify.v3.model.Deployment;
+import org.onap.so.cloudify.v3.model.DeploymentOutputs;
+import org.onap.so.cloudify.v3.model.Deployments;
+import org.onap.so.cloudify.base.client.Entity;
+import org.onap.so.cloudify.base.client.HttpMethod;
+import org.onap.so.cloudify.base.client.CloudifyClient;
+import org.onap.so.cloudify.base.client.CloudifyRequest;
public class DeploymentsResource {
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/ExecutionsResource.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/ExecutionsResource.java
index 43bc82b0b3..6057fbba97 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/ExecutionsResource.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/ExecutionsResource.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,17 +18,17 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.mso.cloudify.v3.client;
+package org.onap.so.cloudify.v3.client;
-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.openecomp.mso.cloudify.v3.model.UpdateExecutionParams;
-import org.openecomp.mso.cloudify.base.client.Entity;
-import org.openecomp.mso.cloudify.base.client.HttpMethod;
-import org.openecomp.mso.cloudify.base.client.CloudifyClient;
-import org.openecomp.mso.cloudify.base.client.CloudifyRequest;
+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 org.onap.so.cloudify.v3.model.UpdateExecutionParams;
+import org.onap.so.cloudify.base.client.Entity;
+import org.onap.so.cloudify.base.client.HttpMethod;
+import org.onap.so.cloudify.base.client.CloudifyClient;
+import org.onap.so.cloudify.base.client.CloudifyRequest;
public class ExecutionsResource {
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/NodeInstancesResource.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/NodeInstancesResource.java
index 19f7958434..801ced6ef7 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/NodeInstancesResource.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/NodeInstancesResource.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,15 +18,15 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.mso.cloudify.v3.client;
+package org.onap.so.cloudify.v3.client;
-import org.openecomp.mso.cloudify.v3.model.UpdateNodeInstanceParams;
-import org.openecomp.mso.cloudify.v3.model.NodeInstance;
-import org.openecomp.mso.cloudify.v3.model.NodeInstances;
-import org.openecomp.mso.cloudify.base.client.Entity;
-import org.openecomp.mso.cloudify.base.client.HttpMethod;
-import org.openecomp.mso.cloudify.base.client.CloudifyClient;
-import org.openecomp.mso.cloudify.base.client.CloudifyRequest;
+import org.onap.so.cloudify.v3.model.UpdateNodeInstanceParams;
+import org.onap.so.cloudify.v3.model.NodeInstance;
+import org.onap.so.cloudify.v3.model.NodeInstances;
+import org.onap.so.cloudify.base.client.Entity;
+import org.onap.so.cloudify.base.client.HttpMethod;
+import org.onap.so.cloudify.base.client.CloudifyClient;
+import org.onap.so.cloudify.base.client.CloudifyRequest;
public class NodeInstancesResource {
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/TokensResource.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/TokensResource.java
index 80e5fb0065..3ef2ef2bb9 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/client/TokensResource.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/client/TokensResource.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,12 +18,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.mso.cloudify.v3.client;
+package org.onap.so.cloudify.v3.client;
-import org.openecomp.mso.cloudify.v3.model.Token;
-import org.openecomp.mso.cloudify.base.client.HttpMethod;
-import org.openecomp.mso.cloudify.base.client.CloudifyClient;
-import org.openecomp.mso.cloudify.base.client.CloudifyRequest;
+import org.onap.so.cloudify.v3.model.Token;
+import org.onap.so.cloudify.base.client.HttpMethod;
+import org.onap.so.cloudify.base.client.CloudifyClient;
+import org.onap.so.cloudify.base.client.CloudifyRequest;
public class TokensResource {
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/AzureConfig.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/AzureConfig.java
index ddfd1fd6a4..29f2d1a8ce 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/AzureConfig.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/AzureConfig.java
@@ -1,75 +1,75 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.cloudify.v3.model;
-
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class AzureConfig implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @JsonProperty("subscription_id")
- String subscriptionId;
-
- @JsonProperty("tenant_id")
- String tenantId;
-
- @JsonProperty("client_id")
- String clientId;
-
- @JsonProperty("client_secret")
- String clientSecret;
-
- public String getSubscriptionId() {
- return subscriptionId;
- }
-
- public void setSubscriptionId(String subscriptionId) {
- this.subscriptionId = subscriptionId;
- }
-
- public String getTenantId() {
- return tenantId;
- }
-
- public void setTenantId(String tenantId) {
- this.tenantId = tenantId;
- }
-
- public String getClientId() {
- return clientId;
- }
-
- public void setClientId(String clientId) {
- this.clientId = clientId;
- }
-
- public String getClientSecret() {
- return clientSecret;
- }
-
- public void setClientSecret(String clientSecret) {
- this.clientSecret = clientSecret;
- }
-
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.cloudify.v3.model;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class AzureConfig implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @JsonProperty("subscription_id")
+ String subscriptionId;
+
+ @JsonProperty("tenant_id")
+ String tenantId;
+
+ @JsonProperty("client_id")
+ String clientId;
+
+ @JsonProperty("client_secret")
+ String clientSecret;
+
+ public String getSubscriptionId() {
+ return subscriptionId;
+ }
+
+ public void setSubscriptionId(String subscriptionId) {
+ this.subscriptionId = subscriptionId;
+ }
+
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ public void setTenantId(String tenantId) {
+ this.tenantId = tenantId;
+ }
+
+ public String getClientId() {
+ return clientId;
+ }
+
+ public void setClientId(String clientId) {
+ this.clientId = clientId;
+ }
+
+ public String getClientSecret() {
+ return clientSecret;
+ }
+
+ public void setClientSecret(String clientSecret) {
+ this.clientSecret = clientSecret;
+ }
+
} \ No newline at end of file
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Blueprint.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Blueprint.java
index 468195909f..ef2a258b9e 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Blueprint.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Blueprint.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import java.io.IOException;
import java.io.Serializable;
@@ -34,7 +34,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
//@JsonRootName("blueprint")
public class Blueprint implements Serializable {
- private static final long serialVersionUID = 1L;
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 938604986548763151L;
@JsonProperty("created_at")
private Date createdAt;
@@ -56,7 +60,7 @@ public class Blueprint implements Serializable {
@JsonProperty("updated_at")
private Date updatedAt;
-
+
public Date getCreatedAt() {
return createdAt;
}
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Blueprints.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Blueprints.java
index bf9b376eaa..aa8e2fc28f 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Blueprints.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Blueprints.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import java.io.Serializable;
import java.util.List;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/CancelExecutionParams.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/CancelExecutionParams.java
index 5d7672549b..4e90d699c7 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/CancelExecutionParams.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/CancelExecutionParams.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import java.io.Serializable;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/CloudifyError.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/CloudifyError.java
index fcd9120c78..546ae086d8 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/CloudifyError.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/CloudifyError.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import java.io.Serializable;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/CreateDeploymentParams.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/CreateDeploymentParams.java
index f33b7afe4c..10b1854d81 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/CreateDeploymentParams.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/CreateDeploymentParams.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Deployment.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Deployment.java
index 515e8a0be1..9bb3107798 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Deployment.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Deployment.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import java.io.IOException;
import java.io.Serializable;
@@ -77,24 +77,24 @@ public class Deployment implements Serializable {
@JsonProperty("workflows")
private List<Workflow> workflows;
-
- public List<Object> getPolicyTriggers() {
- return policyTriggers;
- }
-
- public void setPolicyTriggers(List<Object> policyTriggers) {
- this.policyTriggers = policyTriggers;
- }
-
- public List<Object> getPolicyTypes() {
- return policyTypes;
- }
-
- public void setPolicyTypes(List<Object> policyTypes) {
- this.policyTypes = policyTypes;
- }
- public String getBlueprintId() {
+ public List<Object> getPolicyTriggers() {
+ return policyTriggers;
+ }
+
+ public void setPolicyTriggers(List<Object> policyTriggers) {
+ this.policyTriggers = policyTriggers;
+ }
+
+ public List<Object> getPolicyTypes() {
+ return policyTypes;
+ }
+
+ public void setPolicyTypes(List<Object> policyTypes) {
+ this.policyTypes = policyTypes;
+ }
+
+ public String getBlueprintId() {
return blueprintId;
}
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/DeploymentOutputs.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/DeploymentOutputs.java
index 26d2ae20bc..d34195cfd7 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/DeploymentOutputs.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/DeploymentOutputs.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import java.io.IOException;
import java.io.Serializable;
@@ -61,7 +61,7 @@ public class DeploymentOutputs implements Serializable {
*/
public <T> T getMapValue (Map<String,Object> map, String key, Class<T> type)
{
-
+
ObjectMapper mapper = new ObjectMapper();
if (map.containsKey(key)) {
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Deployments.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Deployments.java
index eb49848869..f5019a74e9 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Deployments.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Deployments.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Execution.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Execution.java
index 65a1015539..73510ceeb0 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Execution.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Execution.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import java.io.Serializable;
import java.util.Date;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Executions.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Executions.java
index a1d9077864..2095f8acd9 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Executions.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Executions.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Metadata.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Metadata.java
index 31e3b0dbe3..6ae895b30d 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Metadata.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Metadata.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/NodeInstance.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/NodeInstance.java
index f23d9bebd5..ec597b77a4 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/NodeInstance.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/NodeInstance.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import java.io.Serializable;
import java.util.List;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/NodeInstances.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/NodeInstances.java
index bac826cda0..ddaa209b75 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/NodeInstances.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/NodeInstances.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/OpenstackConfig.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/OpenstackConfig.java
index 2d927e64e6..03ab1f194c 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/OpenstackConfig.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/OpenstackConfig.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import java.io.Serializable;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Pagination.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Pagination.java
index a79f053ca2..547c437b75 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Pagination.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Pagination.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -48,4 +48,4 @@ public class Pagination {
public void setSize(int size) {
this.size = size;
}
-} \ No newline at end of file
+}
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/ParameterDefinition.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/ParameterDefinition.java
index 677c982621..ae79880cca 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/ParameterDefinition.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/ParameterDefinition.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import java.io.Serializable;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/StartExecutionParams.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/StartExecutionParams.java
index 397f867e7d..f9d1cecb30 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/StartExecutionParams.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/StartExecutionParams.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import java.io.Serializable;
import java.util.Map;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Token.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Token.java
index ddf264c290..ebb968acbf 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/Token.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/Token.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import java.io.Serializable;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/UpdateExecutionParams.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/UpdateExecutionParams.java
index db827e9761..abd809b5d6 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/UpdateExecutionParams.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/UpdateExecutionParams.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import java.io.Serializable;
diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/UpdateNodeInstanceParams.java b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/UpdateNodeInstanceParams.java
index c7f6557f7c..946bb2165c 100644
--- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/v3/model/UpdateNodeInstanceParams.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/v3/model/UpdateNodeInstanceParams.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.v3.model;
+package org.onap.so.cloudify.v3.model;
import com.fasterxml.jackson.annotation.JsonProperty;
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)));