X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=blobdiff_plain;f=olm%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Folm%2Fservice%2FOlmPowerServiceImplTest.java;h=f86276bed3c1ec55517fadf6d8b5528bb4fbabdb;hp=cac70eb699df6a45427df91256b01c8b7dfcd3d5;hb=e9ff01802d87203416f6af280c0590c22ed75538;hpb=5ec93e13718264540d4578a15bae220f23d7fa2e diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java index cac70eb69..f86276bed 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplTest.java @@ -54,10 +54,11 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev17 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.Network; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkId; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkKey; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Network1; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.NetworkKey; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -178,7 +179,8 @@ public class OlmPowerServiceImplTest extends AbstractTest { @Test public void testCalculateSpanlossBase2() { NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); - InstanceIdentifier networkIID = InstanceIdentifier.builder(Network.class, overlayTopologyKey) + InstanceIdentifier networkIID = InstanceIdentifier.builder(Networks.class) + .child(Network.class, overlayTopologyKey) .augmentation(Network1.class) .build(); Network1 network = TransactionUtils.getNetwork(); @@ -197,7 +199,8 @@ public class OlmPowerServiceImplTest extends AbstractTest { @Test public void testCalculateSpanlossBase3() { NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); - InstanceIdentifier networkIID = InstanceIdentifier.builder(Network.class, overlayTopologyKey) + InstanceIdentifier networkIID = InstanceIdentifier.builder(Networks.class) + .child(Network.class, overlayTopologyKey) .augmentation(Network1.class) .build(); Network1 network = TransactionUtils.getNetwork(); @@ -217,7 +220,8 @@ public class OlmPowerServiceImplTest extends AbstractTest { @Test public void testCalculateSpanlossBase4() { NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); - InstanceIdentifier networkIID = InstanceIdentifier.builder(Network.class, overlayTopologyKey) + InstanceIdentifier networkIID = InstanceIdentifier.builder(Networks.class) + .child(Network.class, overlayTopologyKey) .augmentation(Network1.class) .build(); Network1 network = TransactionUtils.getEmptyNetwork(); @@ -236,7 +240,8 @@ public class OlmPowerServiceImplTest extends AbstractTest { @Test public void testCalculateSpanlossBase5() { NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); - InstanceIdentifier networkIID = InstanceIdentifier.builder(Network.class, overlayTopologyKey) + InstanceIdentifier networkIID = InstanceIdentifier.builder(Networks.class) + .child(Network.class, overlayTopologyKey) .augmentation(Network1.class) .build(); Network1 network = TransactionUtils.getNullNetwork(); @@ -316,7 +321,8 @@ public class OlmPowerServiceImplTest extends AbstractTest { @Test public void testCalculateSpanlossCurrent2() { NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); - InstanceIdentifier networkIID = InstanceIdentifier.builder(Network.class, overlayTopologyKey) + InstanceIdentifier networkIID = InstanceIdentifier.builder(Networks.class) + .child(Network.class, overlayTopologyKey) .augmentation(Network1.class) .build(); Network1 network = TransactionUtils.getNetwork();