Fixed segment-routing formating. 24/8724/1
authorMilos Fabian <milfabia@cisco.com>
Mon, 7 Jul 2014 09:07:02 +0000 (11:07 +0200)
committerMilos Fabian <milfabia@cisco.com>
Mon, 7 Jul 2014 09:07:02 +0000 (11:07 +0200)
-replaced deprecated method call in configuration test

Change-Id: I6f5359e2850a81909c5e519666322463ec00db60
Signed-off-by: Milos Fabian <milfabia@cisco.com>
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/lsp/setup/type01/PcepRpObjectWithPstTlvParser.java
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SegmentRouting02SessionProposalFactory.java
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SegmentRoutingActivator.java
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrEroUtil.java
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrPcInitiateMessageParser.java
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrPcRepMessageParser.java
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrPcRptMessageParser.java
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing02/SrPcUpdMessageParser.java
pcep/segment-routing/src/test/java/org/opendaylight/controller/config/yang/pcep/sr02/cfg/Sr02PCEPSessionProposalFactoryModuleTest.java

index b9348254733fb05bfe20cddbead30b6684be1fe9..34e1e2fe9c6e113892ebcaa6588122743b5e268d 100644 (file)
@@ -54,11 +54,11 @@ public class PcepRpObjectWithPstTlvParser extends PCEPRequestParameterObjectPars
         super.serializeTlvs(tlvs, body);
         if (tlvs.getAugmentation(Tlvs1.class) != null) {
             serializePathSetupType(tlvs.getAugmentation(Tlvs1.class), body);
-        } else if(tlvs.getAugmentation(Tlvs2.class) != null) {
+        } else if (tlvs.getAugmentation(Tlvs2.class) != null) {
             serializePathSetupType(tlvs.getAugmentation(Tlvs2.class), body);
-        } else if(tlvs.getAugmentation(Tlvs3.class) != null) {
+        } else if (tlvs.getAugmentation(Tlvs3.class) != null) {
             serializePathSetupType(tlvs.getAugmentation(Tlvs3.class), body);
-        } else if(tlvs.getAugmentation(Tlvs4.class) != null) {
+        } else if (tlvs.getAugmentation(Tlvs4.class) != null) {
             serializePathSetupType(tlvs.getAugmentation(Tlvs4.class), body);
         }
     }
