CORD-628 Refactored VTN service network and port API
- Removed direct use of Neutron data model and Neutron API
- Extended service network and service port API to have all network
information required for VTN
- Removed unnecessary dependency manager and store
- Removed network state sync method with Neutron and XOS
- Removed Neutron and XOS access information from the network config
- Re-organized API packages
Change-Id: I18f49ec733309315f683dfb2e6be6526056118f1
diff --git a/src/main/java/org/opencord/cordvtn/cli/CordVtnPortListCommand.java b/src/main/java/org/opencord/cordvtn/cli/CordVtnPortListCommand.java
index 32eaa22..6a7618d 100644
--- a/src/main/java/org/opencord/cordvtn/cli/CordVtnPortListCommand.java
+++ b/src/main/java/org/opencord/cordvtn/cli/CordVtnPortListCommand.java
@@ -23,8 +23,8 @@
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
-import org.opencord.cordvtn.api.core.CordVtnService;
-import org.opencord.cordvtn.api.net.VtnPort;
+import org.opencord.cordvtn.api.core.ServiceNetworkService;
+import org.opencord.cordvtn.api.net.ServicePort;
import java.util.Collections;
import java.util.List;
@@ -46,12 +46,12 @@
@Override
protected void execute() {
- CordVtnService service = AbstractShellCommand.get(CordVtnService.class);
+ ServiceNetworkService service = AbstractShellCommand.get(ServiceNetworkService.class);
- List<VtnPort> ports = Lists.newArrayList(service.vtnPorts());
- Collections.sort(ports, VtnPort.VTN_PORT_COMPARATOR);
+ List<ServicePort> ports = Lists.newArrayList(service.servicePorts());
+ Collections.sort(ports, ServicePort.SERVICE_PORT_COMPARATOR);
if (!Strings.isNullOrEmpty(networkId)) {
- ports.removeIf(port -> !port.netId().id().equals(networkId));
+ ports.removeIf(port -> !port.networkId().id().equals(networkId));
}
if (outputJson()) {
@@ -62,22 +62,22 @@
}
} else {
print(FORMAT, "ID", "MAC", "IP", "VLAN", "WAN IPs");
- for (VtnPort port: ports) {
+ for (ServicePort port: ports) {
List<String> floatingIps = port.addressPairs().stream()
.map(ip -> ip.ip().toString())
.collect(Collectors.toList());
print(FORMAT, port.id(),
port.mac(),
port.ip(),
- port.vlanId().isPresent() ? port.vlanId().get() : "",
+ port.vlanId() != null ? port.vlanId() : "",
floatingIps.isEmpty() ? "" : floatingIps);
}
}
}
- private JsonNode json(List<VtnPort> ports) {
+ private JsonNode json(List<ServicePort> ports) {
ArrayNode result = mapper().enable(INDENT_OUTPUT).createArrayNode();
- for (VtnPort port: ports) {
+ for (ServicePort port: ports) {
ArrayNode addrPairs = mapper().createArrayNode();
port.addressPairs().forEach(pair -> addrPairs.add(
mapper().createObjectNode()
@@ -86,11 +86,11 @@
result.add(mapper().createObjectNode()
.put("id", port.id().id())
- .put("networkId", port.netId().id())
+ .put("networkId", port.networkId().id())
.put("mac", port.mac().toString())
.put("ip", port.ip().toString())
- .put("vlan", port.vlanId().isPresent() ?
- port.vlanId().get().toString() : null)
+ .put("vlan", port.vlanId() != null ?
+ port.vlanId().toString() : null)
.set("addressPairs", addrPairs));
}
return result;