Implement security group manager, codec and watcher with unit tests
Change-Id: Ib2201d140b9dcb2eff453f13447113bdba66babd
diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtFloatingIpsWebResource.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtFloatingIpsWebResource.java
index 6314a31..ec41622 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtFloatingIpsWebResource.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtFloatingIpsWebResource.java
@@ -30,11 +30,13 @@
/**
* Handles REST API call for kubevirt floating IPs.
*/
-@Path("floatingips")
+@Path("floating-ip")
public class KubevirtFloatingIpsWebResource extends AbstractWebResource {
protected final Logger log = LoggerFactory.getLogger(getClass());
+ private static final String FLOATING_IPS = "floating-ips";
+
/**
* Returns set of all floating IPs.
*
@@ -46,6 +48,6 @@
public Response getFloatingIps() {
KubevirtRouterService service = get(KubevirtRouterService.class);
final Iterable<KubevirtFloatingIp> fips = service.floatingIps();
- return ok(encodeArray(KubevirtFloatingIp.class, "floatingips", fips)).build();
+ return ok(encodeArray(KubevirtFloatingIp.class, FLOATING_IPS, fips)).build();
}
}
diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkingCodecRegister.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkingCodecRegister.java
index 2754e7c..b8f27e3 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkingCodecRegister.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkingCodecRegister.java
@@ -22,12 +22,16 @@
import org.onosproject.kubevirtnetworking.api.KubevirtNetwork;
import org.onosproject.kubevirtnetworking.api.KubevirtPort;
import org.onosproject.kubevirtnetworking.api.KubevirtRouter;
+import org.onosproject.kubevirtnetworking.api.KubevirtSecurityGroup;
+import org.onosproject.kubevirtnetworking.api.KubevirtSecurityGroupRule;
import org.onosproject.kubevirtnetworking.codec.KubevirtFloatingIpCodec;
import org.onosproject.kubevirtnetworking.codec.KubevirtHostRouteCodec;
import org.onosproject.kubevirtnetworking.codec.KubevirtIpPoolCodec;
import org.onosproject.kubevirtnetworking.codec.KubevirtNetworkCodec;
import org.onosproject.kubevirtnetworking.codec.KubevirtPortCodec;
import org.onosproject.kubevirtnetworking.codec.KubevirtRouterCodec;
+import org.onosproject.kubevirtnetworking.codec.KubevirtSecurityGroupCodec;
+import org.onosproject.kubevirtnetworking.codec.KubevirtSecurityGroupRuleCodec;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
@@ -57,6 +61,8 @@
codecService.registerCodec(KubevirtPort.class, new KubevirtPortCodec());
codecService.registerCodec(KubevirtRouter.class, new KubevirtRouterCodec());
codecService.registerCodec(KubevirtFloatingIp.class, new KubevirtFloatingIpCodec());
+ codecService.registerCodec(KubevirtSecurityGroup.class, new KubevirtSecurityGroupCodec());
+ codecService.registerCodec(KubevirtSecurityGroupRule.class, new KubevirtSecurityGroupRuleCodec());
log.info("Started");
}
@@ -70,6 +76,8 @@
codecService.unregisterCodec(KubevirtPort.class);
codecService.unregisterCodec(KubevirtRouter.class);
codecService.unregisterCodec(KubevirtFloatingIp.class);
+ codecService.unregisterCodec(KubevirtSecurityGroup.class);
+ codecService.unregisterCodec(KubevirtSecurityGroupRule.class);
log.info("Stopped");
}
diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkingWebApplication.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkingWebApplication.java
index d2a45af..139b92d 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkingWebApplication.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtNetworkingWebApplication.java
@@ -28,7 +28,9 @@
return getClasses(
KubevirtNetworkWebResource.class,
KubevirtManagementWebResource.class,
- KubevirtRouterWebResource.class
+ KubevirtRouterWebResource.class,
+ KubevirtFloatingIpsWebResource.class,
+ KubevirtSecurityGroupWebResource.class
);
}
}
diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtRouterWebResource.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtRouterWebResource.java
index 731b0d4..8a40f51 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtRouterWebResource.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtRouterWebResource.java
@@ -34,6 +34,7 @@
public class KubevirtRouterWebResource extends AbstractWebResource {
protected final Logger log = LoggerFactory.getLogger(getClass());
+ private static final String ROUTERS = "routers";
/**
* Returns set of all routers.
@@ -46,6 +47,6 @@
public Response getRouters() {
KubevirtRouterService service = get(KubevirtRouterService.class);
final Iterable<KubevirtRouter> routers = service.routers();
- return ok(encodeArray(KubevirtRouter.class, "routers", routers)).build();
+ return ok(encodeArray(KubevirtRouter.class, ROUTERS, routers)).build();
}
}
diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtSecurityGroupWebResource.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtSecurityGroupWebResource.java
new file mode 100644
index 0000000..02acd87
--- /dev/null
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/web/KubevirtSecurityGroupWebResource.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2021-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.kubevirtnetworking.web;
+
+import org.onosproject.kubevirtnetworking.api.KubevirtSecurityGroup;
+import org.onosproject.kubevirtnetworking.api.KubevirtSecurityGroupService;
+import org.onosproject.rest.AbstractWebResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+/**
+ * Handles REST API call for kubevirt security group.
+ */
+@Path("security-group")
+public class KubevirtSecurityGroupWebResource extends AbstractWebResource {
+
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+ private static final String SECURITY_GROUPS = "security-groups";
+
+ /**
+ * Returns set of all security groups.
+ *
+ * @return 200 OK with set of all security groups
+ * @onos.rsModel KubevirtSecurityGroups
+ */
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response getSecurityGroups() {
+ KubevirtSecurityGroupService service = get(KubevirtSecurityGroupService.class);
+ final Iterable<KubevirtSecurityGroup> sgs = service.securityGroups();
+ return ok(encodeArray(KubevirtSecurityGroup.class, SECURITY_GROUPS, sgs)).build();
+ }
+}