Revert "[WIP] CORD-129 Support access agent in VTN"
This reverts commit 3a7bf9ef863e2c19d7d08f284003de130e8cd0cf.
Change-Id: Iad39407e7a48fc5a079501232678dea378491820
diff --git a/src/main/java/org/opencord/cordvtn/impl/CordVtnNodeManager.java b/src/main/java/org/opencord/cordvtn/impl/CordVtnNodeManager.java
index 5ccfbf7..c45fef3 100644
--- a/src/main/java/org/opencord/cordvtn/impl/CordVtnNodeManager.java
+++ b/src/main/java/org/opencord/cordvtn/impl/CordVtnNodeManager.java
@@ -429,8 +429,7 @@
// adds existing instances to the host list
deviceService.getPorts(node.integrationBridgeId()).stream()
- .filter(port -> !node.systemIfaces().contains(portName(port)) &&
- !port.number().equals(PortNumber.LOCAL) &&
+ .filter(port -> portName(port).startsWith(VPORT_PREFIX) &&
port.isEnabled())
.forEach(port -> instanceService.addInstance(connectPoint(port)));
@@ -750,12 +749,14 @@
log.info("Port {} is added to {}", portName, node.hostname());
- if (node.systemIfaces().contains(portName)) {
+ if (portName.startsWith(VPORT_PREFIX)) {
+ if (isNodeStateComplete(node)) {
+ instanceService.addInstance(connectPoint(port));
+ } else {
+ log.warn("VM is detected on incomplete node, ignore it.", portName);
+ }
+ } else if (node.systemIfaces().contains(portName)) {
setNodeState(node, getNodeState(node));
- } else if (isNodeStateComplete(node)) {
- instanceService.addInstance(connectPoint(port));
- } else {
- log.warn("Instance is detected on incomplete node, ignore it.", portName);
}
}
@@ -776,12 +777,14 @@
log.info("Port {} is removed from {}", portName, node.hostname());
- if (node.systemIfaces().contains(portName)) {
+ if (portName.startsWith(VPORT_PREFIX)) {
+ if (isNodeStateComplete(node)) {
+ instanceService.removeInstance(connectPoint(port));
+ } else {
+ log.warn("VM is vanished from incomplete node, ignore it.", portName);
+ }
+ } else if (node.systemIfaces().contains(portName)) {
setNodeState(node, NodeState.INCOMPLETE);
- } else if (isNodeStateComplete(node)) {
- instanceService.removeInstance(connectPoint(port));
- } else {
- log.warn("VM is vanished from incomplete node, ignore it.", portName);
}
}
}
diff --git a/src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java b/src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java
index 0bea32e..4e01d2b 100644
--- a/src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java
+++ b/src/main/java/org/opencord/cordvtn/impl/CordVtnPipeline.java
@@ -79,9 +79,9 @@
// tables
public static final int TABLE_ZERO = 0;
public static final int TABLE_IN_PORT = 1;
- public static final int TABLE_ACCESS = 2;
+ public static final int TABLE_ACCESS_TYPE = 2;
public static final int TABLE_IN_SERVICE = 3;
- public static final int TABLE_DST = 4;
+ public static final int TABLE_DST_IP = 4;
public static final int TABLE_TUNNEL_IN = 5;
public static final int TABLE_VLAN = 6;
@@ -320,7 +320,7 @@
.build();
treatment = DefaultTrafficTreatment.builder()
- .transition(CordVtnPipeline.TABLE_DST)
+ .transition(CordVtnPipeline.TABLE_DST_IP)
.build();
flowRule = DefaultFlowRule.builder()
@@ -406,7 +406,7 @@
.build();
treatment = DefaultTrafficTreatment.builder()
- .transition(TABLE_DST)
+ .transition(TABLE_DST_IP)
.build();
flowRule = DefaultFlowRule.builder()
@@ -427,7 +427,7 @@
.build();
treatment = DefaultTrafficTreatment.builder()
- .transition(TABLE_DST)
+ .transition(TABLE_DST_IP)
.build();
flowRule = DefaultFlowRule.builder()
@@ -458,7 +458,7 @@
.withTreatment(treatment)
.withPriority(PRIORITY_ZERO)
.forDevice(deviceId)
- .forTable(TABLE_ACCESS)
+ .forTable(TABLE_ACCESS_TYPE)
.makePermanent()
.build();
diff --git a/src/main/java/org/opencord/cordvtn/impl/DependencyManager.java b/src/main/java/org/opencord/cordvtn/impl/DependencyManager.java
index 6bffbc9..eaebb69 100644
--- a/src/main/java/org/opencord/cordvtn/impl/DependencyManager.java
+++ b/src/main/java/org/opencord/cordvtn/impl/DependencyManager.java
@@ -259,7 +259,7 @@
.withTreatment(treatment)
.withPriority(PRIORITY_HIGH)
.forDevice(outGroup.getKey())
- .forTable(TABLE_ACCESS)
+ .forTable(TABLE_ACCESS_TYPE)
.makePermanent()
.build();
@@ -275,7 +275,7 @@
.build();
TrafficTreatment treatment = DefaultTrafficTreatment.builder()
- .transition(TABLE_DST)
+ .transition(TABLE_DST_IP)
.build();
nodeManager.completeNodes().stream().forEach(node -> {
@@ -286,7 +286,7 @@
.withTreatment(treatment)
.withPriority(PRIORITY_DEFAULT)
.forDevice(deviceId)
- .forTable(TABLE_ACCESS)
+ .forTable(TABLE_ACCESS_TYPE)
.makePermanent()
.build();
diff --git a/src/main/java/org/opencord/cordvtn/impl/InstanceManager.java b/src/main/java/org/opencord/cordvtn/impl/InstanceManager.java
index 12e7e39..d43a8c6 100644
--- a/src/main/java/org/opencord/cordvtn/impl/InstanceManager.java
+++ b/src/main/java/org/opencord/cordvtn/impl/InstanceManager.java
@@ -25,8 +25,6 @@
import org.onlab.packet.Ip4Address;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
-import org.opencord.cordconfig.CordConfigService;
-import org.opencord.cordconfig.access.AccessAgentData;
import org.opencord.cordvtn.api.CordVtnConfig;
import org.opencord.cordvtn.api.Instance;
import org.onosproject.core.ApplicationId;
@@ -65,7 +63,6 @@
import org.slf4j.Logger;
import java.util.Date;
-import java.util.Optional;
import java.util.concurrent.ExecutorService;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -73,7 +70,6 @@
import static org.onlab.util.Tools.groupedThreads;
import static org.onosproject.dhcp.IpAssignment.AssignmentStatus.Option_RangeNotEnforced;
import static org.onosproject.net.AnnotationKeys.PORT_NAME;
-import static org.onosproject.xosclient.api.VtnServiceApi.ServiceType.ACCESS_AGENT;
import static org.onosproject.xosclient.api.VtnServiceApi.ServiceType.MANAGEMENT;
import static org.opencord.cordvtn.api.Constants.*;
import static org.slf4j.LoggerFactory.getLogger;
@@ -88,6 +84,9 @@
protected final Logger log = getLogger(getClass());
+ private static final Ip4Address DEFAULT_DNS = Ip4Address.valueOf("8.8.8.8");
+ private static final int DHCP_INFINITE_LEASE = -1;
+
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected CoreService coreService;
@@ -109,14 +108,8 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected XosClientService xosClient;
- // TODO get access agent container information from XOS
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected CordConfigService cordConfig;
-
- private static final Class<CordVtnConfig> CONFIG_CLASS = CordVtnConfig.class;
private final ConfigFactory configFactory =
- new ConfigFactory<ApplicationId, CordVtnConfig>(
- SubjectFactories.APP_SUBJECT_FACTORY, CONFIG_CLASS, "cordvtn") {
+ new ConfigFactory(SubjectFactories.APP_SUBJECT_FACTORY, CordVtnConfig.class, "cordvtn") {
@Override
public CordVtnConfig createConfig() {
return new CordVtnConfig();
@@ -124,7 +117,7 @@
};
private final ExecutorService eventExecutor =
- newSingleThreadScheduledExecutor(groupedThreads(this.getClass().getSimpleName(), "event-handler"));
+ newSingleThreadScheduledExecutor(groupedThreads("onos/cordvtn-instance", "event-handler"));
private final NetworkConfigListener configListener = new InternalConfigListener();
private ApplicationId appId;
@@ -179,11 +172,6 @@
VtnPort vtnPort = getVtnPort(port.annotations().value(PORT_NAME));
if (vtnPort == null) {
- // TODO remove this when XOS provides access agent information
- // with PORT_NAME like the other type of instances
- if (isAccessAgent(connectPoint)) {
- addAccessAgentInstance(connectPoint);
- }
return;
}
@@ -293,37 +281,8 @@
return vtnPort;
}
- // TODO remove this when XOS provides access agent information
- private boolean isAccessAgent(ConnectPoint connectPoint) {
- Optional<AccessAgentData> agent = cordConfig.getAccessAgent(connectPoint.deviceId());
- if (!agent.isPresent() || !agent.get().getVtnLocation().isPresent()) {
- return false;
- }
- return agent.get().getVtnLocation().get().port().equals(connectPoint.port());
- }
-
- // TODO remove this when XOS provides access agent information
- private void addAccessAgentInstance(ConnectPoint connectPoint) {
- AccessAgentData agent = cordConfig.getAccessAgent(connectPoint.deviceId()).get();
- DefaultAnnotations.Builder annotations = DefaultAnnotations.builder()
- .set(Instance.SERVICE_TYPE, ACCESS_AGENT.name())
- .set(Instance.SERVICE_ID, NOT_APPLICABLE)
- .set(Instance.PORT_ID, NOT_APPLICABLE)
- .set(Instance.CREATE_TIME, String.valueOf(System.currentTimeMillis()));
-
- HostDescription hostDesc = new DefaultHostDescription(
- agent.getAgentMac(),
- VlanId.NONE,
- new HostLocation(connectPoint, System.currentTimeMillis()),
- Sets.newHashSet(),
- annotations.build());
-
- HostId hostId = HostId.hostId(agent.getAgentMac());
- hostProvider.hostDetected(hostId, hostDesc, false);
- }
-
private void readConfiguration() {
- CordVtnConfig config = configRegistry.getConfig(appId, CONFIG_CLASS);
+ CordVtnConfig config = configRegistry.getConfig(appId, CordVtnConfig.class);
if (config == null) {
log.debug("No configuration found");
return;
@@ -338,13 +297,13 @@
@Override
public void event(NetworkConfigEvent event) {
- if (!event.configClass().equals(CONFIG_CLASS)) {
+ if (!event.configClass().equals(CordVtnConfig.class)) {
return;
}
switch (event.type()) {
- case CONFIG_UPDATED:
case CONFIG_ADDED:
+ case CONFIG_UPDATED:
readConfiguration();
break;
default:
diff --git a/src/main/java/org/opencord/cordvtn/impl/handler/AccessAgentInstanceHandler.java b/src/main/java/org/opencord/cordvtn/impl/handler/AccessAgentInstanceHandler.java
deleted file mode 100644
index b2de2c3..0000000
--- a/src/main/java/org/opencord/cordvtn/impl/handler/AccessAgentInstanceHandler.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2016-present Open Networking Laboratory
- *
- * 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.opencord.cordvtn.impl.handler;
-
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onosproject.net.flow.DefaultFlowRule;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.FlowRule;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.opencord.cordvtn.impl.AbstractInstanceHandler;
-import org.opencord.cordvtn.api.Instance;
-import org.opencord.cordvtn.api.InstanceHandler;
-import org.opencord.cordvtn.impl.CordVtnNodeManager;
-import org.opencord.cordvtn.impl.CordVtnPipeline;
-
-import java.util.Optional;
-
-import static org.onosproject.xosclient.api.VtnServiceApi.ServiceType.ACCESS_AGENT;
-
-/**
- * Provides network connectivity for access agent instances.
- */
-@Component(immediate = true)
-public class AccessAgentInstanceHandler extends AbstractInstanceHandler implements InstanceHandler {
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected CordVtnPipeline pipeline;
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected CordVtnNodeManager nodeManager;
-
- @Activate
- protected void activate() {
- serviceType = Optional.of(ACCESS_AGENT);
- super.activate();
- }
-
- @Deactivate
- protected void deactivate() {
- super.deactivate();
- }
-
- @Override
- public void instanceDetected(Instance instance) {
- log.info("Access agent instance detected {}", instance);
- accessAgentRules(instance, true);
- }
-
- @Override
- public void instanceRemoved(Instance instance) {
- log.info("Access agent instance removed {}", instance);
- accessAgentRules(instance, false);
- }
-
- private void accessAgentRules(Instance instance, boolean install) {
- TrafficSelector selector = DefaultTrafficSelector.builder()
- .matchEthDst(instance.mac())
- .build();
-
- TrafficTreatment treatment = DefaultTrafficTreatment.builder()
- .setOutput(instance.portNumber())
- .build();
-
- FlowRule flowRule = DefaultFlowRule.builder()
- .fromApp(appId)
- .withSelector(selector)
- .withTreatment(treatment)
- .withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
- .forDevice(instance.deviceId())
- .forTable(CordVtnPipeline.TABLE_DST)
- .makePermanent()
- .build();
-
- pipeline.processFlowRule(install, flowRule);
-
- selector = DefaultTrafficSelector.builder()
- .matchInPort(instance.portNumber())
- .build();
-
- treatment = DefaultTrafficTreatment.builder()
- .setOutput(nodeManager.dataPort(instance.deviceId()))
- .build();
-
- flowRule = DefaultFlowRule.builder()
- .fromApp(appId)
- .withSelector(selector)
- .withTreatment(treatment)
- .withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
- .forDevice(instance.deviceId())
- .forTable(CordVtnPipeline.TABLE_IN_PORT)
- .makePermanent()
- .build();
-
- pipeline.processFlowRule(install, flowRule);
- }
-}
diff --git a/src/main/java/org/opencord/cordvtn/impl/handler/DefaultInstanceHandler.java b/src/main/java/org/opencord/cordvtn/impl/handler/DefaultInstanceHandler.java
index 0036578..a4ca067 100644
--- a/src/main/java/org/opencord/cordvtn/impl/handler/DefaultInstanceHandler.java
+++ b/src/main/java/org/opencord/cordvtn/impl/handler/DefaultInstanceHandler.java
@@ -115,7 +115,7 @@
.build();
TrafficTreatment treatment = DefaultTrafficTreatment.builder()
- .transition(CordVtnPipeline.TABLE_ACCESS)
+ .transition(CordVtnPipeline.TABLE_ACCESS_TYPE)
.build();
FlowRule flowRule = DefaultFlowRule.builder()
@@ -170,7 +170,7 @@
.withTreatment(treatment)
.withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
.forDevice(instance.deviceId())
- .forTable(CordVtnPipeline.TABLE_DST)
+ .forTable(CordVtnPipeline.TABLE_DST_IP)
.makePermanent()
.build();
@@ -200,7 +200,7 @@
.withTreatment(treatment)
.withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
.forDevice(node.integrationBridgeId())
- .forTable(CordVtnPipeline.TABLE_DST)
+ .forTable(CordVtnPipeline.TABLE_DST_IP)
.makePermanent()
.build();
@@ -239,7 +239,7 @@
.build();
TrafficTreatment treatment = DefaultTrafficTreatment.builder()
- .transition(CordVtnPipeline.TABLE_DST)
+ .transition(CordVtnPipeline.TABLE_DST_IP)
.build();
@@ -250,7 +250,7 @@
.withTreatment(treatment)
.withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
.forDevice(node.integrationBridgeId())
- .forTable(CordVtnPipeline.TABLE_ACCESS)
+ .forTable(CordVtnPipeline.TABLE_ACCESS_TYPE)
.makePermanent()
.build();
@@ -275,7 +275,7 @@
.withTreatment(treatment)
.withPriority(CordVtnPipeline.PRIORITY_LOW)
.forDevice(node.integrationBridgeId())
- .forTable(CordVtnPipeline.TABLE_ACCESS)
+ .forTable(CordVtnPipeline.TABLE_ACCESS_TYPE)
.makePermanent()
.build();
diff --git a/src/main/java/org/opencord/cordvtn/impl/handler/ManagementInstanceHandler.java b/src/main/java/org/opencord/cordvtn/impl/handler/ManagementInstanceHandler.java
index 2bcbcab..7a77b98 100644
--- a/src/main/java/org/opencord/cordvtn/impl/handler/ManagementInstanceHandler.java
+++ b/src/main/java/org/opencord/cordvtn/impl/handler/ManagementInstanceHandler.java
@@ -123,7 +123,7 @@
.withTreatment(treatment)
.withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
.forDevice(instance.deviceId())
- .forTable(CordVtnPipeline.TABLE_DST)
+ .forTable(CordVtnPipeline.TABLE_DST_IP)
.makePermanent()
.build();
@@ -173,7 +173,7 @@
.withTreatment(treatment)
.withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
.forDevice(instance.deviceId())
- .forTable(CordVtnPipeline.TABLE_DST)
+ .forTable(CordVtnPipeline.TABLE_DST_IP)
.makePermanent()
.build();
diff --git a/src/main/java/org/opencord/cordvtn/impl/handler/OltAgentInstanceHandler.java b/src/main/java/org/opencord/cordvtn/impl/handler/OltAgentInstanceHandler.java
new file mode 100644
index 0000000..853963e
--- /dev/null
+++ b/src/main/java/org/opencord/cordvtn/impl/handler/OltAgentInstanceHandler.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * 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.opencord.cordvtn.impl.handler;
+
+import com.google.common.collect.Maps;
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+
+import org.opencord.cordvtn.impl.AbstractInstanceHandler;
+import org.opencord.cordvtn.api.CordVtnConfig;
+import org.opencord.cordvtn.api.Instance;
+import org.opencord.cordvtn.api.InstanceHandler;
+import org.onosproject.net.DeviceId;
+
+import org.onosproject.net.config.ConfigFactory;
+import org.onosproject.net.config.NetworkConfigEvent;
+import org.onosproject.net.config.NetworkConfigListener;
+import org.onosproject.net.config.basics.SubjectFactories;
+import org.opencord.cordconfig.access.AccessAgentConfig;
+import org.opencord.cordconfig.access.AccessAgentData;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static org.onosproject.xosclient.api.VtnServiceApi.ServiceType.OLT_AGENT;
+
+/**
+ * Provides network connectivity for OLT agent instances.
+ */
+@Component(immediate = true)
+public class OltAgentInstanceHandler extends AbstractInstanceHandler implements InstanceHandler {
+
+ private static final Class<AccessAgentConfig> CONFIG_CLASS = AccessAgentConfig.class;
+ private ConfigFactory<DeviceId, AccessAgentConfig> configFactory =
+ new ConfigFactory<DeviceId, AccessAgentConfig>(
+ SubjectFactories.DEVICE_SUBJECT_FACTORY, CONFIG_CLASS, "accessAgent") {
+ @Override
+ public AccessAgentConfig createConfig() {
+ return new AccessAgentConfig();
+ }
+ };
+
+ private Map<DeviceId, AccessAgentData> oltAgentData = Maps.newConcurrentMap();
+
+ @Activate
+ protected void activate() {
+ serviceType = Optional.of(OLT_AGENT);
+ configListener = new InternalConfigListener();
+ super.activate();
+
+ configRegistry.registerConfigFactory(configFactory);
+ }
+
+ @Deactivate
+ protected void deactivate() {
+ super.deactivate();
+ }
+
+ @Override
+ public void instanceDetected(Instance instance) {
+ log.info("OLT agent instance detected {}", instance);
+ // TODO implement
+ }
+
+ @Override
+ public void instanceRemoved(Instance instance) {
+ log.info("OLT agent instance removed {}", instance);
+ // TODO implement
+ }
+
+ private void readAccessAgentConfig() {
+
+ Set<DeviceId> deviceSubjects = configRegistry.getSubjects(DeviceId.class, CONFIG_CLASS);
+ deviceSubjects.stream().forEach(subject -> {
+ AccessAgentConfig config = configRegistry.getConfig(subject, CONFIG_CLASS);
+ if (config != null) {
+ oltAgentData.put(subject, config.getAgent());
+ }
+ });
+ }
+
+ private class InternalConfigListener implements NetworkConfigListener {
+
+ @Override
+ public void event(NetworkConfigEvent event) {
+
+ switch (event.type()) {
+ case CONFIG_UPDATED:
+ case CONFIG_ADDED:
+ if (event.configClass().equals(CordVtnConfig.class)) {
+ readConfiguration();
+ } else if (event.configClass().equals(CONFIG_CLASS)) {
+ readAccessAgentConfig();
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ }
+}
diff --git a/src/main/java/org/opencord/cordvtn/impl/handler/VsgInstanceHandler.java b/src/main/java/org/opencord/cordvtn/impl/handler/VsgInstanceHandler.java
index 298d60a..648c341 100644
--- a/src/main/java/org/opencord/cordvtn/impl/handler/VsgInstanceHandler.java
+++ b/src/main/java/org/opencord/cordvtn/impl/handler/VsgInstanceHandler.java
@@ -297,7 +297,7 @@
.withTreatment(downstreamTreatment)
.withPriority(CordVtnPipeline.PRIORITY_DEFAULT)
.forDevice(vsgVm.deviceId())
- .forTable(CordVtnPipeline.TABLE_DST)
+ .forTable(CordVtnPipeline.TABLE_DST_IP)
.makePermanent()
.build();