X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Ftapi%2Futils%2FTapiLinkImpl.java;h=25d0e64d4a3aad9d9547eb35fca52f0df5b2db09;hb=652c9098f8d97e6f5a723a7c55929f9351bffb5b;hp=617fd62cef7d6cc3da7d34f36974089179562948;hpb=2f5d0456526325091bdef21785cd9db32e6bab0c;p=transportpce.git diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/TapiLinkImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/TapiLinkImpl.java index 617fd62ce..25d0e64d4 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/TapiLinkImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/utils/TapiLinkImpl.java @@ -108,7 +108,7 @@ public class TapiLinkImpl implements TapiLink { case TapiStringConstants.OMS_RDM_RDM_LINK: LOG.info("Roadm to roadm link"); linkName - .setValueName("OMS link name") + .setValueName(TapiStringConstants.VALUE_NAME_OMS_RDM_RDM_LINK) .setValue(linkKey); break; case TapiStringConstants.TRANSITIONAL_LINK: @@ -118,7 +118,7 @@ public class TapiLinkImpl implements TapiLink { .setValue(linkKey); break; case TapiStringConstants.OMS_XPDR_RDM_LINK: - LOG.info("Xpdr to roadm link"); + LOG.info(TapiStringConstants.VALUE_NAME_OTS_XPDR_RDM_LINK); linkName .setValueName("XPDR-RDM link name") .setValue(linkKey); @@ -126,7 +126,7 @@ public class TapiLinkImpl implements TapiLink { case TapiStringConstants.OTN_XPDR_XPDR_LINK: LOG.info("OTN Xpdr to roadm link"); linkName - .setValueName("otn link name") + .setValueName(TapiStringConstants.VALUE_NAME_OTN_XPDR_XPDR_LINK) .setValue(linkKey); break; default: @@ -188,6 +188,7 @@ public class TapiLinkImpl implements TapiLink { .build(); } + @Override public AdministrativeState setTapiAdminState(String adminState) { if (adminState == null) { return null; @@ -197,6 +198,7 @@ public class TapiLinkImpl implements TapiLink { : AdministrativeState.LOCKED; } + @Override public AdministrativeState setTapiAdminState(AdminStates adminState1, AdminStates adminState2) { if (adminState1 == null || adminState2 == null) { return null; @@ -206,6 +208,7 @@ public class TapiLinkImpl implements TapiLink { ? AdministrativeState.UNLOCKED : AdministrativeState.LOCKED; } + @Override public OperationalState setTapiOperationalState(String operState) { if (operState == null) { return null; @@ -214,6 +217,7 @@ public class TapiLinkImpl implements TapiLink { ? OperationalState.ENABLED : OperationalState.DISABLED; } + @Override public OperationalState setTapiOperationalState(State operState1, State operState2) { if (operState1 == null || operState2 == null) { return null; @@ -222,13 +226,14 @@ public class TapiLinkImpl implements TapiLink { ? OperationalState.ENABLED : OperationalState.DISABLED; } + @Override public String getOperState(String srcNodeId, String destNodeId, String sourceTpId, String destTpId) { Uuid tapiTopoUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.T0_FULL_MULTILAYER .getBytes(Charset.forName("UTF-8"))).toString()); Uuid nodeUuid = new Uuid(UUID.nameUUIDFromBytes(String.join("+", srcNodeId, TapiStringConstants.PHTNC_MEDIA).getBytes(Charset.forName("UTF-8"))).toString()); Uuid nepUuid = new Uuid(UUID.nameUUIDFromBytes(String.join("+", srcNodeId, - TapiStringConstants.PHTNC_MEDIA, sourceTpId).getBytes(Charset.forName("UTF-8"))).toString()); + TapiStringConstants.PHTNC_MEDIA_OTS, sourceTpId).getBytes(Charset.forName("UTF-8"))).toString()); InstanceIdentifier onepIID = InstanceIdentifier.builder(Context.class) .augmentation(Context1.class).child(TopologyContext.class) .child(Topology.class, new TopologyKey(tapiTopoUuid)).child(Node.class, new NodeKey(nodeUuid)) @@ -237,7 +242,7 @@ public class TapiLinkImpl implements TapiLink { Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes(String.join("+", destNodeId, TapiStringConstants.PHTNC_MEDIA).getBytes(Charset.forName("UTF-8"))).toString()); Uuid nep1Uuid = new Uuid(UUID.nameUUIDFromBytes(String.join("+", destNodeId, - TapiStringConstants.PHTNC_MEDIA, destTpId).getBytes(Charset.forName("UTF-8"))).toString()); + TapiStringConstants.PHTNC_MEDIA_OTS, destTpId).getBytes(Charset.forName("UTF-8"))).toString()); InstanceIdentifier onep1IID = InstanceIdentifier.builder(Context.class) .augmentation(Context1.class).child(TopologyContext.class) .child(Topology.class, new TopologyKey(tapiTopoUuid)).child(Node.class, new NodeKey(node1Uuid)) @@ -261,13 +266,14 @@ public class TapiLinkImpl implements TapiLink { } } + @Override public String getAdminState(String srcNodeId, String destNodeId, String sourceTpId, String destTpId) { Uuid tapiTopoUuid = new Uuid(UUID.nameUUIDFromBytes(TapiStringConstants.T0_FULL_MULTILAYER .getBytes(Charset.forName("UTF-8"))).toString()); Uuid nodeUuid = new Uuid(UUID.nameUUIDFromBytes(String.join("+", srcNodeId, TapiStringConstants.PHTNC_MEDIA).getBytes(Charset.forName("UTF-8"))).toString()); Uuid nepUuid = new Uuid(UUID.nameUUIDFromBytes(String.join("+", srcNodeId, - TapiStringConstants.PHTNC_MEDIA, sourceTpId).getBytes(Charset.forName("UTF-8"))).toString()); + TapiStringConstants.PHTNC_MEDIA_OTS, sourceTpId).getBytes(Charset.forName("UTF-8"))).toString()); InstanceIdentifier onepIID = InstanceIdentifier.builder(Context.class) .augmentation(Context1.class).child(TopologyContext.class) .child(Topology.class, new TopologyKey(tapiTopoUuid)).child(Node.class, new NodeKey(nodeUuid)) @@ -276,7 +282,7 @@ public class TapiLinkImpl implements TapiLink { Uuid node1Uuid = new Uuid(UUID.nameUUIDFromBytes(String.join("+", destNodeId, TapiStringConstants.PHTNC_MEDIA).getBytes(Charset.forName("UTF-8"))).toString()); Uuid nep1Uuid = new Uuid(UUID.nameUUIDFromBytes(String.join("+", destNodeId, - TapiStringConstants.PHTNC_MEDIA, destTpId).getBytes(Charset.forName("UTF-8"))).toString()); + TapiStringConstants.PHTNC_MEDIA_OTS, destTpId).getBytes(Charset.forName("UTF-8"))).toString()); InstanceIdentifier onep1IID = InstanceIdentifier.builder(Context.class) .augmentation(Context1.class).child(TopologyContext.class) .child(Topology.class, new TopologyKey(tapiTopoUuid)).child(Node.class, new NodeKey(node1Uuid))