[ONOS-7492] Add unit test for openstack security group REST API
Change-Id: Ifd7b99afac9de0d0235fd6a4d74e5948656b92b6
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupRuleWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupRuleWebResource.java
index 1615c87..dc12860 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupRuleWebResource.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupRuleWebResource.java
@@ -15,7 +15,6 @@
*/
package org.onosproject.openstacknetworking.web;
-import org.onlab.osgi.DefaultServiceDirectory;
import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupAdminService;
import org.onosproject.rest.AbstractWebResource;
import org.openstack4j.openstack.networking.domain.NeutronSecurityGroupRule;
@@ -50,7 +49,7 @@
private static final String SECURITY_GROUP_RULES = "security-group-rules";
private final OpenstackSecurityGroupAdminService adminService =
- DefaultServiceDirectory.getService(OpenstackSecurityGroupAdminService.class);
+ get(OpenstackSecurityGroupAdminService.class);
@Context
private UriInfo uriInfo;
@@ -90,7 +89,7 @@
@Path("{id}")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Response removeSecurityGroupRule(@PathParam("id") String id) {
+ public Response deleteSecurityGroupRule(@PathParam("id") String id) {
log.trace(String.format(MESSAGE, "REMOVE " + id));
adminService.removeSecurityGroupRule(id);
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupWebResource.java
index 3a2e41d..da335a3 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupWebResource.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupWebResource.java
@@ -15,7 +15,6 @@
*/
package org.onosproject.openstacknetworking.web;
-import org.onlab.osgi.DefaultServiceDirectory;
import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupAdminService;
import org.onosproject.rest.AbstractWebResource;
import org.openstack4j.openstack.networking.domain.NeutronSecurityGroup;
@@ -51,7 +50,7 @@
private static final String SECURITY_GROUPS = "security-groups";
private final OpenstackSecurityGroupAdminService adminService =
- DefaultServiceDirectory.getService(OpenstackSecurityGroupAdminService.class);
+ get(OpenstackSecurityGroupAdminService.class);
@Context
private UriInfo uriInfo;
diff --git a/apps/openstacknetworking/src/test/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupRuleWebResourceTest.java b/apps/openstacknetworking/src/test/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupRuleWebResourceTest.java
new file mode 100644
index 0000000..4ffafc1
--- /dev/null
+++ b/apps/openstacknetworking/src/test/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupRuleWebResourceTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * 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.
+ */
+package org.onosproject.openstacknetworking.web;
+
+import org.glassfish.jersey.server.ResourceConfig;
+import org.junit.Before;
+import org.junit.Test;
+import org.onlab.osgi.ServiceDirectory;
+import org.onlab.osgi.TestServiceDirectory;
+import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupAdminService;
+import org.onosproject.rest.resources.ResourceTest;
+
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.InputStream;
+
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.anyString;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Unit test for openstack security group rule REST API.
+ */
+public class OpenstackSecurityGroupRuleWebResourceTest extends ResourceTest {
+
+ final OpenstackSecurityGroupAdminService mockOpenstackSecurityGroupAdminService =
+ createMock(OpenstackSecurityGroupAdminService.class);
+ private static final String PATH = "security-group-rules";
+
+ /**
+ * Constructs an openstack security group rule test instance.
+ */
+ public OpenstackSecurityGroupRuleWebResourceTest() {
+ super(ResourceConfig.forApplicationClass(OpenstackNetworkingWebApplication.class));
+ }
+
+ /**
+ * Sets up the global values for all tests.
+ */
+ @Before
+ public void setUpTest() {
+ ServiceDirectory testDirectory =
+ new TestServiceDirectory()
+ .add(OpenstackSecurityGroupAdminService.class,
+ mockOpenstackSecurityGroupAdminService);
+ setServiceDirectory(testDirectory);
+ }
+
+ /**
+ * Tests the results of the REST API POST with creation operation.
+ */
+ @Test
+ public void testCreateSecurityGroupRulesWithCreationOperation() {
+ mockOpenstackSecurityGroupAdminService.createSecurityGroupRule(anyObject());
+ replay(mockOpenstackSecurityGroupAdminService);
+
+ final WebTarget wt = target();
+ InputStream jsonStream = OpenstackNetworkWebResourceTest.class
+ .getResourceAsStream("openstack-security-group-rule.json");
+
+ Response response = wt.path(PATH).request(MediaType.APPLICATION_JSON_TYPE)
+ .post(Entity.json(jsonStream));
+ final int status = response.getStatus();
+
+ assertThat(status, is(201));
+
+ verify(mockOpenstackSecurityGroupAdminService);
+ }
+
+ /**
+ * Tests the results of the REST API POST with incorrect input.
+ */
+ @Test
+ public void testCreateSecurityGroupRulesWithIncorrectInput() {
+ final WebTarget wt = target();
+ InputStream jsonStream = OpenstackSecurityGroupRuleWebResourceTest.class
+ .getResourceAsStream("dummy.json");
+
+ Response response = wt.path(PATH).request(MediaType.APPLICATION_JSON_TYPE)
+ .post(Entity.json(jsonStream));
+ final int status = response.getStatus();
+
+ assertThat(status, is(400));
+ }
+
+ /**
+ * Tests the results of the REST API POST with duplicated security group rule ID.
+ */
+ @Test
+ public void testCreateSecurityGroupRulesWithDuplicatedId() {
+ mockOpenstackSecurityGroupAdminService.createSecurityGroupRule(anyObject());
+ expectLastCall().andThrow(new IllegalArgumentException());
+ replay(mockOpenstackSecurityGroupAdminService);
+
+ final WebTarget wt = target();
+ InputStream jsonStream = OpenstackNetworkWebResourceTest.class
+ .getResourceAsStream("openstack-security-group-rule.json");
+
+ Response response = wt.path(PATH).request(MediaType.APPLICATION_JSON_TYPE)
+ .post(Entity.json(jsonStream));
+ final int status = response.getStatus();
+
+ assertThat(status, is(400));
+
+ verify(mockOpenstackSecurityGroupAdminService);
+ }
+
+ /**
+ * Tests the results of the REST API DELETE with deletion operation.
+ */
+ @Test
+ public void testDeleteSecurityGroupRuleWithDeletionOperation() {
+ mockOpenstackSecurityGroupAdminService.removeSecurityGroupRule(anyString());
+ replay(mockOpenstackSecurityGroupAdminService);
+
+ final WebTarget wt = target();
+
+ Response response = wt.path(PATH + "/2bc0accf-312e-429a-956e-e4407625eb62")
+ .request(MediaType.APPLICATION_JSON_TYPE)
+ .delete();
+ final int status = response.getStatus();
+
+ assertThat(status, is(204));
+
+ verify(mockOpenstackSecurityGroupAdminService);
+ }
+
+ /**
+ * Tests the results of the REST API DELETE with non-existing security group rule ID.
+ */
+ @Test
+ public void testDeleteSecurityGroupRuleWithNonexistId() {
+ mockOpenstackSecurityGroupAdminService.removeSecurityGroupRule(anyString());
+ expectLastCall().andThrow(new IllegalArgumentException());
+ replay(mockOpenstackSecurityGroupAdminService);
+
+ final WebTarget wt = target();
+
+ Response response = wt.path(PATH + "/non-exist-id")
+ .request(MediaType.APPLICATION_JSON_TYPE)
+ .delete();
+ final int status = response.getStatus();
+
+ assertThat(status, is(400));
+
+ verify(mockOpenstackSecurityGroupAdminService);
+ }
+}
diff --git a/apps/openstacknetworking/src/test/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupWebResourceTest.java b/apps/openstacknetworking/src/test/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupWebResourceTest.java
new file mode 100644
index 0000000..49f85b4
--- /dev/null
+++ b/apps/openstacknetworking/src/test/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupWebResourceTest.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * 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.
+ */
+package org.onosproject.openstacknetworking.web;
+
+import org.glassfish.jersey.server.ResourceConfig;
+import org.junit.Before;
+import org.junit.Test;
+import org.onlab.osgi.ServiceDirectory;
+import org.onlab.osgi.TestServiceDirectory;
+import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupAdminService;
+import org.onosproject.rest.resources.ResourceTest;
+
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.InputStream;
+
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.anyString;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Unit test for openstack security group REST API.
+ */
+public class OpenstackSecurityGroupWebResourceTest extends ResourceTest {
+
+ final OpenstackSecurityGroupAdminService mockOpenstackSecurityGroupAdminService =
+ createMock(OpenstackSecurityGroupAdminService.class);
+ private static final String PATH = "security-groups";
+
+ /**
+ * Constructs an openstack security group test instance.
+ */
+ public OpenstackSecurityGroupWebResourceTest() {
+ super(ResourceConfig.forApplicationClass(OpenstackNetworkingWebApplication.class));
+ }
+
+ /**
+ * Sets up the global values for all tests.
+ */
+ @Before
+ public void setUpTest() {
+ ServiceDirectory testDirectory =
+ new TestServiceDirectory()
+ .add(OpenstackSecurityGroupAdminService.class,
+ mockOpenstackSecurityGroupAdminService);
+ setServiceDirectory(testDirectory);
+ }
+
+ /**
+ * Tests the results of the REST API POST with creation operation.
+ */
+ @Test
+ public void testCreateSecurityGroupWithCreationOperation() {
+ mockOpenstackSecurityGroupAdminService.createSecurityGroup(anyObject());
+ replay(mockOpenstackSecurityGroupAdminService);
+
+ final WebTarget wt = target();
+ InputStream jsonStream = OpenstackSecurityGroupWebResourceTest.class
+ .getResourceAsStream("openstack-security-group.json");
+
+ Response response = wt.path(PATH).request(MediaType.APPLICATION_JSON_TYPE)
+ .post(Entity.json(jsonStream));
+ final int status = response.getStatus();
+
+ assertThat(status, is(201));
+
+ verify(mockOpenstackSecurityGroupAdminService);
+ }
+
+ /**
+ * Tests the results of the REST API POST with incorrect input.
+ */
+ @Test
+ public void testCreateSecurityGroupWithIncorrectInput() {
+ final WebTarget wt = target();
+ InputStream jsonStream = OpenstackSecurityGroupWebResourceTest.class
+ .getResourceAsStream("dummy.json");
+
+ Response response = wt.path(PATH).request(MediaType.APPLICATION_JSON_TYPE)
+ .post(Entity.json(jsonStream));
+ final int status = response.getStatus();
+
+ assertThat(status, is(400));
+ }
+
+ /**
+ * Tests the results of the REST API POST with duplicated security group ID.
+ */
+ @Test
+ public void testCreateSecurityGroupWithDuplicatedId() {
+ mockOpenstackSecurityGroupAdminService.createSecurityGroup(anyObject());
+ expectLastCall().andThrow(new IllegalArgumentException());
+ replay(mockOpenstackSecurityGroupAdminService);
+
+ final WebTarget wt = target();
+ InputStream jsonStream = OpenstackSecurityGroupWebResourceTest.class
+ .getResourceAsStream("openstack-security-group.json");
+
+ Response response = wt.path(PATH).request(MediaType.APPLICATION_JSON_TYPE)
+ .post(Entity.json(jsonStream));
+ final int status = response.getStatus();
+
+ assertThat(status, is(400));
+
+ verify(mockOpenstackSecurityGroupAdminService);
+ }
+
+ /**
+ * Tests the results of the REST API PUT with updating operation.
+ */
+ @Test
+ public void testUpdateSecurityGroupWithUpdatingOperation() {
+ final WebTarget wt = target();
+ InputStream jsonStream = OpenstackSecurityGroupWebResourceTest.class
+ .getResourceAsStream("openstack-security-group.json");
+
+ Response response = wt.path(PATH)
+ .request(MediaType.APPLICATION_JSON_TYPE)
+ .put(Entity.json(jsonStream));
+ final int status = response.getStatus();
+
+ assertThat(status, is(200));
+ }
+
+ /**
+ * Tests the results of the REST API DELETE with deletion operation.
+ */
+ @Test
+ public void testDeleteSecurityGroupWithDeletionOperation() {
+ mockOpenstackSecurityGroupAdminService.removeSecurityGroup(anyString());
+ replay(mockOpenstackSecurityGroupAdminService);
+
+ final WebTarget wt = target();
+
+ Response response = wt.path(PATH + "/2076db17-a522-4506-91de-c6dd8e837028")
+ .request(MediaType.APPLICATION_JSON_TYPE)
+ .delete();
+ final int status = response.getStatus();
+
+ assertThat(status, is(204));
+
+ verify(mockOpenstackSecurityGroupAdminService);
+ }
+
+ /**
+ * Tests the results of the REST API DELETE with non-existing security group ID.
+ */
+ @Test
+ public void testDeleteSecurityGroupWithNonexistId() {
+ mockOpenstackSecurityGroupAdminService.removeSecurityGroup(anyString());
+ expectLastCall().andThrow(new IllegalArgumentException());
+ replay(mockOpenstackSecurityGroupAdminService);
+
+ final WebTarget wt = target();
+
+ Response response = wt.path(PATH + "/non-exist-id")
+ .request(MediaType.APPLICATION_JSON_TYPE)
+ .delete();
+ final int status = response.getStatus();
+
+ assertThat(status, is(400));
+
+ verify(mockOpenstackSecurityGroupAdminService);
+ }
+}
\ No newline at end of file
diff --git a/apps/openstacknetworking/src/test/resources/org/onosproject/openstacknetworking/web/openstack-security-group-rule.json b/apps/openstacknetworking/src/test/resources/org/onosproject/openstacknetworking/web/openstack-security-group-rule.json
new file mode 100644
index 0000000..e585538
--- /dev/null
+++ b/apps/openstacknetworking/src/test/resources/org/onosproject/openstacknetworking/web/openstack-security-group-rule.json
@@ -0,0 +1,14 @@
+{
+ "security_group_rule": {
+ "id": "2bc0accf-312e-429a-956e-e4407625eb62",
+ "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+ "security_group_id": "a7734e61-b545-452d-a3cd-0189cbd9747a",
+ "direction": "ingress",
+ "ethertype": "IPv4",
+ "port_range_max": 80,
+ "port_range_min": 80,
+ "protocol": "tcp",
+ "remote_ip_prefix": "",
+ "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5"
+ }
+}
diff --git a/apps/openstacknetworking/src/test/resources/org/onosproject/openstacknetworking/web/openstack-security-group.json b/apps/openstacknetworking/src/test/resources/org/onosproject/openstacknetworking/web/openstack-security-group.json
new file mode 100644
index 0000000..f63b21d
--- /dev/null
+++ b/apps/openstacknetworking/src/test/resources/org/onosproject/openstacknetworking/web/openstack-security-group.json
@@ -0,0 +1,22 @@
+{
+ "security_group": {
+ "id": "2076db17-a522-4506-91de-c6dd8e837028",
+ "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+ "description": "security group for webservers",
+ "name": "new-webservers",
+ "security_group_rules": [
+ {
+ "id": "2bc0accf-312e-429a-956e-e4407625eb62",
+ "tenant_id": "e4f50856753b4dc6afee5fa6b9b6c550",
+ "security_group_id": "a7734e61-b545-452d-a3cd-0189cbd9747a",
+ "direction": "ingress",
+ "ethertype": "IPv4",
+ "port_range_max": 80,
+ "port_range_min": 80,
+ "protocol": "tcp",
+ "remote_ip_prefix": "",
+ "remote_group_id": "85cc3048-abc3-43cc-89b3-377341426ac5"
+ }
+ ]
+ }
+}