commit 4c19256eac921bdc104c770448033dfe6a75ee36
author Srikanth Vavilapalli <srikanthvavila@gmail.com> Thu Oct 09 16:06:54 2014 -0700
committer Srikanth Vavilapalli <srikanthvavila@gmail.com> Thu Oct 09 16:06:54 2014 -0700
tree e3629f1cce9b7237b1117b1b668126692dfab614
parent cf1840b03609116f2394ddd988b71bd7b986e5d0

Fix for supporting ring topologies

cli/cli/c_actions.py

diff --git a/cli/cli/c_actions.py b/cli/cli/c_actions.py
index 127c843..19bc031 100755
--- a/cli/cli/c_actions.py
+++ b/cli/cli/c_actions.py
@@ -37,7 +37,7 @@
 
 from midw import *
 from vnsw import *
-from html5lib.constants import DataLossWarning
+#from html5lib.constants import DataLossWarning
 
 onos=1
 #

src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java

diff --git a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
index ca2d6af..74dc0de 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/SegmentRoutingManager.java
@@ -348,7 +348,7 @@
                 IOF13Switch dstSw = (IOF13Switch) floodlightProvider.getMasterSwitch(
                         getSwId(dstPort.getDpid().toString()));
                 // TODO: please enable it when driver feature is implemented
-                dstSw.removePortFromGroups(dstPort.getNumber());
+                //dstSw.removePortFromGroups(dstPort.getNumber());
                 log.debug("MasterSwitch {} is gone: remove port {}", sw.getDpid(), dstPort);
 
             }
@@ -370,7 +370,7 @@
                 IOF13Switch dstSw = (IOF13Switch) floodlightProvider.getMasterSwitch(
                         getSwId(dstPort.getDpid().toString()));
                 if (dstSw != null) {
-                    dstSw.removePortFromGroups(dstPort.getNumber());
+                    //dstSw.removePortFromGroups(dstPort.getNumber());
                     log.debug("Switch {} is gone: remove port {}", sw.getDpid(), dstPort);
                 }
             }
@@ -459,11 +459,12 @@
                     getSwId(srcPort.getDpid().toString()));
             IOF13Switch dstSw = (IOF13Switch) floodlightProvider.getMasterSwitch(
                     getSwId(srcPort.getDpid().toString()));
-
+            /*
             if (srcSw != null)
                 srcSw.removePortFromGroups(srcPort.getPortNumber());
             if (dstSw != null)
                 dstSw.removePortFromGroups(dstPort.getPortNumber());
+            */
 
             Switch srcSwitch = mutableTopology.getSwitch(srcPort.getDpid());
             if (srcSwitch.getLinkToNeighbor(dstPort.getDpid()) == null) {
@@ -485,6 +486,7 @@
      * @param portEntries
      */
     private void processPortRemoval(Collection<PortData> portEntries) {
+        /*
         for (PortData port : portEntries) {
             Dpid dpid = port.getDpid();
 
@@ -494,6 +496,7 @@
                 sw.removePortFromGroups(port.getPortNumber());
             log.debug("Remove port {} from switch {}", port, dpid);
         }
+        */
     }
 
     /**