Remove PCE net. analyzer PceOtnNodeTest useless UT

[transportpce.git] / pce / src / main / java / org / opendaylight / transportpce / pce / networkanalyzer / PceOtnNode.java

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java
index f7cfc4a5bbd1616f1504c1558c8488dd03d4b667..b1ce930e7f8cf1609bc53d6e95f7d174d2f768f3 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java
@@ -409,49 +409,14 @@ public class PceOtnNode implements PceNode {
     }
 
     public boolean isValid() {
-        if (isNotValid(this)) {
+        if (nodeId == null || nodeType == null
+                || this.getSupNetworkNodeId() == null || this.getSupClliNodeId() == null) {
             LOG.error("PceNode: one of parameters is not populated : nodeId, node type, supporting nodeId");
             valid = false;
         }
         return valid;
     }
 
-    private boolean isNotValid(final PceOtnNode poNode) {
-        return poNode == null || poNode.nodeId == null || poNode.nodeType == null
-                || poNode.getSupNetworkNodeId() == null || poNode.getSupClliNodeId() == null;
-    }
-
-    public boolean isPceOtnNodeValid(final PceOtnNode pceOtnNode) {
-        if (isNotValid(pceOtnNode) || pceOtnNode.otnServiceType == null) {
-            LOG.error(
-                "PceOtnNode: one of parameters is not populated : nodeId, node type, supporting nodeId, otnServiceType"
-            );
-            return false;
-        }
-        if (VALID_NODETYPES_LIST.contains(pceOtnNode.nodeType)) {
-            return isOtnServiceTypeValid(pceOtnNode);
-        }
-        LOG.error("PceOtnNode node type: node type is not one of MUXPDR or SWITCH or TPDR");
-        return false;
-    }
-
-    private boolean isOtnServiceTypeValid(final PceOtnNode poNode) {
-        if (poNode.modeType == null) {
-            return false;
-        }
-        //Todo refactor Strings (mode and otnServiceType ) to enums
-        if (poNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_ODU4)
-                && poNode.modeType.equals("AZ")) {
-            return true;
-        }
-        return (poNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_10GE)
-                || poNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_1GE)
-                || poNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_100GE_S))
-            && isAzOrIntermediateAvl(poNode.modeType, null, poNode.availableXpdrClientTps, poNode.availableXpdrNWTps);
-        //TODO SERVICE_TYPE_ETH_TS_NB_MAP.containsKey(this.otnServiceType) might be more appropriate here
-        //     but only SERVICE_TYPE_100GE_S is managed and not SERVICE_TYPE_100GE_M and _T
-    }
-
     private boolean isAzOrIntermediateAvl(
             String mdType, List<TpId> clientTps0, List<TpId> clientTps, List<TpId> netwTps) {
         return mdType.equals("intermediate") && checkSwPool(clientTps0, netwTps, 0, 2)