[GEANT] Remove configuration from device interfaces.
Change-Id: Ie382a645c2ec8677ccd9ba6ed4b881e38686c1b9
diff --git a/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoIosImpl.java b/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoIosImpl.java
new file mode 100644
index 0000000..4a9cced
--- /dev/null
+++ b/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoIosImpl.java
@@ -0,0 +1,304 @@
+/*
+ *
+ * * Copyright 2016 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.onosproject.drivers.cisco;
+
+import org.onlab.packet.VlanId;
+import org.onosproject.drivers.utilities.XmlConfigParser;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.behaviour.InterfaceConfig;
+import org.onosproject.net.driver.AbstractHandlerBehaviour;
+import org.onosproject.netconf.NetconfController;
+import org.onosproject.netconf.NetconfException;
+import org.onosproject.netconf.NetconfSession;
+import org.slf4j.Logger;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Configures interfaces on Cisco IOS devices.
+ */
+public class InterfaceConfigCiscoIosImpl extends AbstractHandlerBehaviour
+ implements InterfaceConfig {
+
+ private final Logger log = getLogger(getClass());
+
+ /**
+ * Adds an interface to a VLAN.
+ * @param deviceId the device ID
+ * @param intf the name of the interface
+ * @param vlanId the VLAN ID
+ * @return the result of operation
+ */
+ @Override
+ public boolean addInterfaceToVlan(DeviceId deviceId, String intf, VlanId vlanId) {
+ NetconfController controller = checkNotNull(handler()
+ .get(NetconfController.class));
+
+ NetconfSession session = controller.getDevicesMap().get(handler()
+ .data().deviceId()).getSession();
+ String reply;
+ try {
+ //TODO remove XML triming if preceeds in Session
+ reply = session.requestSync(addInterfaceToVlanBuilder(intf, vlanId)).trim();
+ } catch (NetconfException e) {
+ log.error("Failed to configure VLAN ID {} on device {} interface {}.",
+ vlanId, deviceId, intf, e);
+ return false;
+ }
+
+ return XmlConfigParser.configSuccess(XmlConfigParser.loadXml(
+ new ByteArrayInputStream(reply.getBytes(StandardCharsets.UTF_8))));
+ }
+
+ /**
+ * Builds a request to add an interface to a VLAN.
+ * @param intf the name of the interface
+ * @param vlanId the VLAN ID
+ * @return the request string.
+ */
+ private String addInterfaceToVlanBuilder(String intf, VlanId vlanId) {
+ StringBuilder rpc =
+ new StringBuilder("<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" ");
+ rpc.append("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">");
+ rpc.append("<edit-config>");
+ rpc.append("<target>");
+ rpc.append("<running/>");
+ rpc.append("</target>");
+ rpc.append("<config>");
+ rpc.append("<xml-config-data>");
+ rpc.append("<Device-Configuration><interface><Param>");
+ rpc.append(intf);
+ rpc.append("</Param>");
+ rpc.append("<ConfigIf-Configuration>");
+ rpc.append("<switchport><access><vlan><VLANIDVLANPortAccessMode>");
+ rpc.append(vlanId);
+ rpc.append("</VLANIDVLANPortAccessMode></vlan></access></switchport>");
+ rpc.append("<switchport><mode><access/></mode></switchport>");
+ rpc.append("</ConfigIf-Configuration>");
+ rpc.append("</interface>");
+ rpc.append("</Device-Configuration>");
+ rpc.append("</xml-config-data>");
+ rpc.append("</config>");
+ rpc.append("</edit-config>");
+ rpc.append("</rpc>");
+
+ return rpc.toString();
+ }
+
+ /**
+ * Removes an interface from a VLAN.
+ * @param deviceId the device ID
+ * @param intf the name of the interface
+ * @param vlanId the VLAN ID
+ * @return the result of operation
+ */
+ @Override
+ public boolean removeInterfaceFromVlan(DeviceId deviceId, String intf,
+ VlanId vlanId) {
+ NetconfController controller = checkNotNull(handler()
+ .get(NetconfController.class));
+
+ NetconfSession session = controller.getDevicesMap().get(handler()
+ .data().deviceId()).getSession();
+ String reply;
+ try {
+ //TODO remove XML triming if preceeds in Session
+ reply = session.requestSync(removeInterfaceFromVlanBuilder(intf, vlanId)).trim();
+ } catch (NetconfException e) {
+ log.error("Failed to remove VLAN ID {} from device {} interface {}.",
+ vlanId, deviceId, intf, e);
+ return false;
+ }
+
+ return XmlConfigParser.configSuccess(XmlConfigParser.loadXml(
+ new ByteArrayInputStream(reply.getBytes(StandardCharsets.UTF_8))));
+ }
+
+ /**
+ * Builds a request to remove an interface from a VLAN.
+ * @param intf the name of the interface
+ * @param vlanId the VLAN ID
+ * @return the request string.
+ */
+ private String removeInterfaceFromVlanBuilder(String intf, VlanId vlanId) {
+ StringBuilder rpc =
+ new StringBuilder("<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" ");
+ rpc.append("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">");
+ rpc.append("<edit-config>");
+ rpc.append("<target>");
+ rpc.append("<running/>");
+ rpc.append("</target>");
+ rpc.append("<config>");
+ rpc.append("<xml-config-data>");
+ rpc.append("<Device-Configuration><interface><Param>");
+ rpc.append(intf);
+ rpc.append("</Param>");
+ rpc.append("<ConfigIf-Configuration>");
+ rpc.append("<switchport operation=\"delete\"><access><vlan><VLANIDVLANPortAccessMode>");
+ rpc.append(vlanId);
+ rpc.append("</VLANIDVLANPortAccessMode></vlan></access></switchport>");
+ rpc.append("<switchport operation=\"delete\"><mode><access/></mode></switchport>");
+ rpc.append("</ConfigIf-Configuration>");
+ rpc.append("</interface>");
+ rpc.append("</Device-Configuration>");
+ rpc.append("</xml-config-data>");
+ rpc.append("</config>");
+ rpc.append("</edit-config>");
+ rpc.append("</rpc>");
+
+ return rpc.toString();
+ }
+
+ /**
+ * Configures an interface as trunk for VLAN.
+ * @param deviceId the device ID
+ * @param intf the name of the interface
+ * @param vlanId the VLAN ID
+ * @return the result of operation
+ */
+ @Override
+ public boolean addTrunkInterface(DeviceId deviceId, String intf, VlanId vlanId) {
+ NetconfController controller = checkNotNull(handler()
+ .get(NetconfController.class));
+
+ NetconfSession session = controller.getDevicesMap().get(handler()
+ .data().deviceId()).getSession();
+ String reply;
+ try {
+ //TODO remove XML triming if preceeds in Session
+ reply = session.requestSync(addTrunkInterfaceBuilder(intf, vlanId)).trim();
+ } catch (NetconfException e) {
+ log.error("Failed to configure trunk mode for VLAN ID {} on device {} interface {}.",
+ vlanId, deviceId, intf, e);
+ return false;
+ }
+
+ return XmlConfigParser.configSuccess(XmlConfigParser.loadXml(
+ new ByteArrayInputStream(reply.getBytes(StandardCharsets.UTF_8))));
+ }
+
+ /**
+ * Builds a request to configure an interface as trunk for VLAN.
+ * @param intf the name of the interface
+ * @param vlanId the VLAN ID
+ * @return the request string.
+ */
+ private String addTrunkInterfaceBuilder(String intf, VlanId vlanId) {
+ StringBuilder rpc =
+ new StringBuilder("<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" ");
+ rpc.append("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">");
+ rpc.append("<edit-config>");
+ rpc.append("<target>");
+ rpc.append("<running/>");
+ rpc.append("</target>");
+ rpc.append("<config>");
+ rpc.append("<xml-config-data>");
+ rpc.append("<Device-Configuration><interface><Param>");
+ rpc.append(intf);
+ rpc.append("</Param>");
+ rpc.append("<ConfigIf-Configuration>");
+ rpc.append("<switchport><trunk><encapsulation><dot1q/></encapsulation>");
+ rpc.append("</trunk></switchport><switchport><trunk><allowed><vlan>");
+ rpc.append("<VLANIDsAllowedVLANsPortTrunkingMode>");
+ rpc.append(vlanId);
+ rpc.append("</VLANIDsAllowedVLANsPortTrunkingMode></vlan></allowed></trunk>");
+ rpc.append("</switchport><switchport><mode><trunk/></mode></switchport>");
+ rpc.append("</ConfigIf-Configuration>");
+ rpc.append("</interface>");
+ rpc.append("</Device-Configuration>");
+ rpc.append("</xml-config-data>");
+ rpc.append("</config>");
+ rpc.append("</edit-config>");
+ rpc.append("</rpc>");
+
+ return rpc.toString();
+ }
+
+ /**
+ * Removes trunk mode configuration for VLAN from an interface.
+ * @param deviceId the device ID
+ * @param intf the name of the interface
+ * @param vlanId the VLAN ID
+ * @return the result of operation
+ */
+ @Override
+ public boolean removeTrunkInterface(DeviceId deviceId, String intf, VlanId vlanId) {
+ NetconfController controller = checkNotNull(handler()
+ .get(NetconfController.class));
+
+ NetconfSession session = controller.getDevicesMap().get(handler()
+ .data().deviceId()).getSession();
+ String reply;
+ try {
+ //TODO remove XML triming if preceeds in Session
+ reply = session.requestSync(removeTrunkInterfaceBuilder(intf, vlanId)).trim();
+ } catch (NetconfException e) {
+ log.error("Failed to remove trunk mode for VLAN ID {} on device {} interface {}.",
+ vlanId, deviceId, intf, e);
+ return false;
+ }
+
+ return XmlConfigParser.configSuccess(XmlConfigParser.loadXml(
+ new ByteArrayInputStream(reply.getBytes(StandardCharsets.UTF_8))));
+}
+
+ /**
+ * Builds a request to remove trunk mode configuration for VLAN from an interface.
+ * @param intf the name of the interface
+ * @param vlanId the VLAN ID
+ * @return the request string.
+ */
+ private String removeTrunkInterfaceBuilder(String intf, VlanId vlanId) {
+ StringBuilder rpc =
+ new StringBuilder("<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" ");
+ rpc.append("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">");
+ rpc.append("<edit-config>");
+ rpc.append("<target>");
+ rpc.append("<running/>");
+ rpc.append("</target>");
+ rpc.append("<config>");
+ rpc.append("<xml-config-data>");
+ rpc.append("<Device-Configuration><interface><Param>");
+ rpc.append(intf);
+ rpc.append("</Param>");
+ rpc.append("<ConfigIf-Configuration>");
+ rpc.append("<switchport><mode operation=\"delete\"><trunk/></mode></switchport>");
+ rpc.append("<switchport><trunk operation=\"delete\"><encapsulation>");
+ rpc.append("<dot1q/></encapsulation></trunk></switchport>");
+ rpc.append("<switchport><trunk operation=\"delete\"><allowed><vlan>");
+ rpc.append("<VLANIDsAllowedVLANsPortTrunkingMode>");
+ rpc.append(vlanId);
+ rpc.append("</VLANIDsAllowedVLANsPortTrunkingMode></vlan></allowed>");
+ rpc.append("</trunk></switchport></ConfigIf-Configuration>");
+ rpc.append("</interface>");
+ rpc.append("</Device-Configuration>");
+ rpc.append("</xml-config-data>");
+ rpc.append("</config>");
+ rpc.append("</edit-config>");
+ rpc.append("</rpc>");
+
+ return rpc.toString();
+ }
+
+}
+
diff --git a/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoSmXImpl.java b/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoSmXImpl.java
deleted file mode 100644
index 6df1076..0000000
--- a/drivers/cisco/src/main/java/org/onosproject/drivers/cisco/InterfaceConfigCiscoSmXImpl.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- *
- * * Copyright 2016 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.onosproject.drivers.cisco;
-
-import org.onlab.packet.VlanId;
-import org.onosproject.drivers.utilities.XmlConfigParser;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.behaviour.InterfaceConfig;
-import org.onosproject.net.driver.AbstractHandlerBehaviour;
-import org.onosproject.netconf.NetconfController;
-import org.onosproject.netconf.NetconfException;
-import org.onosproject.netconf.NetconfSession;
-import org.slf4j.Logger;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Configures interfaces on Cisco SM-X devices.
- */
-public class InterfaceConfigCiscoSmXImpl extends AbstractHandlerBehaviour
- implements InterfaceConfig {
-
- private final Logger log = getLogger(getClass());
-
- /**
- * Adds an interface to a VLAN.
- * @param deviceId the device ID
- * @param intf the name of the interface
- * @param vlanId the VLAN ID
- * @return the result of operation
- */
- @Override
- public boolean addInterfaceToVlan(DeviceId deviceId, String intf, VlanId vlanId) {
- NetconfController controller = checkNotNull(handler()
- .get(NetconfController.class));
-
- NetconfSession session = controller.getDevicesMap().get(handler()
- .data().deviceId()).getSession();
- String reply;
- try {
- reply = session.requestSync(addInterfaceToVlanBuilder(intf, vlanId)).trim();
- } catch (NetconfException e) {
- log.error("Failed to configure VLAN ID {} on device {} port {}.",
- vlanId, deviceId, intf, e);
- return false;
- }
-
- return XmlConfigParser.configSuccess(XmlConfigParser.loadXml(
- new ByteArrayInputStream(reply.getBytes(StandardCharsets.UTF_8))));
- }
-
- /**
- * Builds a request crafted to add an interface to a VLAN.
- * @param intf the name of the interface
- * @param vlanId the VLAN ID
- * @return the request string.
- */
- private String addInterfaceToVlanBuilder(String intf, VlanId vlanId) {
- StringBuilder rpc = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
- rpc.append("<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" ");
- rpc.append("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">");
- rpc.append("<edit-config>");
- rpc.append("<target>");
- rpc.append("<running/>");
- rpc.append("</target>");
- rpc.append("<config>");
- rpc.append("<xml-config-data>");
- rpc.append("<Device-Configuration><interface><Param>");
- rpc.append(intf);
- rpc.append("</Param>");
- rpc.append("<ConfigIf-Configuration>");
- rpc.append("<switchport><access><vlan><VLANIDVLANPortAccessMode>");
- rpc.append(vlanId);
- rpc.append("</VLANIDVLANPortAccessMode></vlan></access></switchport>");
- rpc.append("<switchport><mode><access/></mode></switchport>");
- rpc.append("</ConfigIf-Configuration>");
- rpc.append("</interface>");
- rpc.append("</Device-Configuration>");
- rpc.append("</xml-config-data>");
- rpc.append("</config>");
- rpc.append("</edit-config>");
- rpc.append("</rpc>");
-
- return rpc.toString();
- }
-
- /**
- * Configures an interface as trunk for VLAN.
- * @param deviceId the device ID
- * @param intf the name of the interface
- * @param vlanId the VLAN ID
- * @return the result of operation
- */
- @Override
- public boolean addTrunkInterface(DeviceId deviceId, String intf, VlanId vlanId) {
- NetconfController controller = checkNotNull(handler()
- .get(NetconfController.class));
-
- NetconfSession session = controller.getDevicesMap().get(handler()
- .data().deviceId()).getSession();
- String reply;
- try {
- reply = session.requestSync(addTrunkInterface(intf, vlanId)).trim();
- } catch (NetconfException e) {
- log.error("Failed to configure VLAN ID {} on device {} port {}.",
- vlanId, deviceId, intf, e);
- return false;
- }
-
- return XmlConfigParser.configSuccess(XmlConfigParser.loadXml(
- new ByteArrayInputStream(reply.getBytes(StandardCharsets.UTF_8))));
- }
-
- /**
- * Builds a request crafted to configure an interface as trunk for VLAN.
- * @param intf the name of the interface
- * @param vlanId the VLAN ID
- * @return the request string.
- */
- private String addTrunkInterface(String intf, VlanId vlanId) {
- StringBuilder rpc = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
- rpc.append("<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" ");
- rpc.append("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">");
- rpc.append("<edit-config>");
- rpc.append("<target>");
- rpc.append("<running/>");
- rpc.append("</target>");
- rpc.append("<config>");
- rpc.append("<xml-config-data>");
- rpc.append("<Device-Configuration><interface><Param>");
- rpc.append(intf);
- rpc.append("</Param>");
- rpc.append("<ConfigIf-Configuration>");
- rpc.append("<switchport><trunk><encapsulation><dot1q/></encapsulation></trunk></switchport>");
- rpc.append("<switchport><trunk><allowed><vlan><VLANIDsAllowedVLANsPortTrunkingMode>");
- rpc.append(vlanId);
- rpc.append("</VLANIDsAllowedVLANsPortTrunkingMode></vlan></allowed></trunk></switchport>");
- rpc.append("<switchport><mode><trunk/></mode></switchport>");
- rpc.append("</ConfigIf-Configuration>");
- rpc.append("</interface>");
- rpc.append("</Device-Configuration>");
- rpc.append("</xml-config-data>");
- rpc.append("</config>");
- rpc.append("</edit-config>");
- rpc.append("</rpc>");
-
- return rpc.toString();
- }
-
-}
-
diff --git a/drivers/cisco/src/main/resources/cisco-drivers.xml b/drivers/cisco/src/main/resources/cisco-drivers.xml
index 2c07021..e779f2c 100644
--- a/drivers/cisco/src/main/resources/cisco-drivers.xml
+++ b/drivers/cisco/src/main/resources/cisco-drivers.xml
@@ -16,8 +16,8 @@
-->
<drivers>
<driver name="cisco-netconf" extends="netconf" manufacturer="Cisco"
- hwVersion="SM-X" swVersion="IOS 15">
+ hwVersion="" swVersion="IOS">
<behaviour api="org.onosproject.net.behaviour.InterfaceConfig"
- impl="org.onosproject.drivers.cisco.InterfaceConfigCiscoSmXImpl"/>
+ impl="org.onosproject.drivers.cisco.InterfaceConfigCiscoIosImpl"/>
</driver>
</drivers>