multipoint decomposer + unit test improvements

[unimgr.git] / ovs-driver / src / main / java / org / opendaylight / unimgr / mef / nrp / ovs / activator / OvsActivator.java

diff --git a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivator.java b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivator.java
index 0dad56e45f1d917fa369ca365bdc87cee86e3e41..83f9eeb5518937accc05a5f9c4eaed9c18083f27 100644 (file)
--- a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivator.java
+++ b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivator.java
@@ -50,8 +50,10 @@ public class OvsActivator implements ResourceActivator {
      */
     @Override
     public void activate(List<EndPoint> endPoints, String serviceName) throws ResourceNotAvailableException, TransactionCommitFailedException {
-        for (EndPoint endPoint:endPoints)
+        for (EndPoint endPoint:endPoints) {
             activateEndpoint(endPoint, serviceName);
+        }
+
     }
 
 
@@ -87,16 +89,22 @@ public class OvsActivator implements ResourceActivator {
                                .map(link -> ovsActivatorHelper.getTpNameFromOpenFlowPortName(link.getLinkId().getValue()))
                                .collect(Collectors.toList());
 
-        //Create egress qos
-               OvsdbUtils.createEgressQos(dataBroker, portName, outputPortNames, ovsActivatorHelper.getQosMinRate(),
-                               ovsActivatorHelper.getQosMaxRate(), serviceName, queueNumber);
+               if(ovsActivatorHelper.isIBwpConfigured()) {
+            //Create egress qos
+            OvsdbUtils.createEgressQos(dataBroker, portName, outputPortNames, ovsActivatorHelper.getQosMinRate(),
+                    ovsActivatorHelper.getQosMaxRate(), serviceName, queueNumber);
+        }
+
+
 
     }
 
-    @Override
+       @Override
     public void deactivate(List<EndPoint> endPoints, String serviceName) throws TransactionCommitFailedException, ResourceNotAvailableException {
-        for (EndPoint endPoint:endPoints)
-            deactivateEndpoint(endPoint, serviceName);
+
+        for (EndPoint endPoint:endPoints) {
+               deactivateEndpoint(endPoint, serviceName);
+        }
     }
 
     private void deactivateEndpoint(EndPoint endPoint, String serviceName) throws ResourceNotAvailableException, TransactionCommitFailedException {