bug fixes in Portmapping 7.1.0

- remove some useless namespaces inside java code
- in createMcCapDegreeObject and createMcCapSrgObject methods
  * add a null testing to avoid NPE
  * fix default treatment when McCapabilityProfileName is null or empty
- remove treatments on supported-interface-capability
  since this attribute is no more present in OpenROADM 7.1.0 ports.

JIRA: TRNSPRTPCE-337
Co-authored-by: guillaume.lambert <guillaume.lambert@orange.com>
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ifdd3d07b88220f5f505be37286e21ca00fb09457

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
index 7dee4dbc34626c74700637a7dcfd0b61c93679d6..0a2d1eea4db9317dbbeb394f6305bad965d33753 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java
@@ -139,9 +139,9 @@ public class PortMappingImpl implements PortMapping {
             case 1:
                 return portMappingVersion121.updateMapping(nodeId, oldMapping);
             case 2:
-                org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes
-                    .MappingBuilder oldMapping2Bldr221 = new MappingBuilder().setLogicalConnectionPoint(oldMapping
-                    .getLogicalConnectionPoint()).setPortDirection(oldMapping.getPortDirection());
+                MappingBuilder oldMapping2Bldr221 = new MappingBuilder()
+                        .setLogicalConnectionPoint(oldMapping.getLogicalConnectionPoint())
+                        .setPortDirection(oldMapping.getPortDirection());
                 if (oldMapping.getConnectionMapLcp() != null) {
                     oldMapping2Bldr221.setConnectionMapLcp(oldMapping.getConnectionMapLcp());
                 }
@@ -165,9 +165,9 @@ public class PortMappingImpl implements PortMapping {
                 }
                 return portMappingVersion22.updateMapping(nodeId, oldMapping2Bldr221.build());
             case 3:
-                org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes
-                    .MappingBuilder oldMapping2Bldr710 = new MappingBuilder().setLogicalConnectionPoint(oldMapping
-                    .getLogicalConnectionPoint()).setPortDirection(oldMapping.getPortDirection());
+                MappingBuilder oldMapping2Bldr710 = new MappingBuilder()
+                        .setLogicalConnectionPoint(oldMapping.getLogicalConnectionPoint())
+                        .setPortDirection(oldMapping.getPortDirection());
                 if (oldMapping.getConnectionMapLcp() != null) {
                     oldMapping2Bldr710.setConnectionMapLcp(oldMapping.getConnectionMapLcp());
                 }

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java
index 0987dfe7f3b9b1b9110ba24385b1f301c1fb646f..6cdfb83581c77716031ac5f6155c9a67b7640da1 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion710.java
@@ -89,10 +89,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OtnO
 import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev200529.Protocols1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev200529.lldp.container.Lldp;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev200529.lldp.container.lldp.PortConfig;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.capability.rev200529.Ports1;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.capability.rev200529.port.capability.grp.port.capabilities.SupportedInterfaceCapability;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.capability.rev200529.port.capability.grp.port.capabilities.SupportedInterfaceCapabilityKey;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev200327.SupportedIfCapability;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
@@ -880,24 +876,12 @@ public class PortMappingVersion710 {
     }
 
     private List<McCapabilities> createMcCapDegreeObject(List<Degree> degrees,
-        Map<McCapabilityProfileKey, McCapabilityProfile> mcCapabilityProfileMap, String nodeId) {
+            Map<McCapabilityProfileKey, McCapabilityProfile> mcCapabilityProfileMap, String nodeId) {
+
         List<McCapabilities> mcCapabilitiesList = new ArrayList<>();
         for (Degree degree : degrees) {
-            if (!degree.getMcCapabilityProfileName().isEmpty()) {
-                for (String mcCapabilityProfileName : degree.getMcCapabilityProfileName()) {
-                    McCapabilityProfileKey mcKey = new McCapabilityProfileKey(mcCapabilityProfileName);
-                    McCapabilityProfile mcCapabilityProfile = mcCapabilityProfileMap.get(mcKey);
-                    String mcNodeName = "DEG" + degree.getDegreeNumber().toString() + "-TTP-" + mcCapabilityProfile;
-                    McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder()
-                        .withKey(new McCapabilitiesKey(mcNodeName))
-                        .setMcNodeName(mcNodeName);
-                    mcCapabilitiesBuilder
-                        .setCenterFreqGranularity(mcCapabilityProfile.getCenterFreqGranularity())
-                        .setSlotWidthGranularity(mcCapabilityProfile.getSlotWidthGranularity());
-                    mcCapabilitiesList.add(mcCapabilitiesBuilder.build());
-                } // end for
-            }
-            else {
+
+            if ((degree.getMcCapabilityProfileName() == null) || (degree.getMcCapabilityProfileName().isEmpty())) {
                 LOG.warn("No MC profiles are found for  node {} on degree {}", nodeId, degree.getDegreeNumber());
                 LOG.warn("Assuming the fixed grid capabilities for degree {}", degree.getDegreeNumber());
                 LOG.warn("Assuming a default MC profile-name for degree {}", degree.getDegreeNumber());
@@ -908,30 +892,34 @@ public class PortMappingVersion710 {
                 mcCapabilitiesBuilder
                     .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50"))
                     .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50"));
+                mcCapabilitiesList.add(mcCapabilitiesBuilder.build());
+                continue;
+            }
+
+            for (String mcCapabilityProfileName : degree.getMcCapabilityProfileName()) {
+                McCapabilityProfileKey mcKey = new McCapabilityProfileKey(mcCapabilityProfileName);
+                McCapabilityProfile mcCapabilityProfile = mcCapabilityProfileMap.get(mcKey);
+                String mcNodeName = "DEG" + degree.getDegreeNumber().toString() + "-TTP-" + mcCapabilityProfile;
+                McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder()
+                    .withKey(new McCapabilitiesKey(mcNodeName))
+                    .setMcNodeName(mcNodeName);
+                mcCapabilitiesBuilder
+                    .setCenterFreqGranularity(mcCapabilityProfile.getCenterFreqGranularity())
+                    .setSlotWidthGranularity(mcCapabilityProfile.getSlotWidthGranularity());
+                mcCapabilitiesList.add(mcCapabilitiesBuilder.build());
             }
+
         }
         return mcCapabilitiesList;
     }
 
     private List<McCapabilities> createMcCapSrgObject(List<SharedRiskGroup> srgs,
-        Map<McCapabilityProfileKey, McCapabilityProfile> mcCapabilityProfileMap, String nodeId) {
+            Map<McCapabilityProfileKey, McCapabilityProfile> mcCapabilityProfileMap, String nodeId) {
+
         List<McCapabilities> mcCapabilitiesList = new ArrayList<>();
         for (SharedRiskGroup srg : srgs) {
-            if (!srg.getMcCapabilityProfileName().isEmpty()) {
-                for (String mcCapabilityProfileName : srg.getMcCapabilityProfileName()) {
-                    McCapabilityProfileKey mcKey = new McCapabilityProfileKey(mcCapabilityProfileName);
-                    McCapabilityProfile mcCapabilityProfile = mcCapabilityProfileMap.get(mcKey);
-                    String mcNodeName = "SRG" + srg.getSrgNumber().toString() + "-PP-" + mcCapabilityProfile;
-                    McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder()
-                        .withKey(new McCapabilitiesKey(mcNodeName))
-                        .setMcNodeName(mcNodeName);
-                    mcCapabilitiesBuilder
-                        .setCenterFreqGranularity(mcCapabilityProfile.getCenterFreqGranularity())
-                        .setSlotWidthGranularity(mcCapabilityProfile.getSlotWidthGranularity());
-                    mcCapabilitiesList.add(mcCapabilitiesBuilder.build());
-                } // end for
-            }
-            else {
+
+            if ((srg.getMcCapabilityProfileName() == null) || (srg.getMcCapabilityProfileName().isEmpty())) {
                 LOG.warn("No MC profiles are found for  node {} on SRG {}", nodeId, srg.getSrgNumber());
                 LOG.warn("Assuming the fixed grid capabilities for SRG {}", srg.getSrgNumber());
                 LOG.warn("Assuming a default MC profile-name for SRG {}", srg.getSrgNumber());
@@ -942,6 +930,21 @@ public class PortMappingVersion710 {
                 mcCapabilitiesBuilder
                     .setCenterFreqGranularity(FrequencyGHz.getDefaultInstance("50"))
                     .setSlotWidthGranularity(FrequencyGHz.getDefaultInstance("50"));
+                mcCapabilitiesList.add(mcCapabilitiesBuilder.build());
+                continue;
+            }
+
+            for (String mcCapabilityProfileName : srg.getMcCapabilityProfileName()) {
+                McCapabilityProfileKey mcKey = new McCapabilityProfileKey(mcCapabilityProfileName);
+                McCapabilityProfile mcCapabilityProfile = mcCapabilityProfileMap.get(mcKey);
+                String mcNodeName = "SRG" + srg.getSrgNumber().toString() + "-PP-" + mcCapabilityProfile;
+                McCapabilitiesBuilder mcCapabilitiesBuilder = new McCapabilitiesBuilder()
+                    .withKey(new McCapabilitiesKey(mcNodeName))
+                    .setMcNodeName(mcNodeName);
+                mcCapabilitiesBuilder
+                    .setCenterFreqGranularity(mcCapabilityProfile.getCenterFreqGranularity())
+                    .setSlotWidthGranularity(mcCapabilityProfile.getSlotWidthGranularity());
+                mcCapabilitiesList.add(mcCapabilitiesBuilder.build());
             }
         }
         return mcCapabilitiesList;
@@ -1012,9 +1015,6 @@ public class PortMappingVersion710 {
         if (ports.getPortQual() != null) {
             mpBldr.setPortQual(ports.getPortQual().getName());
         }
-        if (ports.augmentation(Ports1.class).getPortCapabilities().getSupportedInterfaceCapability() != null) {
-            mpBldr.setSupportedInterfaceCapability(getSupportedIfCapability(ports));
-        }
         if (xpdrNodeType != null) {
             mpBldr.setXponderType(xpdrNodeType);
         }
@@ -1024,16 +1024,6 @@ public class PortMappingVersion710 {
         return mpBldr.build();
     }
 
-
-    private List<Class<? extends SupportedIfCapability>> getSupportedIfCapability(Ports ports) {
-        Map<SupportedInterfaceCapabilityKey, SupportedInterfaceCapability> supportedInterfaceCapabilityMap =
-            ports.augmentation(Ports1.class).getPortCapabilities().getSupportedInterfaceCapability();
-        List<Class<? extends SupportedIfCapability>> supportedInterfaceCapabilityList = new ArrayList<>();
-
-        supportedInterfaceCapabilityMap.forEach((k, v) -> supportedInterfaceCapabilityList.add(k.getIfCapType()));
-        return supportedInterfaceCapabilityList;
-    }
-
     private boolean createMcCapabilitiesList(String nodeId, Info deviceInfo, List<McCapabilities> mcCapabilitiesList) {
         List<Degree> degrees = getDegrees(nodeId, deviceInfo);
         List<SharedRiskGroup> srgs = getSrgs(nodeId, deviceInfo);

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/ClliNetworkTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/ClliNetworkTest.java
index e30849972e703dd355a7dc12166eb01c424aa712..b0d8b4ca68aba85767f82992f91e718d7369e851 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/ClliNetworkTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/ClliNetworkTest.java
@@ -61,8 +61,7 @@ public class ClliNetworkTest {
             .setNodeClli("NodeClliId")
             .setNodeModel("NodeModel")
             .setNodeIpAddress(new IpAddress(new Ipv4Address("127.0.0.1")))
-            .setNodeType(org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129
-                .NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
+            .setNodeType(NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
             .setNodeVendor("VendorA")
             .setOpenroadmVersion(OpenroadmVersion._121);
         return nodeBldr;
@@ -72,8 +71,7 @@ public class ClliNetworkTest {
         NodeInfoBuilder nodeBldr = new NodeInfoBuilder()
             .setNodeModel("NodeModel")
             .setNodeIpAddress(new IpAddress(new Ipv4Address("127.0.0.1")))
-            .setNodeType(org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129
-                .NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
+            .setNodeType(NodeTypes.forValue(NodeTypes.Xpdr.getIntValue()))
             .setNodeVendor("VendorA")
             .setOpenroadmVersion(OpenroadmVersion._121);
         return nodeBldr;