- this.valid = serviceTypeOduList.contains(this.otnServiceType)
- || (serviceTypeEthTsNbMap.containsKey(this.otnServiceType)
- && ((mode.equals("AZ") && checkSwPool(availableXpdrClientTps, availableXpdrNWTps, 1, 1))
- || (mode.equals("intermediate") && checkSwPool(null, availableXpdrNWTps, 0, 2)))
- )
- || (StringConstants.SERVICE_TYPE_100GE_S.equals(this.otnServiceType)
- && ((mode.equals("AZ") && checkSwPool(availableXpdrClientTps, availableXpdrNWTps, 1, 1)))
- || (mode.equals("intermediate") && checkSwPool(availableXpdrClientTps, availableXpdrNWTps, 0, 2))
- );
- //TODO checks very similar to isIntermediate and isAz methods - they should be mutualized
- // perhaps even with isOtnServiceTypeValid method
+ this.valid = SERVICE_TYPE_ODU_LIST.contains(this.otnServiceType)
+ || SERVICE_TYPE_ETH_TS_NB_MAP.containsKey(this.otnServiceType)
+ && isAzOrIntermediateAvl(mode, null, availableXpdrClientTps, availableXpdrNWTps)
+ || StringConstants.SERVICE_TYPE_100GE_S.equals(this.otnServiceType)
+ && isAzOrIntermediateAvl(mode, availableXpdrClientTps, availableXpdrClientTps, availableXpdrNWTps);
+ //TODO very similar to isOtnServiceTypeValid method
+ // check whether the different treatment for SERVICE_TYPE_100GE_S here is appropriate or not