index 17938d5e075caf7ebf54ebb91bbc85b55116ee55..4f86d657f18ee6ea699825b36dcb6c4a819c3078 100644 (file)
@@ -28,8 +28,10 @@ public class SegmentRouting02SessionProposalFactory extends Stateful07SessionPro
     @Override
     protected void addTlvs(InetSocketAddress address, TlvsBuilder builder) {
         super.addTlvs(address, builder);
-        if(this.isSegmentRoutingCapable) {
-            builder.addAugmentation(Tlvs1.class, new Tlvs1Builder().setSrPceCapability(new SrPceCapabilityBuilder().setMsd((short)0).build()).build());
+        if (this.isSegmentRoutingCapable) {
+            builder.addAugmentation(Tlvs1.class,
+                    new Tlvs1Builder().setSrPceCapability(new SrPceCapabilityBuilder().setMsd((short) 0).build())
+                            .build());
         }
     }
 
index ffc43582953f25f2ffce4e6af6c9104f13451744..6f2e39ade84e7969293f5c226e728eeb82cf4567 100644 (file)
@@ -47,9 +47,12 @@ public class SegmentRoutingActivator extends AbstractPCEPExtensionProviderActiva
 
         /* Objects */
         final TlvRegistry tlvReg = context.getTlvHandlerRegistry();
-        regs.add(context.registerObjectParser(CInitiated00SrpObjectWithPstTlvParser.CLASS, CInitiated00SrpObjectWithPstTlvParser.TYPE, new CInitiated00SrpObjectWithPstTlvParser(tlvReg)));
-        regs.add(context.registerObjectParser(PcepRpObjectWithPstTlvParser.CLASS, PcepRpObjectWithPstTlvParser.TYPE, new PcepRpObjectWithPstTlvParser(tlvReg)));
-        regs.add(context.registerObjectParser(PcepOpenObjectWithSpcTlvParser.CLASS, PcepOpenObjectWithSpcTlvParser.TYPE, new PcepOpenObjectWithSpcTlvParser(tlvReg)));
+        regs.add(context.registerObjectParser(CInitiated00SrpObjectWithPstTlvParser.CLASS,
+                CInitiated00SrpObjectWithPstTlvParser.TYPE, new CInitiated00SrpObjectWithPstTlvParser(tlvReg)));
+        regs.add(context.registerObjectParser(PcepRpObjectWithPstTlvParser.CLASS, PcepRpObjectWithPstTlvParser.TYPE,
+                new PcepRpObjectWithPstTlvParser(tlvReg)));
+        regs.add(context.registerObjectParser(PcepOpenObjectWithSpcTlvParser.CLASS,
+                PcepOpenObjectWithSpcTlvParser.TYPE, new PcepOpenObjectWithSpcTlvParser(tlvReg)));
 
         regs.add(context.registerObjectSerializer(Srp.class, new CInitiated00SrpObjectWithPstTlvParser(tlvReg)));
         regs.add(context.registerObjectSerializer(Rp.class, new PcepRpObjectWithPstTlvParser(tlvReg)));
@@ -58,7 +61,8 @@ public class SegmentRoutingActivator extends AbstractPCEPExtensionProviderActiva
         /* Messages */
         final ObjectRegistry objRegistry = context.getObjectHandlerRegistry();
         regs.add(context.registerMessageParser(SrPcRepMessageParser.TYPE, new SrPcRepMessageParser(objRegistry)));
-        regs.add(context.registerMessageParser(SrPcInitiateMessageParser.TYPE, new SrPcInitiateMessageParser(objRegistry)));
+        regs.add(context.registerMessageParser(SrPcInitiateMessageParser.TYPE, new SrPcInitiateMessageParser(
+                objRegistry)));
         regs.add(context.registerMessageParser(SrPcRptMessageParser.TYPE, new SrPcRptMessageParser(objRegistry)));
         regs.add(context.registerMessageParser(SrPcUpdMessageParser.TYPE, new SrPcUpdMessageParser(objRegistry)));
 
index 46495ecbf8d7d3d831bf8a36cb7be11f988aa671..7991c414e7496d7ea28dff2ffa630d0575a0911a 100644 (file)
@@ -14,20 +14,23 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.seg
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.explicit.route.object.Ero;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.explicit.route.object.ero.Subobject;
 
-public class SrEroUtil {
+public final class SrEroUtil {
 
     private static final int MPLS_LABEL_MIN_VALUE = 16;
 
+    private SrEroUtil() {
+    }
+
     protected static PCEPErrors validateSrEroSubobjects(final Ero ero) {
-        if(ero.getSubobject() == null || ero.getSubobject().isEmpty()) {
+        if (ero.getSubobject() == null || ero.getSubobject().isEmpty()) {
             return null;
         }
-        for(final Subobject subobject : ero.getSubobject()) {
-            if(!(subobject.getSubobjectType() instanceof SrEroSubobject)) {
+        for (final Subobject subobject : ero.getSubobject()) {
+            if (!(subobject.getSubobjectType() instanceof SrEroSubobject)) {
                 return PCEPErrors.NON_IDENTICAL_ERO_SUBOBJECTS;
             }
-            final SrEroSubobject srEroSubobject  = (SrEroSubobject) subobject.getSubobjectType();
-            if(srEroSubobject.getFlags().isM() && srEroSubobject.getSid() < MPLS_LABEL_MIN_VALUE) {
+            final SrEroSubobject srEroSubobject = (SrEroSubobject) subobject.getSubobjectType();
+            if (srEroSubobject.getFlags().isM() && srEroSubobject.getSid() < MPLS_LABEL_MIN_VALUE) {
                 return PCEPErrors.BAD_LABEL_VALUE;
             }
         }
@@ -35,8 +38,8 @@ public class SrEroUtil {
     }
 
     protected static boolean isPst(final PathSetupTypeTlv tlv) {
-        if(tlv != null && tlv.getPathSetupType() != null) {
-            if(tlv.getPathSetupType().isPst()) {
+        if (tlv != null && tlv.getPathSetupType() != null) {
+            if (tlv.getPathSetupType().isPst()) {
                 return true;
             }
         }
index 5ff342aeb73a278665d28dd5b51ee6d91a58027a..919fb5f2cf9357ad29fae379724865b0c02c7c3a 100644 (file)
@@ -29,13 +29,13 @@ public class SrPcInitiateMessageParser extends CInitiated00PCInitiateMessagePars
 
     @Override
     protected void serializeRequest(Requests req, ByteBuf buffer) {
-        if(isSegmentRoutingPath(req.getSrp())) {
+        if (isSegmentRoutingPath(req.getSrp())) {
             serializeObject(req.getSrp(), buffer);
-            if(req.getLsp() != null) {
+            if (req.getLsp() != null) {
                 serializeObject(req.getLsp(), buffer);
             }
             final Ero srEro = req.getEro();
-            if(srEro != null) {
+            if (srEro != null) {
                 serializeObject(srEro, buffer);
             }
         } else {
@@ -46,7 +46,7 @@ public class SrPcInitiateMessageParser extends CInitiated00PCInitiateMessagePars
     @Override
     protected Requests getValidRequest(List<Object> objects) {
         final Srp srp = (Srp) objects.get(0);
-        if(isSegmentRoutingPath(srp)) {
+        if (isSegmentRoutingPath(srp)) {
             final RequestsBuilder builder = new RequestsBuilder();
             builder.setSrp(srp);
             objects.remove(0);
@@ -54,9 +54,9 @@ public class SrPcInitiateMessageParser extends CInitiated00PCInitiateMessagePars
             objects.remove(0);
 
             final Object obj = objects.get(0);
-            if(obj != null) {
-                if(obj instanceof Ero) {
-                    builder.setEro((Ero)obj);
+            if (obj != null) {
+                if (obj instanceof Ero) {
+                    builder.setEro((Ero) obj);
                     objects.remove(0);
                 }
             }
@@ -66,8 +66,9 @@ public class SrPcInitiateMessageParser extends CInitiated00PCInitiateMessagePars
     }
 
     private boolean isSegmentRoutingPath(final Srp srp) {
-        if(srp != null && srp.getTlvs() != null) {
-            return SrEroUtil.isPst(srp.getTlvs().getAugmentation(Tlvs5.class)) || SrEroUtil.isPst(srp.getTlvs().getAugmentation(Tlvs7.class));
+        if (srp != null && srp.getTlvs() != null) {
+            return SrEroUtil.isPst(srp.getTlvs().getAugmentation(Tlvs5.class))
+                    || SrEroUtil.isPst(srp.getTlvs().getAugmentation(Tlvs7.class));
         }
         return false;
     }
index fe83fd9e749cd602fa043b5284d394ab5a57c97c..60c67bea055518368792b428fc3a2dfc46e000be 100644 (file)
@@ -38,7 +38,7 @@ public class SrPcRepMessageParser extends PCEPReplyMessageParser {
     @Override
     protected void serializeReply(Replies reply, ByteBuf buffer) {
         final Rp rp = reply.getRp();
-        if(isSegmentRoutingPath(rp)) {
+        if (isSegmentRoutingPath(rp)) {
             serializeObject(rp, buffer);
             if (reply.getResult() != null) {
                 if (reply.getResult() instanceof SuccessCase) {
@@ -61,7 +61,7 @@ public class SrPcRepMessageParser extends PCEPReplyMessageParser {
             return null;
         }
         final Rp rp = (Rp) objects.get(0);
-        if(isSegmentRoutingPath(rp)) {
+        if (isSegmentRoutingPath(rp)) {
             objects.remove(0);
             Result res = null;
             if (!objects.isEmpty()) {
@@ -71,10 +71,10 @@ public class SrPcRepMessageParser extends PCEPReplyMessageParser {
                     final PathsBuilder pBuilder = new PathsBuilder();
                     while (!objects.isEmpty()) {
                         final Object object = objects.get(0);
-                        if(object instanceof Ero) {
+                        if (object instanceof Ero) {
                             final Ero ero = (Ero) object;
                             final PCEPErrors error = SrEroUtil.validateSrEroSubobjects(ero);
-                            if(error != null) {
+                            if (error != null) {
                                 errors.add(createErrorMsg(error));
                                 return null;
                             } else {
@@ -93,8 +93,9 @@ public class SrPcRepMessageParser extends PCEPReplyMessageParser {
     }
 
     private boolean isSegmentRoutingPath(final Rp rp) {
-        if(rp.getTlvs() != null) {
-            return SrEroUtil.isPst(rp.getTlvs().getAugmentation(Tlvs1.class)) || SrEroUtil.isPst(rp.getTlvs().getAugmentation(Tlvs2.class));
+        if (rp.getTlvs() != null) {
+            return SrEroUtil.isPst(rp.getTlvs().getAugmentation(Tlvs1.class))
+                    || SrEroUtil.isPst(rp.getTlvs().getAugmentation(Tlvs2.class));
         }
         return false;
     }
index 372649c559b8b12c63268c10e862869d696df122..fdbf66009f32491c38484fe324c6cbedebe30aef 100644 (file)
@@ -31,11 +31,11 @@ public class SrPcRptMessageParser extends Stateful07PCReportMessageParser {
 
     @Override
     protected void serializeReport(Reports report, ByteBuf buffer) {
-        if(isSegmentRoutingPath(report.getSrp())) {
+        if (isSegmentRoutingPath(report.getSrp())) {
             serializeObject(report.getSrp(), buffer);
             serializeObject(report.getLsp(), buffer);
             final Ero srEro = report.getPath().getEro();
-            if(srEro != null) {
+            if (srEro != null) {
                 serializeObject(srEro, buffer);
             }
         } else {
@@ -45,11 +45,11 @@ public class SrPcRptMessageParser extends Stateful07PCReportMessageParser {
 
     @Override
     protected Reports getValidReports(List<Object> objects, List<Message> errors) {
-        if(!(objects.get(0) instanceof Srp)) {
+        if (!(objects.get(0) instanceof Srp)) {
             errors.add(createErrorMsg(PCEPErrors.SRP_MISSING));
         }
         final Srp srp = (Srp) objects.get(0);
-        if(isSegmentRoutingPath(srp)) {
+        if (isSegmentRoutingPath(srp)) {
             boolean isValid = true;
             final ReportsBuilder builder = new ReportsBuilder();
             builder.setSrp(srp);
@@ -63,10 +63,10 @@ public class SrPcRptMessageParser extends Stateful07PCReportMessageParser {
             }
 
             final Object obj = objects.get(0);
-            if(obj instanceof Ero) {
+            if (obj instanceof Ero) {
                 final Ero ero = (Ero) obj;
                 final PCEPErrors error = SrEroUtil.validateSrEroSubobjects(ero);
-                if(error != null) {
+                if (error != null) {
                     errors.add(createErrorMsg(error));
                     isValid = false;
                 } else {
@@ -77,7 +77,7 @@ public class SrPcRptMessageParser extends Stateful07PCReportMessageParser {
                 errors.add(createErrorMsg(PCEPErrors.ERO_MISSING));
                 isValid = false;
             }
-            if(isValid) {
+            if (isValid) {
                 return builder.build();
             }
             return null;
@@ -86,7 +86,7 @@ public class SrPcRptMessageParser extends Stateful07PCReportMessageParser {
     }
 
     private boolean isSegmentRoutingPath(final Srp srp) {
-        if(srp != null && srp.getTlvs() != null) {
+        if (srp != null && srp.getTlvs() != null) {
             return SrEroUtil.isPst(srp.getTlvs().getAugmentation(Tlvs7.class));
         }
         return false;
index 612c4151999d1063249a81ac5b8481e3f8aaa965..b6aa0548d03b4be4080f83ee6b24ca03f9ec06fb 100644 (file)
@@ -32,13 +32,13 @@ public class SrPcUpdMessageParser extends Stateful07PCUpdateRequestMessageParser
 
     @Override
     protected void serializeUpdate(Updates update, ByteBuf buffer) {
-        if(isSegmentRoutingPath(update.getSrp())) {
+        if (isSegmentRoutingPath(update.getSrp())) {
             serializeObject(update.getSrp(), buffer);
-            if(update.getLsp() != null) {
+            if (update.getLsp() != null) {
                 serializeObject(update.getLsp(), buffer);
             }
             final Ero srEro = update.getPath().getEro();
-            if(srEro != null) {
+            if (srEro != null) {
                 serializeObject(srEro, buffer);
             }
         } else {
@@ -48,7 +48,7 @@ public class SrPcUpdMessageParser extends Stateful07PCUpdateRequestMessageParser
 
     @Override
     protected Updates getValidUpdates(List<Object> objects, List<Message> errors) {
-        if(objects.get(0) instanceof Srp && isSegmentRoutingPath((Srp) objects.get(0))) {
+        if (objects.get(0) instanceof Srp && isSegmentRoutingPath((Srp) objects.get(0))) {
             boolean isValid = true;
             final Srp srp = (Srp) objects.get(0);
             final UpdatesBuilder builder = new UpdatesBuilder();
@@ -63,10 +63,10 @@ public class SrPcUpdMessageParser extends Stateful07PCUpdateRequestMessageParser
             }
 
             final Object obj = objects.get(0);
-            if(obj instanceof Ero) {
+            if (obj instanceof Ero) {
                 final Ero ero = (Ero) obj;
                 final PCEPErrors error = SrEroUtil.validateSrEroSubobjects(ero);
-                if(error != null) {
+                if (error != null) {
                     errors.add(createErrorMsg(error));
                     isValid = false;
                 } else {
@@ -77,7 +77,7 @@ public class SrPcUpdMessageParser extends Stateful07PCUpdateRequestMessageParser
                 errors.add(createErrorMsg(PCEPErrors.ERO_MISSING));
                 isValid = false;
             }
-            if(isValid) {
+            if (isValid) {
                 return builder.build();
             }
             return null;
@@ -86,8 +86,9 @@ public class SrPcUpdMessageParser extends Stateful07PCUpdateRequestMessageParser
     }
 
     private boolean isSegmentRoutingPath(final Srp srp) {
-        if(srp != null && srp.getTlvs() != null) {
-            return SrEroUtil.isPst(srp.getTlvs().getAugmentation(Tlvs6.class)) || SrEroUtil.isPst(srp.getTlvs().getAugmentation(Tlvs7.class));
+        if (srp != null && srp.getTlvs() != null) {
+            return SrEroUtil.isPst(srp.getTlvs().getAugmentation(Tlvs6.class))
+                    || SrEroUtil.isPst(srp.getTlvs().getAugmentation(Tlvs7.class));
         }
         return false;
     }
index 0392c260bb26db455f16153bbd84f4323e827154..863d960b73cbb69c505a463cf6dafc62004997d7 100644 (file)
@@ -64,7 +64,7 @@ public class Sr02PCEPSessionProposalFactoryModuleTest extends AbstractConfigTest
         createInstance();
         final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
         assertBeanCount(1, FACTORY_NAME);
-        transaction.newMBeanProxy(transaction.lookupConfigBean(FACTORY_NAME, INSTANCE_NAME),
+        transaction.newMXBeanProxy(transaction.lookupConfigBean(FACTORY_NAME, INSTANCE_NAME),
                 Stateful07PCEPSessionProposalFactoryModuleMXBean.class);
         final CommitStatus status = transaction.commit();
         assertBeanCount(1, FACTORY_NAME);
@@ -85,7 +85,7 @@ public class Sr02PCEPSessionProposalFactoryModuleTest extends AbstractConfigTest
     private ObjectName createInstance(final ConfigTransactionJMXClient transaction, final Short deadTimer, final Short keepAlive,
             final Boolean stateful, final Boolean active, final Boolean instant, final Boolean srCapable) throws InstanceAlreadyExistsException {
         final ObjectName nameCreated = transaction.createModule(FACTORY_NAME, INSTANCE_NAME);
-        final Sr02PCEPSessionProposalFactoryModuleMXBean mxBean = transaction.newMBeanProxy(nameCreated,
+        final Sr02PCEPSessionProposalFactoryModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated,
                 Sr02PCEPSessionProposalFactoryModuleMXBean.class);
         mxBean.setActive(active);
         mxBean.setDeadTimerValue(deadTimer);