Cloudify REST Client unit tests II

Adding tests missed in previous commit

Change-Id: I72762b1a598b4326710f8cbbc5a5588ee871a48a
Issue-ID: SO-489
Signed-off-by: Arthur Martella <amartell@research.att.com>

diff --git a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/BlueprintsResourceTest.java b/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/BlueprintsResourceTest.java
index ec7435f..5e443a5 100644 (file)
--- a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/BlueprintsResourceTest.java
+++ b/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/BlueprintsResourceTest.java
@@ -128,5 +128,20 @@ public class BlueprintsResourceTest {
                assertEquals("123", b.getId());
        }
 
+       @Test
+       public void cloudifyClientBlueprintGetMetadataById() {
+               wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/blueprints/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+                               .withBody("{\"id\": \"123\"}")
+                               .withStatus(HttpStatus.SC_OK)));
+               
+               int port = wireMockRule.port();
+
+               Cloudify c = new Cloudify("http://localhost:"+port, "tenant");
+               BlueprintsResource br = c.blueprints();
+               GetBlueprint gb = br.getMetadataById("123");
+               Blueprint b = gb.execute();
+               assertEquals("123", b.getId());
+       }
+
 
 }

diff --git a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/DeploymentsResourceTest.java b/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/DeploymentsResourceTest.java
new file mode 100644 (file)
index 0000000..f4741b9
--- /dev/null
+++ b/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/DeploymentsResourceTest.java
@@ -0,0 +1,148 @@
+/*-
+ * ============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.client;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.delete;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.put;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+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 com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+public class DeploymentsResourceTest {
+       @Rule
+       public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicPort());
+       
+       @Rule
+       public ExpectedException thrown = ExpectedException.none();
+
+       @Test
+       public void cloudifyDeploymentsCreate() {
+               wireMockRule.stubFor(put(urlPathEqualTo("/api/v3/deployments/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+                               .withBody("{ \"id\": \"123\" }")
+                               .withStatus(HttpStatus.SC_OK)));
+               
+               int port = wireMockRule.port();
+
+               Cloudify c = new Cloudify("http://localhost:"+port, "tenant");
+               DeploymentsResource br = c.deployments();
+
+               CreateDeploymentParams cdp = new CreateDeploymentParams();
+               cdp.setBlueprintId("123");
+               Map<String, Object> inputs = new HashMap<String, Object>();
+               cdp.setInputs(inputs);
+               CreateDeployment cd = br.create("123", cdp);
+               Deployment d = cd.execute();
+               assertEquals("123", d.getId());
+       }
+
+       @Test
+       public void cloudifyDeploymentsList() {
+               wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/deployments")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+                               .withBody("{ \"items\": {\"id\": \"123\" } } ")
+                               .withStatus(HttpStatus.SC_OK)));
+               
+               int port = wireMockRule.port();
+
+               Cloudify c = new Cloudify("http://localhost:"+port, "tenant");
+               DeploymentsResource br = c.deployments();
+               ListDeployments ld = br.list();
+               Deployments d = ld.execute();
+               assertEquals("123", d.getItems().get(0).getId());
+       }
+
+       @Test
+       public void cloudifyDeploymentsGet() {
+               wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/deployments/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+                               .withBody("{ \"id\": \"123\" }")
+                               .withStatus(HttpStatus.SC_OK)));
+               
+               int port = wireMockRule.port();
+
+               Cloudify c = new Cloudify("http://localhost:"+port, "tenant");
+               DeploymentsResource br = c.deployments();
+               GetDeployment gd = br.byId("123");
+               Deployment d = gd.execute();
+               assertEquals("123", d.getId());
+       }
+
+       @Test
+       public void cloudifyDeploymentsGetOutputs() {
+               wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/deployments/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+                               .withBody("{ \"deployment_id\": \"123\" }")
+                               .withStatus(HttpStatus.SC_OK)));
+               
+               int port = wireMockRule.port();
+
+               Cloudify c = new Cloudify("http://localhost:"+port, "tenant");
+               DeploymentsResource br = c.deployments();
+               GetDeploymentOutputs gdo = br.outputsById("123");
+               DeploymentOutputs d = gdo.execute();
+               assertEquals("123", d.getDeploymentId());
+               
+               Map<String, Object> map = new HashMap<String, Object>();
+               map.put("test", "answer");
+               assertEquals("answer", d.getMapValue(map, "test", String.class));
+
+               Integer i = d.getMapValue(map, "nil", Integer.class);
+               assertNull( i );
+       
+               i = d.getMapValue(map, "test", Integer.class);
+               assertNull( i );
+       }
+
+       @Test
+       public void cloudifyDeploymentsDelete() {
+               wireMockRule.stubFor(delete(urlPathEqualTo("/api/v3/deployments/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+                               .withBody("{ \"id\": \"123\" }")
+                               .withStatus(HttpStatus.SC_OK)));
+               
+               int port = wireMockRule.port();
+
+               Cloudify c = new Cloudify("http://localhost:"+port, "tenant");
+               DeploymentsResource br = c.deployments();
+               DeleteDeployment cd = br.deleteByName("name");
+               Deployment d = cd.execute();
+               assertEquals("123", d.getId());
+       }
+
+}

diff --git a/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/NodeInstancesResourceTest.java b/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/NodeInstancesResourceTest.java
new file mode 100644 (file)
index 0000000..66616e9
--- /dev/null
+++ b/cloudify-client/src/test/java/org/openecomp/mso/cloudify/v3/client/NodeInstancesResourceTest.java
@@ -0,0 +1,98 @@
+/*-
+ * ============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.client;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.get;
+import static com.github.tomakehurst.wiremock.client.WireMock.patch;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static org.junit.Assert.assertEquals;
+
+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 com.github.tomakehurst.wiremock.junit.WireMockRule;
+
+public class NodeInstancesResourceTest {
+       @Rule
+       public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicPort());
+       
+       @Rule
+       public ExpectedException thrown = ExpectedException.none();
+
+       @Test
+       public void nodeInstanceGet() {
+               wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/node-instances/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+                               .withBody("{ \"node_instance\": { \"id\": \"123\" } }")
+                               .withStatus(HttpStatus.SC_OK)));
+               
+               int port = wireMockRule.port();
+
+               Cloudify c = new Cloudify("http://localhost:"+port, "tenant");
+               NodeInstancesResource nir = c.nodeInstances();
+               GetNodeInstance gni = nir.byId("123");
+               NodeInstance ni = gni.execute();
+               assertEquals("123", ni.getId());
+       }
+
+       @Test
+       public void nodeInstanceList() {
+               wireMockRule.stubFor(get(urlPathEqualTo("/api/v3/node-instances")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+//                             .withBody(" { \"items\": [ { \"node_instance\": { \"id\": \"123\" } } ] } ")
+                               .withBody(" { \"items\": [ { \"id\": \"123\" } ] } ")
+                               .withStatus(HttpStatus.SC_OK)));
+               
+               int port = wireMockRule.port();
+
+               Cloudify c = new Cloudify("http://localhost:"+port, "tenant");
+               NodeInstancesResource nir = c.nodeInstances();
+               ListNodeInstances lni = nir.list();
+               NodeInstances ni = lni.execute();
+               assertEquals("123", ni.getItems().get(0).getId());
+       }
+       
+       @Test
+       public void nodeInstanceUpdate() {
+               wireMockRule.stubFor(patch(urlPathEqualTo("/api/v3/node-instances/")).willReturn(aResponse().withHeader("Content-Type", "application/json")
+                               .withBody("{ \"node_instance\": { \"id\": \"123\" } }")
+                               .withStatus(HttpStatus.SC_OK)));
+               
+               int port = wireMockRule.port();
+
+               Cloudify c = new Cloudify("http://localhost:"+port, "tenant");
+               NodeInstancesResource nir = c.nodeInstances();
+               UpdateNodeInstanceParams params = new UpdateNodeInstanceParams();
+
+               UpdateNodeInstance uni = nir.update("123", params);
+               thrown.expect(HttpClientException.class); /// ???????
+               NodeInstance ni = uni.execute();
+       }
+}