X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Futil%2FTpceNetworkTest.java;h=667997583e6b4f1ae58d20a9342543803d9bf152;hb=3c91c568583701ee0012a212bb9ded3bfbab3bbf;hp=1e14b0b6975402fd17cc6e5eb7053ad047deb515;hpb=2df235e965f3b4ff99f2e7bfc5a2911869c97c03;p=transportpce.git diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/TpceNetworkTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/TpceNetworkTest.java index 1e14b0b69..667997583 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/TpceNetworkTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/TpceNetworkTest.java @@ -15,12 +15,11 @@ import java.util.concurrent.ExecutionException; import org.junit.Test; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.network.NetworkTransactionImpl; -import org.opendaylight.transportpce.common.network.RequestProcessor; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev181130.NetworkTypes1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev181130.NetworkTypes1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev181130.networks.network.network.types.ClliNetworkBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.networks.network.network.types.OpenroadmCommonNetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev191129.NetworkTypes1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev191129.NetworkTypes1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.clli.network.rev191129.networks.network.network.types.ClliNetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.networks.network.network.types.OpenroadmCommonNetworkBuilder; 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; @@ -30,7 +29,7 @@ import org.opendaylight.yangtools.yang.binding.Augmentation; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class TpceNetworkTest extends AbstractTest { - TpceNetwork tpceNetwork = new TpceNetwork(new NetworkTransactionImpl(new RequestProcessor(getDataBroker()))); + TpceNetwork tpceNetwork = new TpceNetwork(new NetworkTransactionImpl(getDataBroker())); @Test public void createLayerClliTest() throws InterruptedException, ExecutionException { @@ -94,20 +93,20 @@ public class TpceNetworkTest extends AbstractTest { assertNull("toto layer should not have any network-type augmentation", createdOrdNetwork.getNetworkTypes() .augmentation(NetworkTypes1.class)); assertNull("toto layer should not have any network-type augmentation", createdOrdNetwork.getNetworkTypes() - .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210 .NetworkTypes1.class)); } private void commonNetworkAugmentationTest(Network createdOrdNetwork) { Augmentation ordComNet - = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1Builder() + = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.NetworkTypes1Builder() .setOpenroadmCommonNetwork(new OpenroadmCommonNetworkBuilder().build()) .build(); assertNotNull("common-network augmentation should not be null", createdOrdNetwork.getNetworkTypes() .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1.class)); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.NetworkTypes1.class)); assertEquals("bad common-network augmentation for network-types", ordComNet, createdOrdNetwork.getNetworkTypes() .augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1.class)); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210.NetworkTypes1.class)); } }