Simplified the check for QoS definitions in the VNFD to not explicitl…

…y and strictly check for maximum_bandwidth
openbaton · Jan 28, 2019 · 6a4dc08 · 6a4dc08
1 parent 10e85e4
commit 6a4dc08
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/org/openbaton/nse/openbaton/Subscriber.java b/src/main/java/org/openbaton/nse/openbaton/Subscriber.java
@@ -167,7 +167,8 @@ public void receiveConfiguration(String message) {
           if (!vlr.getQos().isEmpty()) {
             for (String qosAttr : vlr.getQos()) {
               //logger.debug("    found : " + qosAttr);
-              if (qosAttr.contains("maximum_bandwidth")) {
+              //if (qosAttr.contains("maximum_bandwidth")) {
+              if (qosAttr.contains("bandwidth")) {
                 //logger.debug(nsr.getVnfr().toString());
                 core.addQos(nsr.getVnfr(), nsr.getId());
               }
@@ -259,7 +260,8 @@ public void scaleConfiguration(String message) {
       for (InternalVirtualLink vlr : vnfr.getVirtual_link()) {
         if (!vlr.getQos().isEmpty()) {
           for (String qosAttr : vlr.getQos()) {
-            if (qosAttr.contains("maximum_bandwidth")) {
+            //if (qosAttr.contains("maximum_bandwidth")) {
+            if (qosAttr.contains("bandwidth")) {
               core.addQos(new HashSet<>(Arrays.asList(vnfr)), vnfr.getParent_ns_id());
             }
           }