Migrate to MEF YANG generated on 2017-05-31

author Donald Hunter <donaldh@cisco.com>

Wed, 5 Jul 2017 14:56:01 +0000 (15:56 +0100)

committer Donald Hunter <donaldh@cisco.com>

Wed, 5 Jul 2017 20:49:24 +0000 (21:49 +0100)
author Donald Hunter <donaldh@cisco.com>
Wed, 5 Jul 2017 14:56:01 +0000 (15:56 +0100)
committer Donald Hunter <donaldh@cisco.com>
Wed, 5 Jul 2017 20:49:24 +0000 (21:49 +0100)
diff --git a/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/TopologyDataHandler.java b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/TopologyDataHandler.java

index 3e06f69be9e054334f85401e5d5f47b3b3d23b43..ba313aa4c0af3b093c152a45e392002d618f0555 100644 (file)
--- a/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/TopologyDataHandler.java
+++ b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/TopologyDataHandler.java
@@ -8,13 +8,34 @@
  
  package org.opendaylight.unimgr.mef.nrp.cisco.xr;
  
-import com.google.common.base.Optional;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import org.opendaylight.controller.md.sal.binding.api.*;
+import static org.opendaylight.unimgr.utils.CapabilitiesService.Capability.Mode.AND;
+import static org.opendaylight.unimgr.utils.CapabilitiesService.NodeContext.NodeCapability.NETCONF;
+import static org.opendaylight.unimgr.utils.CapabilitiesService.NodeContext.NodeCapability.NETCONF_CISCO_IOX_IFMGR;
+import static org.opendaylight.unimgr.utils.CapabilitiesService.NodeContext.NodeCapability.NETCONF_CISCO_IOX_L2VPN;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
+import org.opendaylight.controller.md.sal.binding.api.MountPoint;
+import org.opendaylight.controller.md.sal.binding.api.MountPointService;
+import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
+import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
  import org.opendaylight.unimgr.mef.nrp.cisco.xr.common.helper.InterfaceHelper;
@@ -24,15 +45,15 @@ import org.opendaylight.unimgr.utils.DriverConstants;
  import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.ifmgr.cfg.rev150730.InterfaceConfigurations;
  import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.ifmgr.cfg.rev150730._interface.configurations.InterfaceConfiguration;
  import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.ifmgr.cfg.rev150730._interface.configurations.InterfaceConfigurationKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.LayerProtocolName;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.TerminationDirection;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.service._interface.point.LayerProtocolBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePointKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.LayerProtocolName;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.TerminationDirection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.service._interface.point.g.LayerProtocolBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePointKey;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types.TopologyNetconf;
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
@@ -46,21 +67,12 @@ import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.opendaylight.unimgr.utils.CapabilitiesService.Capability.Mode.AND;
-import static org.opendaylight.unimgr.utils.CapabilitiesService.NodeContext.NodeCapability.*;
+import com.google.common.base.Optional;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
  
  /**
   * @author bartosz.michalik@amartus.com
diff --git a/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/driver/XrDriverBuilder.java b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/driver/XrDriverBuilder.java

index f5bd8b8343472e6811a68aa999ae56bce8d07f39..ec10ff1cd8ae9ec9a421f3ea8ac72ca2c1505bc8 100644 (file)
--- a/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/driver/XrDriverBuilder.java
+++ b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/driver/XrDriverBuilder.java
@@ -7,6 +7,14 @@
   */
  package org.opendaylight.unimgr.mef.nrp.cisco.xr.l2vpn.driver;
  
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.controller.md.sal.binding.api.MountPointService;
  import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
@@ -18,14 +26,11 @@ import org.opendaylight.unimgr.mef.nrp.cisco.xr.l2vpn.activator.L2vpnLocalConnec
  import org.opendaylight.unimgr.mef.nrp.cisco.xr.l2vpn.activator.L2vpnP2pConnectActivator;
  import org.opendaylight.unimgr.utils.DriverConstants;
  import org.opendaylight.unimgr.utils.SipHandler;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.NrpCreateConnectivityServiceAttrs;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.NrpConnectivityServiceAttrsG;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import java.util.*;
-import java.util.function.BiConsumer;
-
  /**
   * @author marek.ryznar@amartus.com
   */
@@ -58,7 +63,7 @@ public class XrDriverBuilder implements ActivationDriverBuilder {
              }
  
              @Override
-            public void initialize(List<EndPoint> endPoints, String serviceId, NrpCreateConnectivityServiceAttrs context) {
+            public void initialize(List<EndPoint> endPoints, String serviceId, NrpConnectivityServiceAttrsG context) {
                  this.endPoints = endPoints;
                  this.serviceId = serviceId;
  
diff --git a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/LoopbackUtilsTest.java b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/LoopbackUtilsTest.java

index c610cc87080f5a485c617a653c9c7f4046546e11..725c7a3de9c071e0d5ad3c4f27c64220cad4dfdb 100644 (file)
--- a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/LoopbackUtilsTest.java
+++ b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/LoopbackUtilsTest.java
@@ -7,7 +7,8 @@
   */
  package org.opendaylight.unimgr.mef.nrp.cisco.xr.common.util;
  
-import com.google.common.util.concurrent.CheckedFuture;
+import static org.junit.Assert.assertEquals;
+
  import org.junit.After;
  import org.junit.Before;
  import org.junit.Test;
@@ -16,7 +17,7 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
  import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.unimgr.mef.nrp.cisco.xr.l2vpn.L2vpnTestUtils;
+import org.opendaylight.unimgr.mef.nrp.cisco.xr.l2vpn.activator.L2vpnTestUtils;
  import org.opendaylight.unimgr.mef.nrp.common.ServicePort;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
@@ -32,7 +33,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import static org.junit.Assert.assertEquals;
+import com.google.common.util.concurrent.CheckedFuture;
  
  /**
   * @author marek.ryznar@amartus.com
diff --git a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnLocalConnectionActivatorTest.java b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnLocalConnectionActivatorTest.java

index a9f5811459ff45bc4aa44ef3946cf8e518ef9c12..79b18353eaa96c4be34a760e7f89d85c4618eddd 100644 (file)
--- a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnLocalConnectionActivatorTest.java
+++ b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnLocalConnectionActivatorTest.java
@@ -7,8 +7,13 @@
   */
  package org.opendaylight.unimgr.mef.nrp.cisco.xr.l2vpn.activator;
  
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
  import org.junit.Before;
  import org.junit.Test;
  import org.junit.runner.RunWith;
@@ -20,7 +25,6 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
  import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
  import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
-import org.opendaylight.unimgr.mef.nrp.cisco.xr.l2vpn.L2vpnTestUtils;
  import org.opendaylight.unimgr.mef.nrp.common.MountPointHelper;
  import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.ifmgr.cfg.rev150730.InterfaceConfigurations;
  import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.ifmgr.cfg.rev150730._interface.configurations.InterfaceConfiguration;
@@ -34,10 +38,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.Assert.*;
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.CheckedFuture;
  
  /**
   * @author marek.ryznar@amartus.com
diff --git a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnP2pConnectionActivatorTest.java b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnP2pConnectionActivatorTest.java

index fc66d5f09ced3291d36d3e4951372bd1b49a1a5e..ecd4e2402515c0548546cfb7c78be15c2d15dfbb 100644 (file)
--- a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnP2pConnectionActivatorTest.java
+++ b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnP2pConnectionActivatorTest.java
@@ -7,8 +7,11 @@
   */
  package org.opendaylight.unimgr.mef.nrp.cisco.xr.l2vpn.activator;
  
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
  import org.junit.Before;
  import org.junit.Test;
  import org.junit.runner.RunWith;
@@ -20,7 +23,6 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
  import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
  import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
-import org.opendaylight.unimgr.mef.nrp.cisco.xr.l2vpn.L2vpnTestUtils;
  import org.opendaylight.unimgr.mef.nrp.common.MountPointHelper;
  import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.ifmgr.cfg.rev150730.InterfaceConfigurations;
  import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.ifmgr.cfg.rev150730._interface.configurations.InterfaceConfiguration;
@@ -36,10 +38,8 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  import org.powermock.core.classloader.annotations.PrepareForTest;
  import org.powermock.modules.junit4.PowerMockRunner;
  
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.Assert.fail;
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.CheckedFuture;
  
  /**
   * @author marek.ryznar@amartus.com
diff --git a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnTestUtils.java b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnTestUtils.java

index 8b4abb25760e443c7dec20a1621a779b1c75a2ea..65ad60ac2354d0c01fab3811c9f8f85e94414aa6 100644 (file)
--- a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnTestUtils.java
+++ b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnTestUtils.java
@@ -5,10 +5,20 @@
   * terms of the Eclipse Public License v1.0 which accompanies this distribution,
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
-package org.opendaylight.unimgr.mef.nrp.cisco.xr.l2vpn;
+package org.opendaylight.unimgr.mef.nrp.cisco.xr.l2vpn.activator;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
  
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
  import org.mockito.Mockito;
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.controller.md.sal.binding.api.MountPointService;
@@ -28,22 +38,17 @@ import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.l2vpn.cf
  import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.l2vpn.cfg.rev151109.l2vpn.database.xconnect.groups.xconnect.group.p2p.xconnects.p2p.xconnect.pseudowires.Pseudowire;
  import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.l2vpn.cfg.rev151109.l2vpn.database.xconnect.groups.xconnect.group.p2p.xconnects.p2p.xconnect.pseudowires.pseudowire.Neighbor;
  import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.l2vpn.cfg.rev151109.l2vpn.database.xconnect.groups.xconnect.group.p2p.xconnects.p2p.xconnect.pseudowires.pseudowire.pseudowire.content.MplsStaticLabels;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.NrpCreateConnectivityServiceEndPointAttrs;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.ConnectivityServiceEndPoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.NrpConnectivityServiceEndPointAttrsG;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.ConnectivityServiceEndPointG;
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TpId;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  import org.powermock.api.mockito.PowerMockito;
  
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.CheckedFuture;
  
  /**
   * Util class responsible for executing suitable assert operations on given objects.
@@ -181,8 +186,8 @@ public class L2vpnTestUtils {
      }
  
      private static EndPoint mockEndPoint(String portName){
-        ConnectivityServiceEndPoint connectivityServiceEndPoint = mock(ConnectivityServiceEndPoint.class);
-        NrpCreateConnectivityServiceEndPointAttrs attrs = mock(NrpCreateConnectivityServiceEndPointAttrs.class);
+        ConnectivityServiceEndPointG connectivityServiceEndPoint = mock(ConnectivityServiceEndPointG.class);
+        NrpConnectivityServiceEndPointAttrsG attrs = mock(NrpConnectivityServiceEndPointAttrsG.class);
          //UNI port mock
          when(connectivityServiceEndPoint.getServiceInterfacePoint())
                  .thenReturn(new UniversalId(portName));
diff --git a/edgeassure-1000/src/main/java/org/opendaylight/unimgr/mef/nrp/edgeassure/EdgeAssureActivator.java b/edgeassure-1000/src/main/java/org/opendaylight/unimgr/mef/nrp/edgeassure/EdgeAssureActivator.java

index b862bb33355b0406c6c100063b7f453da546fa2b..b04fdfa138973091b047e2deb47ce8d017fad71b 100644 (file)
--- a/edgeassure-1000/src/main/java/org/opendaylight/unimgr/mef/nrp/edgeassure/EdgeAssureActivator.java
+++ b/edgeassure-1000/src/main/java/org/opendaylight/unimgr/mef/nrp/edgeassure/EdgeAssureActivator.java
@@ -20,7 +20,6 @@ import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
  import org.opendaylight.unimgr.mef.nrp.common.MountPointHelper;
  import org.opendaylight.unimgr.mef.nrp.common.ResourceActivator;
  import org.opendaylight.unimgr.mef.nrp.common.ResourceNotAvailableException;
-import org.opendaylight.unimgr.mef.nrp.common.ServicePort;
  import org.opendaylight.unimgr.utils.SipHandler;
  import org.opendaylight.yang.gen.v1.http.www.microsemi.com.microsemi.edge.assure.msea.types.rev160229.Identifier45;
  import org.opendaylight.yang.gen.v1.http.www.microsemi.com.microsemi.edge.assure.msea.uni.evc.service.rev160317.MefServices;
@@ -28,8 +27,7 @@ import org.opendaylight.yang.gen.v1.http.www.microsemi.com.microsemi.edge.assure
  import org.opendaylight.yang.gen.v1.http.www.microsemi.com.microsemi.edge.assure.msea.uni.evc.service.rev160317.mef.services.uni.Evc;
  import org.opendaylight.yang.gen.v1.http.www.microsemi.com.microsemi.edge.assure.msea.uni.evc.service.rev160317.mef.services.uni.EvcBuilder;
  import org.opendaylight.yang.gen.v1.http.www.microsemi.com.microsemi.edge.assure.msea.uni.evc.service.rev160317.mef.services.uni.EvcKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.onf.core.network.module.rev160630.g_forwardingconstruct.FcPort;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
diff --git a/edgeassure-1000/src/main/java/org/opendaylight/unimgr/mef/nrp/edgeassure/EdgeAssureDriverBuilder.java b/edgeassure-1000/src/main/java/org/opendaylight/unimgr/mef/nrp/edgeassure/EdgeAssureDriverBuilder.java

index 6a69db342bded060e0c005018ac55b88d56f8fc4..01e378b7110d70aa134d5a3150c0394aa17a1aa6 100644 (file)
--- a/edgeassure-1000/src/main/java/org/opendaylight/unimgr/mef/nrp/edgeassure/EdgeAssureDriverBuilder.java
+++ b/edgeassure-1000/src/main/java/org/opendaylight/unimgr/mef/nrp/edgeassure/EdgeAssureDriverBuilder.java
@@ -8,6 +8,9 @@
  
  package org.opendaylight.unimgr.mef.nrp.edgeassure;
  
+import java.util.List;
+import java.util.Optional;
+
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.controller.md.sal.binding.api.MountPointService;
  import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
@@ -16,13 +19,8 @@ import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverBuilder;
  import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
  import org.opendaylight.unimgr.mef.nrp.common.FixedServiceNaming;
  import org.opendaylight.unimgr.mef.nrp.common.ResourceNotAvailableException;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.NrpCreateConnectivityServiceAttrs;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.onf.core.network.module.rev160630.forwarding.constructs.ForwardingConstruct;
-import org.opendaylight.yang.gen.v1.urn.onf.core.network.module.rev160630.g_forwardingconstruct.FcPort;
-
-import java.util.List;
-import java.util.Optional;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.NrpConnectivityServiceAttrsG;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
  
  /**
   * Fake driver builder;
@@ -55,7 +53,7 @@ public class EdgeAssureDriverBuilder implements ActivationDriverBuilder {
              }
  
              @Override
-            public void initialize(List<EndPoint> endPoints, String serviceId, NrpCreateConnectivityServiceAttrs context) {
+            public void initialize(List<EndPoint> endPoints, String serviceId, NrpConnectivityServiceAttrsG context) {
                  this.endPoints = endPoints;
                  this.serviceId = serviceId;
              }
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriver.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriver.java

index 484009eef3d4cb3255fcdf837b311bc32e789f06..4bc3889c885a7fcedf2c23912db505a7b07550aa 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriver.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriver.java
@@ -7,11 +7,11 @@
   */
  package org.opendaylight.unimgr.mef.nrp.api;
  
+import java.util.List;
+
  import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
  import org.opendaylight.unimgr.mef.nrp.common.ResourceActivatorException;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.NrpCreateConnectivityServiceAttrs;
-
-import java.util.List;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.NrpConnectivityServiceAttrsG;
  
  /**
   * Interface of a driver that maps NRP concepts to the configuration of underlying infrastructure.
@@ -43,7 +43,7 @@ public interface ActivationDriver {
       * @param serviceId connectivity service id
       * @param context context
       */
-    void initialize(List<EndPoint> endPoints, String serviceId, NrpCreateConnectivityServiceAttrs context);
+    void initialize(List<EndPoint> endPoints, String serviceId, NrpConnectivityServiceAttrsG context);
  
      /**
       * Performs the activation action.
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriverBuilder.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriverBuilder.java

index 720372fefcf8aa58fa317fd98992046964b69845..f14ec6c1dc961688d9bd2e61e23b627c486b182a 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriverBuilder.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriverBuilder.java
@@ -14,8 +14,7 @@ import java.util.Optional;
  import java.util.Set;
  import java.util.concurrent.ConcurrentHashMap;
  
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.onf.core.network.module.rev160630.g_forwardingconstruct.FcPort;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
  
  /**
   * Driver builder that can provide stateful driver that are used in NRP forwarding construct transaction.
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriverRepoService.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriverRepoService.java

index 7db1a8d6d9278b1450d889734cce226d84766f2c..4ed6509a356c4e44f53cbec100ae31d831417ffa 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriverRepoService.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriverRepoService.java
@@ -8,10 +8,10 @@
  
  package org.opendaylight.unimgr.mef.nrp.api;
  
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-
  import java.util.Optional;
  
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+
  /**
   * This interface is used to request an ActivationDriver for a given MEF service fragment.
   */
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/EndPoint.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/EndPoint.java

index fea7efabc5845fe247df33f4ee8f2d536919b413..5e37c16128dc0ebe16b2b4d4e39cf3a7698dd19e 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/EndPoint.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/EndPoint.java
@@ -8,21 +8,21 @@
  
  package org.opendaylight.unimgr.mef.nrp.api;
  
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.NrpCreateConnectivityServiceEndPointAttrs;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.ConnectivityServiceEndPoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.NrpConnectivityServiceEndPointAttrsG;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.ConnectivityServiceEndPointG;
  
  /**
- * @see ConnectivityServiceEndPoint
+ * @see ConnectivityServiceEndPointG
   * @author bartosz.michalik@amartus.com
   */
  public class EndPoint {
-    private final ConnectivityServiceEndPoint endpoint;
+    private final ConnectivityServiceEndPointG endpoint;
      /**
       * Optional attributes
       * (likely to change to different implementation)
       */
-    private final NrpCreateConnectivityServiceEndPointAttrs attrs;
+    private final NrpConnectivityServiceEndPointAttrsG attrs;
  
      private UniversalId systemNepUuid;
  
@@ -31,7 +31,7 @@ public class EndPoint {
       * @param endpoint endpoint data
       * @param attrs associated NRP attributes
       */
-    public EndPoint(ConnectivityServiceEndPoint endpoint, NrpCreateConnectivityServiceEndPointAttrs attrs) {
+    public EndPoint(ConnectivityServiceEndPointG endpoint, NrpConnectivityServiceEndPointAttrsG attrs) {
          this.endpoint = endpoint;
          this.attrs = attrs;
      }
@@ -40,7 +40,7 @@ public class EndPoint {
       *
       * @return endpoints
       */
-    public ConnectivityServiceEndPoint getEndpoint() {
+    public ConnectivityServiceEndPointG getEndpoint() {
          return endpoint;
      }
  
@@ -48,7 +48,7 @@ public class EndPoint {
       *
       * @return attributes
       */
-    public NrpCreateConnectivityServiceEndPointAttrs getAttrs() {
+    public NrpConnectivityServiceEndPointAttrsG getAttrs() {
          return attrs;
      }
  
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestDecomposer.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestDecomposer.java

index 402643d426ad77cc9efe632eaf4df34ff7df056d..1faa04dafdde4631fd5f82ed8186535757b84d26 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestDecomposer.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestDecomposer.java
@@ -11,7 +11,7 @@ package org.opendaylight.unimgr.mef.nrp.api;
  import java.util.List;
  
  /**
- * Request decomposer is responsible for decomposition of {@link org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.ConnectivityService}
+ * Request decomposer is responsible for decomposition of {@link org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityService}
   * requests into one or many driver requests.
   * @author bartosz.michalik@amartus.com
   */
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestValidator.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestValidator.java

index b508a59e07698bf6620dd2e27ad27df9cf8f58d7..9cffe5a171040802201033ae38fb5aece741076a 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestValidator.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestValidator.java
@@ -8,12 +8,12 @@
  
  package org.opendaylight.unimgr.mef.nrp.api;
  
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.CreateConnectivityServiceInput;
-
  import java.util.ArrayList;
  import java.util.LinkedList;
  import java.util.List;
  
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.CreateConnectivityServiceInput;
+
  /**
   * @author bartosz.michalik@amartus.com
   */
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/Subrequrest.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/Subrequrest.java

index 2b041ae2b8d497fdd99c31ec5051978786a94f86..7e4dbab992119c7b8dbcb895f2bfcc3dd65ba005 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/Subrequrest.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/Subrequrest.java
@@ -8,10 +8,10 @@
  
  package org.opendaylight.unimgr.mef.nrp.api;
  
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-
  import java.util.List;
  
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+
  /**
   * @author bartosz.michalik@amartus.com
   */
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/NrpDao.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/NrpDao.java

index 94a356a6887ffefe2df1d539d19a31d47950d1f8..8d6c6d1aa885c4765ec17caeee6173e8414f0f0c 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/NrpDao.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/NrpDao.java
@@ -7,39 +7,40 @@
   */
  package org.opendaylight.unimgr.mef.nrp.common;
  
-import com.google.common.base.Optional;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
  import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
  import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
  import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
  import org.opendaylight.unimgr.mef.nrp.api.TapiConstants;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.Context;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePointKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.Connection;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectionKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectivityService;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectivityServiceKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.Context1;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.NodeEdgePoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePointKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.Node;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.NodeBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.NodeKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.Topology;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.TopologyKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.Context;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePointKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.Connection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectionKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityService;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityServiceKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.Context1;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.get.node.edge.point.details.output.NodeEdgePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePointKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.context.g.Topology;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.context.g.TopologyKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.Node;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.NodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.NodeKey;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Stream;
+import com.google.common.base.Optional;
  
  /**
   * @author bartosz.michalik@amartus.com
@@ -203,7 +204,7 @@ public class NrpDao  {
  
      public ConnectivityService getConnectivityService(UniversalId id) {
          try {
-            return rtx.read(LogicalDatastoreType.OPERATIONAL, ctx().augmentation(org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.Context1.class).child(ConnectivityService.class, new ConnectivityServiceKey(id)))
+            return rtx.read(LogicalDatastoreType.OPERATIONAL, ctx().augmentation(org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.Context1.class).child(ConnectivityService.class, new ConnectivityServiceKey(id)))
                      .checkedGet().orNull();
  
          } catch (ReadFailedException e) {
@@ -223,7 +224,7 @@ public class NrpDao  {
  
      public Connection getConnection(UniversalId connectionId) {
          try {
-            return rtx.read(LogicalDatastoreType.OPERATIONAL, ctx().augmentation(org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.Context1.class).child(Connection.class, new ConnectionKey(connectionId)))
+            return rtx.read(LogicalDatastoreType.OPERATIONAL, ctx().augmentation(org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.Context1.class).child(Connection.class, new ConnectionKey(connectionId)))
                      .checkedGet().orNull();
  
          } catch (ReadFailedException e) {
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/ServicePort.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/ServicePort.java

index a1af17d43aa0baee4d78d363fa706c60ab0617e6..7227aee7dfbc8b241f5d0f817f4747a647a9141a 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/ServicePort.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/ServicePort.java
@@ -7,17 +7,17 @@
   */
  package org.opendaylight.unimgr.mef.nrp.common;
  
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
  import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
  import org.opendaylight.unimgr.utils.SipHandler;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.nrp.create.connectivity.service.end.point.attrs.NrpCgEthFrameFlowCpaAspec;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.nrp.connectivity.service.end.point.attrs.g.NrpCgEthFrameFlowSpec;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TpId;
  
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
  /**
   * Class representing port (replacement for FcPort)
   *
@@ -88,9 +88,9 @@ public class ServicePort {
      }
  
      public static boolean hasVlan(EndPoint endPoint){
-        if( (endPoint.getAttrs() != null) && (endPoint.getAttrs().getNrpCgEthFrameFlowCpaAspec()!=null) ){
-            NrpCgEthFrameFlowCpaAspec attr = endPoint.getAttrs().getNrpCgEthFrameFlowCpaAspec();
-            if( (attr.getCeVlanIdList()!=null) && !(attr.getCeVlanIdList().getVlanIdList().isEmpty()) ){
+        if( (endPoint.getAttrs() != null) && (endPoint.getAttrs().getNrpCgEthFrameFlowSpec()!=null) ){
+            NrpCgEthFrameFlowSpec attr = endPoint.getAttrs().getNrpCgEthFrameFlowSpec();
+            if( (attr.getCeVlanIdListOrUntag()!=null) && !(attr.getCeVlanIdListOrUntag().getVlanIdList().isEmpty()) ){
                  return true;
              } else {
                  return false;
@@ -101,7 +101,7 @@ public class ServicePort {
      }
  
      private static int getVlan(EndPoint endPoint){
-        return endPoint.getAttrs().getNrpCgEthFrameFlowCpaAspec().getCeVlanIdList().getVlanIdList().get(0).getVlanId().getValue().intValue();
+        return endPoint.getAttrs().getNrpCgEthFrameFlowSpec().getCeVlanIdListOrUntag().getVlanIdList().get(0).getVlanId().getValue().intValue();
      }
  
      public String getInterfaceName(){
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandler.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandler.java

index db91de0c893e943e0264e11188bf074e22147037..2f45af8a92bd4bd12d73c9caff80099eca5c3eb9 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandler.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandler.java
@@ -7,31 +7,36 @@
   */
  package org.opendaylight.unimgr.mef.nrp.impl;
  
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import org.opendaylight.controller.md.sal.binding.api.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
+import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.unimgr.mef.nrp.api.TapiConstants;
  import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.Context;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.Context1;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.Topology;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.TopologyKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.Context;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.Context1;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.context.g.Topology;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.context.g.TopologyKey;
  import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.DataObject;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
  
  /**
   * TopologyDataHandler listens to presto system topology and propagate significant changes to presto system topology.
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImpl.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImpl.java

index f071b5ef896ff35222ff79cbdcf3229b01c49e4b..d54e98c5eb2d41a3bbe4626265ef78236260b190 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImpl.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImpl.java
@@ -21,8 +21,7 @@ import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverAmbiguousException;
  import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverBuilder;
  import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverNotFoundException;
  import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverRepoService;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.onf.core.network.module.rev160630.g_forwardingconstruct.FcPort;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/DefaultValidator.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/DefaultValidator.java

index 72aa4f295088e091c895b69f816b677f9a2e21b1..1f4003834e77c75eae8c36738f661b021282c5a9 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/DefaultValidator.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/DefaultValidator.java
@@ -9,7 +9,7 @@
  package org.opendaylight.unimgr.mef.nrp.impl;
  
  import org.opendaylight.unimgr.mef.nrp.api.RequestValidator;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.CreateConnectivityServiceInput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.CreateConnectivityServiceInput;
  
  /**
   * @author bartosz.michalik@amartus.com
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/NrpInitializer.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/NrpInitializer.java

index 63f4e93c582d3c2eb08c54d00a21ac268705c3fb..dbe6a15b9c8aba8553b1ecaedcd5c9e7d2259752 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/NrpInitializer.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/NrpInitializer.java
@@ -8,31 +8,35 @@
  
  package org.opendaylight.unimgr.mef.nrp.impl;
  
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
+import static org.opendaylight.unimgr.mef.nrp.api.TapiConstants.PRESTO_CTX;
+import static org.opendaylight.unimgr.mef.nrp.api.TapiConstants.PRESTO_EXT_TOPO;
+import static org.opendaylight.unimgr.mef.nrp.api.TapiConstants.PRESTO_SYSTEM_TOPO;
+
+import java.util.Arrays;
+import java.util.Collections;
+
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
  import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.Context;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.ContextBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.LayerProtocolName;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.Node;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.NodeBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.NodeKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.TopologyBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.TopologyKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.Context;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.ContextBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.LayerProtocolName;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.context.g.Topology;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.context.g.TopologyBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.context.g.TopologyKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.Node;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.NodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.NodeKey;
  import org.opendaylight.yangtools.yang.binding.DataObject;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import java.util.Arrays;
-import java.util.Collections;
-
-import static org.opendaylight.unimgr.mef.nrp.api.TapiConstants.*;
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.CheckedFuture;
  
  /**
   * @author bartosz.michalik@amartus.com
@@ -57,8 +61,8 @@ public class NrpInitializer {
              log.info("initialize Presto NRP context");
              Context ctx = new ContextBuilder()
                      .setUuid(new UniversalId(PRESTO_CTX))
-                    .addAugmentation(org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.Context1.class, context())
-                    .addAugmentation(org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.Context1.class, connCtx())
+                    .addAugmentation(org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.Context1.class, context())
+                    .addAugmentation(org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.Context1.class, connCtx())
                      .build();
              tx.put(LogicalDatastoreType.OPERATIONAL, ctxId, ctx);
              try {
@@ -71,18 +75,18 @@ public class NrpInitializer {
          }
      }
  
-    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.Context1 context() {
-        return new org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.Context1Builder()
+    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.Context1 context() {
+        return new org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.Context1Builder()
                  .setTopology(Arrays.asList(systemTopo(), extTopo()))
                  .build();
      }
  
-    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.Context1 connCtx() {
-        return new org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.Context1Builder()
+    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.Context1 connCtx() {
+        return new org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.Context1Builder()
                  .build();
      }
  
-    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.Topology extTopo() {
+    private Topology extTopo() {
          UniversalId topoId = new UniversalId(PRESTO_EXT_TOPO);
          log.debug("Adding {}", PRESTO_EXT_TOPO);
          return new TopologyBuilder()
@@ -104,7 +108,7 @@ public class NrpInitializer {
                  .build();
      }
  
-    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.Topology systemTopo() {
+    private Topology systemTopo() {
          UniversalId topoId = new UniversalId(PRESTO_SYSTEM_TOPO);
          log.debug("Adding {}", PRESTO_SYSTEM_TOPO);
          return new TopologyBuilder()
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/CreateConnectivityAction.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/CreateConnectivityAction.java

index fdaf0c2e2c00f350f80292321a4d583002881933..770655c0fe9bc47bb5eb8c1907369b008a9f6363 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/CreateConnectivityAction.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/CreateConnectivityAction.java
@@ -8,44 +8,57 @@
  
  package org.opendaylight.unimgr.mef.nrp.impl.connectivityservice;
  
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
  import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.unimgr.mef.nrp.api.*;
+import org.opendaylight.unimgr.mef.nrp.api.ActivationDriver;
+import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
+import org.opendaylight.unimgr.mef.nrp.api.RequestValidator;
+import org.opendaylight.unimgr.mef.nrp.api.Subrequrest;
+import org.opendaylight.unimgr.mef.nrp.api.TapiConstants;
  import org.opendaylight.unimgr.mef.nrp.impl.ActivationTransaction;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.EndPoint2;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.*;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.ConnectivityService;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.CreateConnectivityServiceInput;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.CreateConnectivityServiceOutput;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.CreateConnectivityServiceOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connection.ConnectionEndPoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connection.ConnectionEndPointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connection.RouteBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connection.end.point.LayerProtocolBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.Connection;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectionBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectionKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectivityServiceKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.service.ConnConstraint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.service.ConnConstraintBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.service.EndPointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.create.connectivity.service.output.ServiceBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.EndPoint2;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.ForwardingDirection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.GlobalClassG;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.LayerProtocolName;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.PortDirection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.PortRole;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.TerminationDirection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.CreateConnectivityServiceInput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.CreateConnectivityServiceOutput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.CreateConnectivityServiceOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connection.end.point.g.LayerProtocolBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connection.g.ConnectionEndPoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connection.g.ConnectionEndPointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connection.g.RouteBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.Connection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectionBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectionKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityService;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityServiceBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityServiceKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.service.g.ConnConstraint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.service.g.ConnConstraintBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.service.g.EndPointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.create.connectivity.service.output.ServiceBuilder;
  import org.opendaylight.yangtools.yang.common.RpcError;
  import org.opendaylight.yangtools.yang.common.RpcResult;
  import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import javax.annotation.Nullable;
-import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.Callable;
-import java.util.stream.Collectors;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
  
  /**
   * @author bartosz.michalik@amartus.com
@@ -161,14 +174,14 @@ class CreateConnectivityAction implements Callable<RpcResult<CreateConnectivityS
                  .setConnectionEndPoint(toConnectionPoints(endpoints, uniqueStamp))
                  .setRoute(Collections.singletonList(new RouteBuilder()
                          .setLocalId("route")
-                        .setLowerConnection(systemConnections.stream().map(GlobalClass::getUuid).collect(Collectors.toList()))
+                        .setLowerConnection(systemConnections.stream().map(GlobalClassG::getUuid).collect(Collectors.toList()))
                          .build())
                  ).build();
  
  
          ConnConstraint connConstraint = input.getConnConstraint() == null ? null : new ConnConstraintBuilder(input.getConnConstraint()).build();
  
-        org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectivityService cs = new org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectivityServiceBuilder()
+        org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityService cs = new org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityServiceBuilder()
                  .setUuid(new UniversalId(toCsId(uniqueStamp)))
  //                    .setState()
                  .setConnConstraint(connConstraint)
@@ -181,7 +194,7 @@ class CreateConnectivityAction implements Callable<RpcResult<CreateConnectivityS
              tx.put(LogicalDatastoreType.OPERATIONAL, TapiConnectivityServiceImpl.connectivityCtx.child(Connection.class, new ConnectionKey(c.getUuid())), c);
          });
          tx.put(LogicalDatastoreType.OPERATIONAL,
-                TapiConnectivityServiceImpl.connectivityCtx.child(org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectivityService.class,
+                TapiConnectivityServiceImpl.connectivityCtx.child(org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityService.class,
                          new ConnectivityServiceKey(cs.getUuid())), cs);
  
          tx.put(LogicalDatastoreType.OPERATIONAL, TapiConnectivityServiceImpl.connectivityCtx.child(Connection.class, new ConnectionKey(globalConnection.getUuid())), globalConnection);
@@ -200,10 +213,10 @@ class CreateConnectivityAction implements Callable<RpcResult<CreateConnectivityS
          });
  
  
-        return new ServiceBuilder(cs).build();
+        return new ConnectivityServiceBuilder(cs).build();
      }
  
-    private List<org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.service.EndPoint> toConnectionServiceEndpoints(List<EndPoint> endpoints, String uniqueStamp) {
+    private List<org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.service.g.EndPoint> toConnectionServiceEndpoints(List<EndPoint> endpoints, String uniqueStamp) {
          return endpoints.stream().map(ep -> new EndPointBuilder()
                  .setLocalId("sep:" + ep.getSystemNepUuid() + ":" + uniqueStamp)
                  .setServiceInterfacePoint(ep.getEndpoint().getServiceInterfacePoint())
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/DeleteConnectivityAction.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/DeleteConnectivityAction.java

index 163baf51fb6a1c0679c4829149709c5dff660e2a..e2d21c0149872dd885b6d91ee3433b673e7a5802 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/DeleteConnectivityAction.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/DeleteConnectivityAction.java
@@ -8,6 +8,16 @@
  
  package org.opendaylight.unimgr.mef.nrp.impl.connectivityservice;
  
+import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+
  import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
@@ -15,29 +25,24 @@ import org.opendaylight.unimgr.mef.nrp.api.ActivationDriver;
  import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
  import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
  import org.opendaylight.unimgr.mef.nrp.impl.ActivationTransaction;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.Context1;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.DeleteConnectivityServiceInput;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.DeleteConnectivityServiceOutput;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.DeleteConnectivityServiceOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connection.Route;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.Connection;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectionKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectivityService;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectivityServiceKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.delete.connectivity.service.output.Service;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.delete.connectivity.service.output.ServiceBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.Context1;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.DeleteConnectivityServiceInput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.DeleteConnectivityServiceOutput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.DeleteConnectivityServiceOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connection.g.Route;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.Connection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectionKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityService;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityServiceKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.delete.connectivity.service.output.Service;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.delete.connectivity.service.output.ServiceBuilder;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  import org.opendaylight.yangtools.yang.common.RpcError;
  import org.opendaylight.yangtools.yang.common.RpcResult;
  import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.slf4j.LoggerFactory;
  import org.slf4j.Logger;
-
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.concurrent.Callable;
-import java.util.stream.Collectors;
+import org.slf4j.LoggerFactory;
  
  /**
   * @author bartosz.michalik@amartus.com
@@ -157,13 +162,13 @@ public class DeleteConnectivityAction implements Callable<RpcResult<DeleteConnec
                  .flatMap(c -> {
                      UniversalId nodeId = c.getNode();
                      return c.getConnectionEndPoint().stream().map(cep -> {
-                        Optional<org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.service.EndPoint> optEndPoint = Optional.empty();
+                        Optional<org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.service.g.EndPoint> optEndPoint = Optional.empty();
                          if(cs.getEndPoint() != null){
                              optEndPoint = cs.getEndPoint().stream()
                                      .filter(endPoint1 -> endPoint1.getServiceInterfacePoint().getValue().contains(cep.getServerNodeEdgePoint().getValue()))
                                      .findFirst();
                          }
-                        org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.service.EndPoint endPoint =
+                        org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.service.g.EndPoint endPoint =
                                  optEndPoint.isPresent() ? optEndPoint.get() : null;
                          EndPoint ep = new EndPoint(endPoint, null).setSystemNepUuid(cep.getServerNodeEdgePoint());
                          return new Pair(nodeId, ep);
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImpl.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImpl.java

index 9664d5daef18fe5b78d3593d51b72c7d5bbc77fd..138efceb83f3e9218e1bc6f984133c3aeb72b4c5 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImpl.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImpl.java
@@ -8,19 +8,37 @@
  
  package org.opendaylight.unimgr.mef.nrp.impl.connectivityservice;
  
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.unimgr.mef.nrp.api.*;
+import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverRepoService;
+import org.opendaylight.unimgr.mef.nrp.api.RequestDecomposer;
+import org.opendaylight.unimgr.mef.nrp.api.RequestValidator;
  import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
  import org.opendaylight.unimgr.mef.nrp.impl.ConnectivityServiceIdResourcePool;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.*;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.Context1;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.CreateConnectivityServiceInput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.CreateConnectivityServiceOutput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.DeleteConnectivityServiceInput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.DeleteConnectivityServiceOutput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.GetConnectionDetailsInput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.GetConnectionDetailsOutput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.GetConnectivityServiceDetailsInput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.GetConnectivityServiceDetailsOutput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.GetConnectivityServiceListOutput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.TapiConnectivityService;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.UpdateConnectivityServiceInput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.UpdateConnectivityServiceOutput;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  import org.opendaylight.yangtools.yang.common.RpcResult;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import java.util.Objects;
-import java.util.concurrent.*;
-
  /**
   * @author bartosz.michalik@amartus.com
   */
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/decomposer/DecompositionAction.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/decomposer/DecompositionAction.java

index 6394c70c590e5d0fde80a85e52643ddcaba52c3c..01abfba896ae4d3c888af80b7a3af7c04f665932 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/decomposer/DecompositionAction.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/decomposer/DecompositionAction.java
@@ -8,6 +8,13 @@
  
  package org.opendaylight.unimgr.mef.nrp.impl.decomposer;
  
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
  import org.jgrapht.Graph;
  import org.jgrapht.GraphPath;
  import org.jgrapht.alg.shortestpath.DijkstraShortestPath;
@@ -20,17 +27,13 @@ import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
  import org.opendaylight.unimgr.mef.nrp.api.Subrequrest;
  import org.opendaylight.unimgr.mef.nrp.api.TapiConstants;
  import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.OperationalState;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.Node;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.Topology;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.OperationalState;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.context.g.Topology;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.Node;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
  /**
   * @author bartosz.michalik@amartus.com
   */
diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImpl.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImpl.java

index 86e45741204400f3c0d89ef9ac84e8137e6a320f..454f565b92da3faa3ad96525345b573787e132a5 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImpl.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImpl.java
@@ -8,42 +8,47 @@
  
  package org.opendaylight.unimgr.mef.nrp.impl.ext;
  
-import com.google.common.base.Optional;
+import java.text.MessageFormat;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.unimgr.mef.nrp.api.TapiConstants;
  import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.LayerProtocol1;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.LayerProtocol1Builder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.nrp.layer.protocol.attrs.NrpCgEthEnniSpecBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.nrp.layer.protocol.attrs.NrpCgEthInniSpecBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.nrp.layer.protocol.attrs.NrpCgEthUniSpecBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.LayerProtocolName;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.service._interface.point.LayerProtocol;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.service._interface.point.LayerProtocolBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePointKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.Node;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.NodeKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.LayerProtocol1;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.LayerProtocol1Builder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.nrp.layer.protocol.attrs.g.NrpCgEthEnniSpecBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.nrp.layer.protocol.attrs.g.NrpCgEthInniSpecBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.nrp.layer.protocol.attrs.g.NrpCgEthUniSpecBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.LayerProtocolName;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.service._interface.point.g.LayerProtocol;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.service._interface.point.g.LayerProtocolBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePointKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.Node;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.NodeKey;
  import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.AddSipInput;
  import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.UnimgrExtService;
  import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.SipType;
-import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.UniSpec;
  import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.EnniSpec;
  import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.InniSpec;
+import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.UniSpec;
  import org.opendaylight.yangtools.yang.common.RpcError;
  import org.opendaylight.yangtools.yang.common.RpcResult;
  import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
  
-import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.*;
+import com.google.common.base.Optional;
  
  /**
   * @author bartosz.michalik@amartus.com
diff --git a/impl/src/main/java/org/opendaylight/unimgr/utils/SipHandler.java b/impl/src/main/java/org/opendaylight/unimgr/utils/SipHandler.java

index b87e0f59e9644a28e88967ecefed7710c3c7f801..614c9643fd0473214f26f85b7422d7c936d41855 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/utils/SipHandler.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/utils/SipHandler.java
@@ -7,7 +7,7 @@
   */
  package org.opendaylight.unimgr.utils;
  
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
  
  /**
   * @author marek.ryznar@amartus.com
diff --git a/impl/src/main/resources/org/opendaylight/blueprint/unimgr.xml b/impl/src/main/resources/org/opendaylight/blueprint/unimgr.xml

index de6767d1024e8c5c49f673349f50bea541adc8c2..0c08bfbfffd76b26d1086b9d0f0b7a41f7a9b616 100644 (file)
--- a/impl/src/main/resources/org/opendaylight/blueprint/unimgr.xml
+++ b/impl/src/main/resources/org/opendaylight/blueprint/unimgr.xml
@@ -46,7 +46,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
          <argument ref="dataBroker" />
      </bean>
  
-    <odl:rpc-implementation ref="tapiConnectivityService" interface="org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.TapiConnectivityService" />
+    <odl:rpc-implementation ref="tapiConnectivityService" interface="org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.TapiConnectivityService" />
  
      <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
      <reference-list id="driverBuilders" interface="org.opendaylight.unimgr.mef.nrp.api.ActivationDriverBuilder" availability="optional">
diff --git a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandlerTest.java b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandlerTest.java

index 1e3fa119883d4ff832488799e1c4eb1e162b8342..156079454cdcc05ee06b372d5202d45887e0655b 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandlerTest.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandlerTest.java
@@ -7,39 +7,41 @@
   */
  package org.opendaylight.unimgr.mef.nrp.impl;
  
-import com.google.common.base.Optional;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.function.BiConsumer;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
  import org.junit.Before;
  import org.junit.Test;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
  import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
  import org.opendaylight.unimgr.mef.nrp.api.TapiConstants;
  import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.Context;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.TerminationDirection;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.Context1;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePointKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.Node;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.NodeKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.Topology;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.TopologyKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.Context;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.TerminationDirection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.Context1;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePointKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.context.g.Topology;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.context.g.TopologyKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.Node;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.NodeKey;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.function.BiConsumer;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static org.junit.Assert.*;
+import com.google.common.base.Optional;
  
  /**
   * @author marek.ryznar@amartus.com
diff --git a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractTestWithTopo.java b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractTestWithTopo.java

index c8d37a2ff1ab4bfecd4b89bf7ab26ab4ce620fa2..a675be6024d12d581efe43a553c45a6f9b4c7e93 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractTestWithTopo.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractTestWithTopo.java
@@ -8,6 +8,13 @@
  
  package org.opendaylight.unimgr.mef.nrp.impl;
  
+import static org.opendaylight.unimgr.mef.nrp.api.TapiConstants.PRESTO_SYSTEM_TOPO;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
  import org.junit.Before;
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
@@ -15,26 +22,19 @@ import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
  import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.ForwardingDirection;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.LayerProtocolName;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.OperationalState;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.ConnectivityServiceEndPoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.create.connectivity.service.input.EndPointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.link.StateBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.Link;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.LinkBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.LinkKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.Node;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.opendaylight.unimgr.mef.nrp.api.TapiConstants.PRESTO_SYSTEM_TOPO;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.ForwardingDirection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.LayerProtocolName;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.OperationalState;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.ConnectivityServiceEndPointG;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.create.connectivity.service.input.EndPointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.link.g.StateBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.Link;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.LinkBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.LinkKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.Node;
  
  /**
   * @author bartosz.michalik@amartus.com
@@ -51,7 +51,7 @@ public abstract class AbstractTestWithTopo extends AbstractDataBrokerTest {
      }
  
      protected EndPoint ep(String nepId) {
-        ConnectivityServiceEndPoint ep = new EndPointBuilder()
+        ConnectivityServiceEndPointG ep = new EndPointBuilder()
                  .setLocalId("ep_" + nepId)
                  .setServiceInterfacePoint(new UniversalId("sip:" + nepId))
                  .build();
diff --git a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImplTest.java b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImplTest.java

index 61e95f4f5899da487c5b5cf6e4ea5846cd3c3a32..02e678c6ea3e624f858426c494c2dc2057495652 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImplTest.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImplTest.java
@@ -7,20 +7,20 @@
   */
  package org.opendaylight.unimgr.mef.nrp.impl;
  
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.opendaylight.unimgr.utils.ActivationDriverMocks.prepareDriver;
+
+import java.util.Collections;
+import java.util.Optional;
+
  import org.junit.Test;
  import org.opendaylight.unimgr.mef.nrp.api.ActivationDriver;
  import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverBuilder;
  import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverNotFoundException;
  import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverRepoService;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-
-import java.util.Collections;
-import java.util.Optional;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.opendaylight.unimgr.utils.ActivationDriverMocks.prepareDriver;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
  
  /**
   * @author bartosz.michalik@amartus.com
diff --git a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/BasicDecomposerTest.java b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/BasicDecomposerTest.java

index 803876a23fc8e0bef28f576a69fdd83c4e2c1e21..0b8d5ddf0963216836217384b626c4795a764f48 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/BasicDecomposerTest.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/BasicDecomposerTest.java
@@ -8,19 +8,21 @@
  
  package org.opendaylight.unimgr.mef.nrp.impl;
  
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.util.Arrays;
+import java.util.List;
+
  import org.junit.Before;
  import org.junit.Test;
  import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
  import org.opendaylight.unimgr.mef.nrp.api.Subrequrest;
  import org.opendaylight.unimgr.mef.nrp.impl.decomposer.BasicDecomposer;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.OperationalState;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.OperationalState;
  import org.opendaylight.yangtools.yang.common.OperationFailedException;
  
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.Assert.*;
-
  /**
   * @author bartosz.michalik@amartus.com
   */
diff --git a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImplTest.java b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImplTest.java

index a1358dea9d674149c231d75a9d00a1a3aefe2639..acd3643396bc5085da0b319bcc08c92de5bf6f52 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImplTest.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImplTest.java
@@ -8,38 +8,50 @@
  
  package org.opendaylight.unimgr.mef.nrp.impl.connectivityservice;
  
-import com.google.common.util.concurrent.CheckedFuture;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
  import org.junit.Before;
  import org.junit.Test;
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.unimgr.mef.nrp.api.*;
+import org.opendaylight.unimgr.mef.nrp.api.ActivationDriver;
+import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverRepoService;
+import org.opendaylight.unimgr.mef.nrp.api.Constraints;
+import org.opendaylight.unimgr.mef.nrp.api.RequestDecomposer;
+import org.opendaylight.unimgr.mef.nrp.api.RequestValidator;
+import org.opendaylight.unimgr.mef.nrp.api.Subrequrest;
  import org.opendaylight.unimgr.mef.nrp.common.ResourceActivatorException;
  import org.opendaylight.unimgr.mef.nrp.impl.ConnectivityServiceIdResourcePool;
  import org.opendaylight.unimgr.utils.ActivationDriverMocks;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.PortRole;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.CreateConnectivityServiceInput;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.CreateConnectivityServiceInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.CreateConnectivityServiceOutput;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.create.connectivity.service.input.EndPoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.create.connectivity.service.input.EndPointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.PortRole;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.CreateConnectivityServiceInput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.CreateConnectivityServiceInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.CreateConnectivityServiceOutput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.create.connectivity.service.input.EndPoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.create.connectivity.service.input.EndPointBuilder;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  import org.opendaylight.yangtools.yang.common.RpcResult;
  
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
+import com.google.common.util.concurrent.CheckedFuture;
  
  /**
   * @author bartosz.michalik@amartus.com
@@ -193,7 +205,7 @@ public class TapiConnectivityServiceImplTest {
                  .build();
      }
  
-    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.create.connectivity.service.input.EndPoint ep(String id) {
+    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.create.connectivity.service.input.EndPoint ep(String id) {
          return new EndPointBuilder()
                  .setLocalId(id)
                  .setRole(PortRole.Symmetric)
diff --git a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceInplIntTest.java b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceInplIntTest.java

index d84a251ec7783e965ddeba006b63f3b46014d864..d08efdcf643ef91ef9598a138df89f8769a02202 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceInplIntTest.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceInplIntTest.java
@@ -8,6 +8,21 @@
  
  package org.opendaylight.unimgr.mef.nrp.impl.connectivityservice;
  
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+
  import org.junit.Before;
  import org.junit.Test;
  import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
@@ -25,30 +40,30 @@ import org.opendaylight.unimgr.mef.nrp.impl.AbstractTestWithTopo;
  import org.opendaylight.unimgr.mef.nrp.impl.ConnectivityServiceIdResourcePool;
  import org.opendaylight.unimgr.mef.nrp.impl.decomposer.BasicDecomposer;
  import org.opendaylight.unimgr.utils.ActivationDriverMocks;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.PortRole;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.TerminationDirection;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.*;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connection.*;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connection.ConnectionEndPoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.*;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.Connection;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectivityService;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.create.connectivity.service.input.EndPoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.create.connectivity.service.input.EndPointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.PortRole;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.TerminationDirection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.Context1;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.CreateConnectivityServiceInput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.CreateConnectivityServiceInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.CreateConnectivityServiceOutput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.DeleteConnectivityServiceInput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.DeleteConnectivityServiceInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.DeleteConnectivityServiceOutput;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connection.g.ConnectionEndPoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connection.g.ConnectionEndPointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connection.g.RouteBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.Connection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectionBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectionKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityService;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityServiceBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityServiceKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.create.connectivity.service.input.EndPoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.create.connectivity.service.input.EndPointBuilder;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  import org.opendaylight.yangtools.yang.common.RpcResult;
  
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
-
  /**
   * @author bartosz.michalik@amartus.com
   */
@@ -175,14 +190,14 @@ public class TapiConnectivityServiceInplIntTest extends AbstractTestWithTopo {
                  .build()).collect(Collectors.toList());
      }
  
-    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.ConnectivityService cs(String csId, UniversalId connectionId) {
+    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.ConnectivityService cs(String csId, UniversalId connectionId) {
          return new ConnectivityServiceBuilder()
                  .setUuid(new UniversalId(csId))
                  .setConnection(Arrays.asList(connectionId))
                  .build();
      }
  
-    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.Connection c(String nodeUuid, List<UniversalId> route, String... neps) {
+    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.Connection c(String nodeUuid, List<UniversalId> route, String... neps) {
          ConnectionBuilder builder = new ConnectionBuilder()
                  .setUuid(new UniversalId("c:" + nodeUuid))
                  .setNode(new UniversalId(nodeUuid))
@@ -198,7 +213,7 @@ public class TapiConnectivityServiceInplIntTest extends AbstractTestWithTopo {
          return builder.build();
      }
  
-    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.connectivity.context.Connection c(String nodeUuid, String... neps) {
+    private org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.connectivity.context.g.Connection c(String nodeUuid, String... neps) {
          return c(nodeUuid, Collections.emptyList(), neps);
      }
  
diff --git a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImplTest.java b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImplTest.java

index 7e578194c6bde3ef0475fdcdf545d77447e9cb4e..4012b2a244f84abbfa08f280b47dcbe134dccdaf 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImplTest.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImplTest.java
@@ -8,32 +8,31 @@
  
  package org.opendaylight.unimgr.mef.nrp.impl.ext;
  
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.function.Consumer;
+
  import org.junit.Before;
  import org.junit.Test;
  import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
  import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
  import org.opendaylight.unimgr.mef.nrp.impl.AbstractTestWithTopo;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrm_connectivity.rev170227.NaturalNumber;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.LayerProtocol1;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.service._interface.point.LayerProtocol;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.mef_types.rev170531.NaturalNumber;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.LayerProtocol1;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.service._interface.point.g.LayerProtocol;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePoint;
  import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.AddSipInput;
  import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.AddSipInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.UniSpecBuilder;
  import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.EnniSpecBuilder;
  import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.InniSpecBuilder;
+import org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.UniSpecBuilder;
  import org.opendaylight.yangtools.yang.common.RpcResult;
  
-import java.math.BigInteger;
-import java.util.function.Consumer;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
  /**
   * @author bartosz.michalik@amartus.com
   */
@@ -130,7 +129,7 @@ public class UnimgrExtServiceImplTest extends AbstractTestWithTopo {
                      new EnniSpecBuilder()
                          .setEnniSpec(
                                  new org.opendaylight.yang.gen.v1.urn.odl.unimgr.yang.unimgr.ext.rev700101.add.sip.input.sip.type.enni.spec.EnniSpecBuilder()
-                                        .setMaxFrameSize(new NaturalNumber(new BigInteger("1000")))
+                                        .setMaxFrameSize(new NaturalNumber(new Long(1000)))
                                          .build())
                      .build());
              break;
diff --git a/impl/src/test/java/org/opendaylight/unimgr/utils/ActivationDriverMocks.java b/impl/src/test/java/org/opendaylight/unimgr/utils/ActivationDriverMocks.java

index 8dd775f5b29a0f56da97e872bd59649400fa488d..cac93c0efebd9da1a9bc89d9c3881437edb4410d 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/utils/ActivationDriverMocks.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/utils/ActivationDriverMocks.java
@@ -7,11 +7,10 @@
   */
  package org.opendaylight.unimgr.utils;
  
-import org.opendaylight.unimgr.mef.nrp.api.ActivationDriver;
-import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverBuilder;
-import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverRepoService;
-import org.opendaylight.unimgr.mef.nrp.impl.ActivationDriverRepoServiceImpl;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
  
  import java.util.HashMap;
  import java.util.List;
@@ -19,10 +18,11 @@ import java.util.Optional;
  import java.util.function.Supplier;
  import java.util.stream.Collectors;
  
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.opendaylight.unimgr.mef.nrp.api.ActivationDriver;
+import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverBuilder;
+import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverRepoService;
+import org.opendaylight.unimgr.mef.nrp.impl.ActivationDriverRepoServiceImpl;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
  
  /**
   * @author bartosz.michalik@amartus.com
diff --git a/it/pom.xml b/it/pom.xml

index 0332a2fea6b2d016db55d78cb3934b926f6591a2..296bc92c21f8139ee87b94d5589274658da8e39b 100644 (file)
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -33,6 +33,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
    </properties>
  
    <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>features4-unimgr</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>unimgr-karaf4</artifactId>
diff --git a/nrp-api/src/main/yang/mef-common.yang b/nrp-api/src/main/yang/mef-common.yang

new file mode 100644 (file)

index 0000000..da252ab
--- /dev/null
+++ b/nrp-api/src/main/yang/mef-common.yang
@@ -0,0 +1,346 @@
+module mef-common {
+    namespace "urn:mef:yang:MEF_Common";
+    prefix mef-common;
+    import mef-common-types {
+        prefix mef-common-types;
+    }
+    organization "Metro Ethernet Forum (MEF)";
+    contact "MEF";
+    description "none";
+    revision 2017-05-31 {
+        description "MEF NRP 1.0.alpha";
+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020 and RFC 6087";
+    }
+
+    typedef real {
+      type decimal64 {
+        fraction-digits 2;
+      }
+    }
+
+    /***********************
+    * package diagrams
+    **********************/ 
+
+    /***********************
+    * package object-classes
+    **********************/ 
+        /***********************
+        * package bwp
+        **********************/ 
+            grouping bwp-flow-g {
+                leaf rank {
+                    type mef-common-types:positive-integer;
+                    description "This attribute denotes the rank of the bandwidth profile flow in the envelope.";
+                }
+                leaf cir {
+                    type mef-common-types:natural-number;
+                    description "This attribute denotes the Committed Information Rate that limits the average rate of frames that will be declared Green. In bits per second.";
+                }
+                leaf cir-max {
+                    type mef-common-types:natural-number;
+                    description "This attribute denotes the maximum Committed Information Rate that limits the rate of tokens added to the committed token bucket. In bits per second.";
+                }
+                leaf cbs {
+                    type mef-common-types:natural-number;
+                    description "This attribute denotes the Committed Burst Size that limits the maximum number of bytes available for a burst of frames that will be declared Green, in bytes,";
+                }
+                leaf eir {
+                    type mef-common-types:natural-number;
+                    description "This attribute denotes the Excess Information Rate that limits the average rate of frames that will be declared Yellow, in bits per second.";
+                }
+                leaf eir-max {
+                    type mef-common-types:natural-number;
+                    description "This attribute denotes the Maximum Excess Information Rate that Limits the rate of tokens added to the excess token bucket, in bits per second.";
+                }
+                leaf ebs {
+                    type mef-common-types:natural-number;
+                    description "This attribute denotes the Excessive Burst Size that limits the maximum number of bytes available for a burst of frames that will be declared Yellow, in bytes.";
+                }
+                leaf coupling-flag {
+                    type boolean;
+                    description "This attribute denotes the Coupling Flag that Determines if overflow Green tokens can be used as Yellow tokens. FALSE for 0 (overflow green tokens are discarded) and TRUE for 1 (overflow green tokens can be used as yellow tokens)";
+                }
+                leaf color-mode {
+                    type mef-common-types:color-mode;
+                    description "This attribute denotes the Color Mode that Indicates whether the Color Identifier of the frame is considered by the Bandwidth Profile Algorithm.";
+                }
+                leaf token-request-offset {
+                    type mef-common-types:natural-number;
+                    description "This attribute adjusts the number of tokens requested for each external interface frame.";
+                }
+                description "The BwpFlow object class represents the Bandwidth Profile Flow which includes the bandwidth profile parameters such as CIR, CIR Max, EIR, EIR Max, CBS, EBS, Coupling Flag, Color Mode, etc.  The BwpFlow object class is associated with OperatorUni, ServiceProviderUni, VUNI, CosIdentifier, EecIdentifier, and Envelope, etc. ";
+            }
+            grouping envelope-g {
+                leaf envelope-id {
+                    type mef-common-types:identifier45;
+                    description "This attribute is a string that identifies the Envelope.";
+                }
+                leaf coupling-flag-for-index-zero {
+                    type boolean;
+                    description "This attribute denotes the coupling flag for index zero. FALSE for NO and TRUE for YES (overflow Green tokens can be used as Yellow tokens)";
+                }
+                description "The Envelope object class represents the UNI/ENNI service attribute Envelope, which is a bandwidth profile parameter that consists of an envelope ID and an envelope coupling flag (0) that controls conversion of unused green tokens into yellow tokens in the bandwidth profile algorithm. The Envelope object class is associated with UNI (via OperatorUni or ServiceProviderUni), ENNI (via EnniService), and BwpFlow(s), etc. ";
+            }
+
+        /***********************
+        * package color-identifier
+        **********************/ 
+            grouping color-identifier-g {
+                leaf color-field-type {
+                    type mef-common-types:color-field-type;
+                    description "This attribute determines which conditional package (among EVC/OVC End Point, PCP, DEI or DSCP) to be used as the Color Identifier.";
+                }
+                container sep-color-pac {
+                    uses sep-color-id-pac-g;
+                    description "This attribute represents the relationship between the ColorIdentifier and the SepColorIdPac (representing the choice that maps EVC End Point or OVC End Point to Color).";
+                }
+                container dei-color-pac {
+                    uses dei-color-id-pac-g;
+                    description "This attribute represents the relationship between the ColorIdentifier and the DeiColorIdPac (representing the choice that maps Vlan tag DEI to Color).";
+                }
+                container pcp-color-pac {
+                    uses pcp-color-id-pac-g;
+                    description "This attribute represents the relationship between the ColorIdentifier and the PcpColorIdPac (representing the choice that maps Vlan tag PCPs to Color).";
+                }
+                list dcsp-color-pac {
+                    key 'ip-version';
+                    max-elements 2;
+                    uses dscp-color-id-pac-g;
+                    description "This attribute represents the relationship between the ColorIdentifier and the DscpColorIdPac (representing the choice that maps DSCP values to Color).";
+                }
+                description "The ColorIdentifier object class represents the Color Identifier. The Color Identifier is a pair of the form <F, M> where F is a field in the ingress EI Frame and M is a mapping between each possible value of the field F and a Color. The ColorIdentifier object class is associated with CarrierEthernetServiceEndPoint (EvcEndPoint or OvcEndPoint), in addition to the different field F, such as SepColorIdPac, PcpColorIdPac, DeiColorIdPac, and DscpColorIdPac, etc.";
+            }
+            grouping dei-color-id-pac-g {
+                description "The DeiColorIdPac object class represents the Color Identifier that maps the vlan tag (S tag or C tag) DEI value to Color, DEI=0 for green color and DEI=1 for yellow color. For an EVC End Point or an OVC End Point at UNI or in a VUNI, the DEI value is from C-Tag ingress EI frames. For an OVC End Point at an ENNI and not in a VUNI, the DEI value is from S-Tag of the ingress EI frames. ";
+            }
+            grouping dscp-color-id-pac-g {
+                leaf ip-version {
+                    type mef-common-types:ip-version;
+                    description "This attribute denotes which IP version is used. It can be IPV4, IPV6 or IPV4_AND_IPV6.";
+                }
+                leaf-list dscp-value-for-green-list {
+                    type mef-common-types:natural-number;
+                    max-elements 64;
+                    description "This attribute provides a list DSCP values map to the green ingress EI frames. The dscpValueForGreenList and the dscpValueForYellowList must disjoint and the union of the two lists must include all possible DSCP values.";
+                }
+                leaf-list dscp-value-for-yellow-list {
+                    type mef-common-types:natural-number;
+                    max-elements 64;
+                    description "This attribute provides a list DSCP values map to the yellow ingress EI frames. The dscpValueForGreenList and the dscpValueForYellowList must disjoint and the union of the two lists must include all possible DSCP values.";
+                }
+                description "The DscpColorIdPac object class represents the Color Identifier that maps DSCP (IPv4 or IPv6) values to Color.";
+            }
+            grouping pcp-color-id-pac-g {
+                leaf-list pcp-value-for-green-list {
+                    type mef-common-types:natural-number;
+                    max-elements 8;
+                    description "This attribute provides a list PCP values map to the green ingress EI frames. The pcpValueForGreenList and the pcpValueForYellowList must disjoint and the union of the two lists must include all possible PCP values. ";
+                }
+                leaf-list pcp-value-for-yellow-list {
+                    type mef-common-types:natural-number;
+                    max-elements 8;
+                    description "This attribute provides a list PCP values map to the yellow ingress EI frames. The pcpValueForGreenList and the pcpValueForYellowList must disjoint and the union of the two lists must include all possible PCP values. ";
+                }
+                description "The PcpColorIdPac object class represents the Color Identifier that maps vlan tag (S tag or C tag) PCP values to Color. For an EVC End Point or an OVC End Point at UNI or in a VUNI, the PCP values are from C-Tag ingress EI frames. For an OVC End Point at an ENNI and not in a VUNI, the PCP values are from S-Tag of the ingress EI frames. ";
+            }
+            grouping sep-color-id-pac-g {
+                leaf color {
+                    type mef-common-types:frame-color;
+                    description "This attribute denotes the color of the EI frame, green or yellow.";
+                }
+                description "The SepColorIdPac represents the Color Identifier that maps to the EVC End Point or the OVC End Point to Color.";
+            }
+
+        /***********************
+        * package cos-identifier
+        **********************/ 
+            grouping cos-identifier-g {
+                leaf cos-name {
+                    type string;
+                    description "This attribute denotes the Class of Service name that the CosIdentifier map to.";
+                }
+                list l2cp-protocol-list {
+                    key 'l2cp-protocol-type';
+                    uses mef-common-types:l2cp-protocol-g;
+                    description "This attribute lists the L2CP Protocols that map to the Class of Service Name.";
+                }
+                container sep-cos-id-pac {
+                    uses sep-cos-id-pac-g;
+                    description "This attribute represents the relationship between the CosIdentifier and the SepCosIdPac when the cosMappingType of EvcEndPoint or OvcEndPoint is END_POINT and the cosName is not only for L2CP.";
+                }
+                container pcp-cos-id-pac {
+                    uses pcp-cos-id-pac-g;
+                    description "This attribute represents the relationship between the CosIdentifier and the PcpCosIdPac  when the cosMappingType of EvcEndPoint or OvcEndPoint is PCP and the cosName is not only for L2CP.";
+                }
+                list dscp-cos-id-pac {
+                    key 'ip-version';
+                    max-elements 2;
+                    uses dscp-cos-id-pac-g;
+                    description "This attribute represents the relationship between the CosIdentifier and the DespCosIdPac when the cosMappingType of EvcEndPoint or OvcEndPoint is DSCP and the cosName is not only for L2CP.";
+                }
+                container ingress-bwp-per-cos {
+                    uses bwp-flow-g;
+                    description "This attribute represents the relationship between the CosIdentifier and the BwpFlow, for ingress bandwidth profile per CoS Name.";
+                }
+                description "The CosIdentifier object class represents the Class of Service Identifier. Each ingress EI Frame mapped to the given EVC/OVC End Point has a single Class of Service. The Class of Service can be determined from inspection of the content of the ingress EI Frame. It is associated with the SepCosIdPac, or the PcpCosIdPac, or the DscpCosIdPac (when the Class of Service Identifier mapping type is Service End Point, or PCP values, or DSCP values respectively). EI Frames of L2CP protocols may be identified by a Class of Service Identifier, mapping to specific CoS Name.";
+            }
+            grouping dscp-cos-id-pac-g {
+                leaf-list dscp-value-list {
+                    type mef-common-types:natural-number;
+                    min-elements 1;
+                    max-elements 64;
+                    description "This attribute is a list of DSCP values that maps to a CoS Name.";
+                }
+                leaf ip-version {
+                    type mef-common-types:ip-version;
+                    description "This attribute denotes the IP version for the DSCP. It can be IPV4, IPV6 or IPV4_AND_IPV6.";
+                }
+                description "The DscpCosIdPac object class represents CoS Identifier that maps the IP DSCP values to the Class of Service Name(s). It can map a list of DSCP values to two different Class of Service Names, one for ingress EI Frames carrying an IPv4 packet and a different one for ingress EI Frames carrying an IPv6 packet. It also can map a list of DSCP values (both IPv4 and IPv6) to one Class of Service Name.";
+            }
+            grouping pcp-cos-id-pac-g {
+                leaf-list pcp-value-list {
+                    type mef-common-types:natural-number;
+                    min-elements 1;
+                    max-elements 8;
+                    description "This attribute is a list of PCP values that map to the CoS Name. ";
+                }
+                description "The PcpCosIdPac object class represents CoS Identifier that maps a list of PCP values to a Class of Service Name. For an EVC End Point or an OVC End Point at UNI or in a VUNI, the PCP values are from C-Tag ingress EI frames. For an OVC End Point at an ENNI and not in a VUNI, the PCP values are from S-Tag of the ingress EI frames. ";
+            }
+            grouping sep-cos-id-pac-g {
+                description "The SepCosIdPac represents the CoS Identifier that maps the EVC End Point or the OVC End Point to a Class of Service Name. ";
+            }
+
+        /***********************
+        * package eec-identifier
+        **********************/ 
+            grouping dscp-eec-id-pac-g {
+                leaf ip-version {
+                    type mef-common-types:ip-version;
+                    description "This attribute specifies the IP version for the DSCP. It can be IPV4, IPV6 or IPV4_AND_IPV6.";
+                }
+                leaf-list dscp-value-list {
+                    type mef-common-types:natural-number;
+                    min-elements 1;
+                    max-elements 64;
+                    description "This attribute is a list of DSCP values that maps to the EEC Name. ";
+                }
+                description "The DscpEecIdPac object class represents Egress Equivalence Class Identifier that maps the IP DSCP values to the Egress Equivalence Class Name(s). It can map a list of DSCP values to two different Egress Equivalence Class Names, one for ingress EI Frames carrying an IPv4 packet and a different one for ingress EI Frames carrying an IPv6 packet. It also can map a list of DSCP values (both IPv4 and IPv6 packets) to an Egress Equivalence Class Name.";
+            }
+            grouping eec-identifier-g {
+                leaf eec-name {
+                    type string;
+                    description "This attribute denotes the Egress Equivalence Class Name that the EecIdentifier maps to.";
+                }
+                list l2cp-protocol-list {
+                    key 'l2cp-protocol-type';
+                    uses mef-common-types:l2cp-protocol-g;
+                    description "This attribute lists the L2CP Protocols that map to the Egress Equivalence Class Name.";
+                }
+                container sep-eec-id-pac {
+                    uses sep-eec-id-pac-g;
+                    description "This attribute represents the relationship between the EecIdentifier and a SepEecIdPac when the eecMappingType of EvcEndPoint or OvcEndPoint is END_POINT and the eecName is not only for L2CP. This not addressed in MEF 10.3 but can be future consideration.";
+                }
+                container pcp-eec-id-pac {
+                    uses pcp-eec-id-pac-g;
+                    description "This attribute represents the relationship between the EecIdentifier and a PcpEecIdPac when the eecMappingType of EvcEndPoint or OvcEndPoint is PCP and the eecName is not only for L2CP.";
+                }
+                list dscp-eec-id-pac {
+                    key 'ip-version';
+                    max-elements 2;
+                    uses dscp-eec-id-pac-g;
+                    description "This attribute represents the relationship between the EecIdentifier and a DscpEecIdPac when the eecMappingType of EvcEndPoint or OvcEndPoint is DSCP and the eecName is not only for L2CP.";
+                }
+                container egress-bwp-per-eec {
+                    uses bwp-flow-g;
+                    description "This attribute represents the relationship between the EecIdentifier and the BwpFlow, for egress bandwidth profile per EEC Name.";
+                }
+                description "The EecIdentifier object class represents the Egress Equivalence Class Identifier. Each egress EI Frame mapped to the given EVC/OVC End Point has a single Egress Equivalence Class. 
+The Egress Equivalence Class can be determined from inspection of the content of the egress EI Frame. It is associated with the SepCosIdPac, or the PcpCosIdPac, or the DscpCosIdPac (representing mapping to EVC/OVC End Point, or PCP, or DSCP respectively). EI Frames of L2CP protocols may be identified by an Egress Equivalence Class Identifier, mapping to specific Egress Equivalence Class Name.";
+            }
+            grouping pcp-eec-id-pac-g {
+                leaf-list pcp-value-list {
+                    type mef-common-types:natural-number;
+                    min-elements 1;
+                    max-elements 8;
+                    description "This attribute provides a list of PCP values that map to the Egress Equivalence Class Name.";
+                }
+                description "The PcpEecIdPac object class represents Egress Equivalence Class Identifier that maps a list of PCP values to Egress Equivalence Class Name. For an EVC End Point or an OVC End Point at UNI or in a VUNI, the PCP values are from C-Tag egress EI frames. For an OVC End Point at an ENNI and not in a VUNI, the PCP values are from S-Tag of the egress EI frames";
+            }
+            grouping sep-eec-id-pac-g {
+                description "The SepEecIdPac represents the Egress Equivalence Class Identifier that maps the EVC End Point or the OVC End Point to an Egress Equivalence Class Name.";
+            }
+
+        /***********************
+        * package egress-map
+        **********************/ 
+            grouping cos-name-and-color-to-dei-pac-g {
+                leaf ingress-cos-name {
+                    type string;
+                    description "This attribute denotes the ingress CoS name.";
+                }
+                leaf ingress-color {
+                    type mef-common-types:frame-color;
+                    description "This attribute denotes the ingress frame color as one of the determined factor for Egress Map. ";
+                }
+                leaf dei-value {
+                    type mef-common-types:dei-or-discard;
+                    description "This attribute denotes the egress frame DEI value, mapped from ingress CoS Name and ingress frame color. ";
+                }
+                description "The CosNameAndColorToDeiPac object class represents the Egress Map that maps from CoS Name and Ingress Color to DEI.";
+            }
+            grouping cos-name-and-color-to-pcp-pac-g {
+                leaf ingress-cos-name {
+                    type string;
+                    description "This attribute denotes the ingress CoS name.";
+                }
+                leaf ingress-color {
+                    type mef-common-types:frame-color;
+                    description "This attribute denotes the ingress frame color as one of the determined factor for Egress Map. ";
+                }
+                leaf pcp-value {
+                    type mef-common-types:pcp-or-discard;
+                    description "This attribute denotes the egress frame PCP value, mapped from ingress CoS name and ingress frame color. ";
+                }
+                description "The CosNameAndColorToPcpPac object class represents the Egress Map that maps from CoS Name and Ingress Color to PCP.";
+            }
+            grouping cos-name-to-pcp-pac-g {
+                leaf ingress-cos-name {
+                    type string;
+                    description "This attribute denotes the ingress CoS name.";
+                }
+                leaf pcp-value {
+                    type mef-common-types:pcp-or-discard;
+                    description "This attribute denotes the egress frame PCP value, mapped from ingress CoS Name and ingress frame color. ";
+                }
+                description "The CosNameToPcpPac object class represents the Egress Map that maps from CoS Name to PCP.";
+            }
+            grouping egress-map-g {
+                leaf egress-map-type {
+                    type mef-common-types:egress-map-type;
+                    description "This attribute determines which form to take to apply for egress frame color indication, among CoS name and Ingress Color to C-Tag PCP, or CoS name and Ingress Color to S-Tag PCP, or CoS Name and Ingress Color to C-Tag DEI, or CoS Name and Ingress Color to S-Tag DEI, or CoS Name to C-Tag PCP, or CoS Name to S-Tag PCP.";
+                }
+                list cos-name-and-color-to-dei-pac-list {
+                    key 'ingress-cos-name ingress-color';
+                    uses cos-name-and-color-to-dei-pac-g;
+                    description "This attribute represents the relationship between the EgressMap and the CosNameAndColorToDeiPac (representing the attribute set for using CoS Name and ingress color to egress DEI mapping).";
+                }
+                list cos-name-to-pcp-pac-list {
+                    key 'ingress-cos-name';
+                    uses cos-name-to-pcp-pac-g;
+                    description "This attribute represents the relationship between the EgressMap and the CosNameToPcpPac (representing the attribute set for using CoS Name to egress PCP mapping).";
+                }
+                list cos-name-and-color-to-pcp-pac-list {
+                    key 'ingress-color';
+                    uses cos-name-and-color-to-pcp-pac-g;
+                    description "This attribute represents the relationship between the EgressMap and the CosNameAndColorToPcpPac (representing the attribute set for using CoS Name and ingress color to egress PCP mapping).";
+                }
+                description "The EgressMap object class represents the Egress Map that is a set of mappings that determine the content of the S-Tag or C-Tag of an egress EI Frame. It is associated with EvcEndPoint or OvcEndPoint.";
+            }
+
+
+    /***********************
+    * package associations
+    **********************/ 
+
+}
diff --git a/nrp-api/src/main/yang/mef-types.yang b/nrp-api/src/main/yang/mef-types.yang

new file mode 100644 (file)

index 0000000..6074230
--- /dev/null
+++ b/nrp-api/src/main/yang/mef-types.yang
@@ -0,0 +1,915 @@
+module mef-common-types {
+    namespace "urn:mef:yang:MEF_Types";
+    prefix mef-common-types;
+    organization "Metro Ethernet Forum (MEF)";
+    contact "MEF";
+    description "none";
+    revision 2017-05-31 {
+        description "MEF NRP 1.0.alpha";
+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020 and RFC 6087";
+    }
+    /***********************
+    * package type-definitions
+    **********************/ 
+        typedef admin-state {
+            type enumeration {
+                enum unlocked {
+                    description "The resource is administratively permitted to perform services for its users.";
+                }
+                enum locked {
+                    description "The resource is administratively prohibited from performing services for its users.";
+                }
+            }
+            description "This enumeration is for Administrative states. Refer to ITU-T X.731.";
+        }
+        grouping agg-link-depth-g {
+            container vlan-id {
+                uses vlan-id-g;
+                description "The ingress frame Vlan ID. ";
+            }
+            leaf link-depth {
+                type positive-integer;
+                description "The number of links for the aggregation link.";
+            }
+            description "This is a pair of <VLAN ID, link depth> indicating that a given VLAN ID maps to a given number of links in the Port Conversation ID to Aggregation Link Map.";
+        }
+        typedef available-meg-level {
+            type enumeration {
+                enum none {
+                    description "Indicates that SOAM EI Frames are not guaranteed to pass over this OVC at any MEG Level.";
+                }
+                enum 0 {
+                    description "none";
+                }
+                enum 1 {
+                    description "none";
+                }
+                enum 2 {
+                    description "none";
+                }
+                enum 3 {
+                    description "none";
+                }
+                enum 4 {
+                    description "none";
+                }
+                enum 5 {
+                    description "none";
+                }
+                enum 6 {
+                    description "none";
+                }
+                enum 7 {
+                    description "none";
+                }
+            }
+            description "This enumeration is for available MEG level, can be either NONE or value 0..7.  NONE indicates that SOAM EI Frames are not guaranteed to pass over at any MEG Level.";
+        }
+        typedef color-field-type {
+            type enumeration {
+                enum pcp {
+                    description "Using PCP field to map to the color.";
+                }
+                enum dei {
+                    description "Using DEI field to map to the color.";
+                }
+                enum end-point {
+                    description "Using EVC End Point or the OVC End Point to map to the color.";
+                }
+                enum dscp {
+                    description "Using DSCP field to map to the color.";
+                }
+            }
+            description "This enumeration is for selecting which frame field being used for color indication.";
+        }
+        typedef color-mode {
+            type enumeration {
+                enum color-aware {
+                    description "none";
+                }
+                enum color-blind {
+                    description "none";
+                }
+            }
+            description "This enumeration indicates whether the Color Identifier of the Service Frame is considered by the Bandwidth Profile Algorithm.";
+        }
+        typedef connection-type {
+            type enumeration {
+                enum point-to-point {
+                    description "none";
+                }
+                enum multipoint {
+                    description "none";
+                }
+                enum rooted-multipoint {
+                    description "none";
+                }
+            }
+            description "This is for EVC or OVC connection types, including point to point, multi-point and rooted multi-point.";
+        }
+        grouping conversation-id-to-aggregation-link-map-g {
+            leaf conversation-id {
+                type natural-number;
+                description "The conversation ID is a Vlan ID or 0 for untagged or priority tagged frame.. ";
+            }
+            leaf-list link-id-list {
+                type natural-number;
+                min-elements 1;
+                description "The link ID of the aggregation link.";
+            }
+            description "This is a Port Conversation ID to Aggregation Link Map as defined in IEEE Std 802.1AX – 2014.";
+        }
+        typedef cos-or-eec-mapping-type {
+            type enumeration {
+                enum end-point {
+                    description "Using EVC End Point or OVC End Point to map to the CoS Name as CoS ID.";
+                }
+                enum pcp {
+                    description "Using PCP field to map to the CoS Name as CoS ID.";
+                }
+                enum dscp {
+                    description "Using DSCP field to map to the CoS Name as CoS ID.";
+                }
+            }
+            description "This lists the Class of Service identifier type, or the Equivalence Class Identifier type. ";
+        }
+        typedef dei-or-discard {
+            type enumeration {
+                enum discard {
+                    description "Discard the egress frame when the Egress Map determines based on CoS Name (and ingress Color).";
+                }
+                enum 0 {
+                    description "Set  egress frame DEI field to be 0 when the Egress Map determines based on CoS Name (and ingress Color).";
+                }
+                enum 1 {
+                    description "Set  egress frame DEI field to be 1 when the Egress Map determines based on CoS Name (and ingress Color).";
+                }
+            }
+            description "This lists the DEI value for color or discard, used for Egress Map.";
+        }
+        typedef egress-map-type {
+            type enumeration {
+                enum cn-c-tag-pcp {
+                    description "CoS Name to C-Tag PCP egress map type";
+                }
+                enum cc-c-tag-pcp {
+                    description "CoS Name and Color to C-Tag PCP egress map type";
+                }
+                enum cc-c-tag-dei {
+                    description "CoS Name and Color to C-Tag DEI egress map type";
+                }
+                enum cn-s-tag-pcp {
+                    description "CoS Name to S-Tag PCP egress map type";
+                }
+                enum cc-s-tag-pcp {
+                    description "CoS Name and Color to S-Tag PCP egress map type";
+                }
+                enum cc-s-tag-dei {
+                    description "CoS Name and Color to S-Tag DEI egress map type";
+                }
+            }
+            description "This lists the Egress Map types, either CoS Name to PCP, or CoS Name and Ingress Color to PCP, or  CoS Name and Ingress Color to DEI for S-Tag or C-Tag.";
+        }
+        typedef ethernet-frame-format {
+            type enumeration {
+                enum ethernet {
+                    description "none";
+                }
+            }
+            description "This is a single value read only attribute. Keep this in the info model just because MEF 10.3 lists it as a service attribute.";
+        }
+        typedef evc-end-point-role {
+            type enumeration {
+                enum root {
+                    description "EVC End Point has role of root for the EVC.";
+                }
+                enum leaf {
+                    description "EVC End Point has role of leaf for the EVC.";
+                }
+            }
+            description "The value indicates how external interface frames mapped to the  EVC End Point can be forwarded.";
+        }
+        typedef frame-color {
+            type enumeration {
+                enum green {
+                    description "none";
+                }
+                enum yellow {
+                    description "none";
+                }
+            }
+            description "Frame color is either Green or Yellow.";
+        }
+        typedef frame-delivery {
+            type enumeration {
+                enum discard {
+                    description "Frame must be discarded.";
+                }
+                enum conditionally {
+                    description "Frame will be delivered with specified condition.";
+                }
+                enum unconditionally {
+                    description "Frame will be delivered unconditionally.";
+                }
+            }
+            description "Service frame delivery defined in MEF 10.3. When the value is conditionally, the specific condition has to be addresses by the users. What conditions should be supported are not in the scope.";
+        }
+        typedef identifier45 {
+            type string;
+            description "Unique by network administrative domain, containing no more than 45 characters and non-null RFC Display String but not contain the characters 0x00 through 0x1f.";
+        }
+        typedef identifier90 {
+            type string;
+            description "Unique by network administrative domain, containing no more than 90 characters and non-null RFC Display String but not contain the characters 0x00 through 0x1f.";
+        }
+        typedef interface-resiliency {
+            type enumeration {
+                enum none {
+                    description "none";
+                }
+                enum 2-link-active-standby {
+                    description "none";
+                }
+                enum all-active {
+                    description "none";
+                }
+                enum other {
+                    description "none";
+                }
+            }
+            description "The method for protection, if any, against a physical link failure. Refer to MEF 10.3.2 and MEF 26.2.";
+        }
+        typedef ip-version {
+            type enumeration {
+                enum ipv4 {
+                    description "none";
+                }
+                enum ipv6 {
+                    description "none";
+                }
+                enum ipv4-and-ipv6 {
+                    description "none";
+                }
+            }
+            description "This enumeration lists the IP versions, including IPv4, IPv6 and both.";
+        }
+        typedef l2cp-address-set {
+            type enumeration {
+                enum cta {
+                    description "CE-Vlan Tag Aware";
+                }
+                enum ctb {
+                    description "CE-Vlan Tag Blind";
+                }
+                enum ctb2 {
+                    description "CE-Vlan Tag Blind option 2";
+                }
+            }
+            description "This lists the L2CP Address Set. Refer to MEF 45.";
+        }
+        grouping l2cp-peering-g {
+            container protocol-id {
+                uses l2cp-protocol-g;
+                description "This is a L2CP Protocol Identifier.";
+            }
+            leaf destination-address {
+                type natural-number;
+                description "This is a Mac Address.";
+            }
+            leaf-list link-id-list {
+                type positive-integer;
+                description "It is possible that a protocol (e.g. ESMC) could operate on some, but not all, of the physical
+                    links. When linkId is not listed, the protocol peering applies to all members of the aggregation link.";
+            }
+            description "This is a list specifies the L2CP Protocol Identifier and the Destination Address in use by the protocol entity.";
+        }
+        grouping l2cp-protocol-g {
+            leaf l2cp-protocol-type {
+                type l2cp-protocol-type;
+                description "This attribute specifies the type of L2CP protocol, i.e., LLC or EtherType.";
+            }
+            leaf llc-address-or-ether-type {
+                type natural-number;
+                description "This attribute specifies the LLC address or the EtherType value.";
+            }
+            leaf sub-type {
+                type natural-number;
+                description "This attribute specifies the subtype of the L2CP protocol.";
+            }
+            description "This data type defines a L2CP protocol (LLC address type or EtherType) with possible subtype.";
+        }
+        typedef l2cp-protocol-type {
+            type enumeration {
+                enum ethertype {
+                    description "EtherType for L2CP, e.g., LLDP (0x88CC).";
+                }
+                enum llc {
+                    description "Logical Link Control sublayer address for L2CP, e.g., STP (0x42).";
+                }
+            }
+            description "This lists the L2CP protocol types, either EtherType, or LLC Address.";
+        }
+        typedef mep-direction {
+            type enumeration {
+                enum down {
+                    description "none";
+                }
+                enum up {
+                    description "none";
+                }
+            }
+            description "This is for MEP direction, either Down MEP or Up MEP.";
+        }
+        grouping mep-level-and-direction-g {
+            leaf level {
+                type natural-number;
+                description "This is the MEG level, value between 0..7.";
+            }
+            leaf direction {
+                type mep-direction;
+                description "This is MEP direction, UP or DOWN.";
+            }
+            description "This complex data type includes MEG LEVEL and MEP direction.";
+        }
+        typedef natural-number {
+            type int64;
+            description "An integer >=0";
+        }
+        typedef operational-state {
+            type enumeration {
+                enum enabled {
+                    description "none";
+                }
+                enum disabled {
+                    description "none";
+                }
+            }
+            description "This enumeration is for Operational states. Refer to ITU-T X.731.";
+        }
+        typedef ovc-end-point-map-form {
+            type enumeration {
+                enum form-e {
+                    description "OVC End Point Map for ENNI.";
+                }
+                enum form-v {
+                    description "OVC End Point Map for VUNI.";
+                }
+                enum form-u {
+                    description "OVC End Point Map for UNI.";
+                }
+                enum form-t {
+                    description "OVC End Point Map for Trunk.";
+                }
+            }
+            description "The OVC End Point Map types, for ENNI (FORM E), for UNI (FORM U), for VUNI (FORM V), or for Trunk (FORM T).";
+        }
+        typedef ovc-end-point-role {
+            type enumeration {
+                enum root {
+                    description "OVC End Point has role of root for the OVC.";
+                }
+                enum leaf {
+                    description "OVC End Point has role of leaf for the OVC.";
+                }
+                enum trunk {
+                    description "OVC End Point has role of trunk for the OVC.";
+                }
+            }
+            description "The value indicates how external interface frames mapped to the  OVC End Point can be forwarded.";
+        }
+        typedef pcp-or-discard {
+            type enumeration {
+                enum discard {
+                    description "none";
+                }
+                enum 0 {
+                    description "none";
+                }
+                enum 1 {
+                    description "none";
+                }
+                enum 2 {
+                    description "none";
+                }
+                enum 3 {
+                    description "none";
+                }
+                enum 4 {
+                    description "none";
+                }
+                enum 5 {
+                    description "none";
+                }
+                enum 6 {
+                    description "none";
+                }
+                enum 7 {
+                    description "none";
+                }
+            }
+            description "This enumeration lists one of PCP values or DISCARD.";
+        }
+        typedef percentage {
+            type int64;
+            description "Data type for percentage, 0%-100%.";
+        }
+        typedef physical-layer {
+            type enumeration {
+                enum 10base2 {
+                    description "none";
+                }
+                enum 10base5 {
+                    description "none";
+                }
+                enum 10base-f {
+                    description "none";
+                }
+                enum 10base-fb {
+                    description "none";
+                }
+                enum 10base-fl {
+                    description "none";
+                }
+                enum 10base-fp {
+                    description "none";
+                }
+                enum 10base-t {
+                    description "none";
+                }
+                enum 10base-te {
+                    description "none";
+                }
+                enum 10broad36 {
+                    description "none";
+                }
+                enum 10pass-ts {
+                    description "none";
+                }
+                enum 100base-bx10 {
+                    description "none";
+                }
+                enum 100base-fx {
+                    description "none";
+                }
+                enum 100base-lx10 {
+                    description "none";
+                }
+                enum 100base-t {
+                    description "none";
+                }
+                enum 100base-t2 {
+                    description "none";
+                }
+                enum 100base-t4 {
+                    description "none";
+                }
+                enum 100base-tx {
+                    description "none";
+                }
+                enum 100base-x {
+                    description "none";
+                }
+                enum 1000base-bx10 {
+                    description "none";
+                }
+                enum 1000base-cx {
+                    description "none";
+                }
+                enum 1000base-kx {
+                    description "none";
+                }
+                enum 1000base-lx {
+                    description "none";
+                }
+                enum 1000base-lx10 {
+                    description "none";
+                }
+                enum 1000base-px10 {
+                    description "none";
+                }
+                enum 1000base-px20 {
+                    description "none";
+                }
+                enum 1000base-sx {
+                    description "none";
+                }
+                enum 1000base-t {
+                    description "none";
+                }
+                enum 1000base-x {
+                    description "none";
+                }
+                enum 10gbase-cx4 {
+                    description "none";
+                }
+                enum 10gbase-e {
+                    description "none";
+                }
+                enum 10gbase-er {
+                    description "none";
+                }
+                enum 10gbase-ew {
+                    description "none";
+                }
+                enum 10gbase-kr {
+                    description "none";
+                }
+                enum 10gbase-kx4 {
+                    description "none";
+                }
+                enum 10gbase-l {
+                    description "none";
+                }
+                enum 10gbase-lr {
+                    description "none";
+                }
+                enum 10gbase-lrm {
+                    description "none";
+                }
+                enum 10gbase-lw {
+                    description "none";
+                }
+                enum 10gbase-lx4 {
+                    description "none";
+                }
+                enum 10gbase-pr {
+                    description "none";
+                }
+                enum 10gbase-prx {
+                    description "none";
+                }
+                enum 10gbase-r {
+                    description "none";
+                }
+                enum 10gbase-s {
+                    description "none";
+                }
+                enum 10gbase-sr {
+                    description "none";
+                }
+                enum 10gbase-sw {
+                    description "none";
+                }
+                enum 10gbase-t {
+                    description "none";
+                }
+                enum 10gbase-w {
+                    description "none";
+                }
+                enum 10gbase-x {
+                    description "none";
+                }
+                enum 100gbase-r {
+                    description "none";
+                }
+                enum 100gbase-cr10 {
+                    description "none";
+                }
+                enum 100gbase-er4 {
+                    description "none";
+                }
+                enum 100gbase-lr4 {
+                    description "none";
+                }
+                enum 100gbase-sr10 {
+                    description "none";
+                }
+                enum 40gbase-r {
+                    description "none";
+                }
+                enum 40gbase-cr4 {
+                    description "none";
+                }
+                enum 40gbase--fr {
+                    description "none";
+                }
+                enum 40gbase-kr4 {
+                    description "none";
+                }
+                enum 40gbase-lr4 {
+                    description "none";
+                }
+                enum 40gbase-sr4 {
+                    description "none";
+                }
+                enum 1base5 {
+                    description "none";
+                }
+                enum 2base-tl {
+                    description "none";
+                }
+                enum 1g-epon {
+                    description "none";
+                }
+                enum 10g-epon {
+                    description "none";
+                }
+                enum 10-1g-epon {
+                    description "none";
+                }
+                enum 10-10g-epon {
+                    description "none";
+                }
+                enum other {
+                    description "none";
+                }
+                enum none {
+                    description "none";
+                }
+            }
+            description "IEEE802.3 (2012) defined list excluding 1000BASE-PX-D and 1000BASE-PX-U. NONE is added with further MEF 10.3 discussion, for supporting logical interfaces.";
+        }
+        grouping physical-layer-per-link-g {
+            leaf link-id {
+                type natural-number;
+                description "This is the link ID.";
+            }
+            leaf physical-layer {
+                type physical-layer;
+                description "This is the physical layer. IEEE802.3 (2012) defined.";
+            }
+            description "A link may consist of one or more physical ports. This data type includes the link ID and the physical port associated to the link Id.";
+        }
+        typedef pm-metric-type {
+            type enumeration {
+                enum fd {
+                    description "Frame Delay Performance Metric.";
+                }
+                enum fdr {
+                    description "Frame Delay Range Performance Metric.";
+                }
+                enum mfd {
+                    description "Mean Frame Delay Performance Metric.";
+                }
+                enum ifdv {
+                    description "Inter Frame Delay Variation Performance Metric.";
+                }
+                enum flr {
+                    description "Frame Loss Ratio Performance Metric.";
+                }
+                enum av {
+                    description "Availability Performance Metric.";
+                }
+                enum hli {
+                    description "High Loss Interval Performance Metric.";
+                }
+                enum chli {
+                    description "Consecutive High Loss Interval Performance Metric.";
+                }
+                enum group-av {
+                    description "Group Availability (for a single EVC/OVC) Performance Metric.";
+                }
+                enum cpm {
+                    description "Composite Performance Metric. Refer to MEF 10.3.1.";
+                }
+            }
+            description "This enumeration provides the list of PM Metric types, including FD, MFD, FDR, IFDV, FLR, AV, HLI, CHLI, GROUP_AV, and CPM.";
+        }
+        typedef pm-unit {
+            type enumeration {
+                enum millisecond {
+                    description "Measured Performance Metric in PM report as milliseconds, for FD, FDR, IFDV, and MFD.";
+                }
+                enum count {
+                    description "Measured Performance Metric in PM report as count number, for HLI and CHLI.";
+                }
+                enum percent {
+                    description "Measured Performance Metric in PM report as percentage, for FLR, Availability, Group Availability and Composite PM.";
+                }
+            }
+            description "PM Unit, used for pairing with Value in data type PmUnitAndValue. Can be second, millisecond, micro second, etc. ";
+        }
+        grouping pm-unit-and-value-g {
+            leaf pm-unit {
+                type pm-unit;
+                description "This attribute denotes the 'unit',  e.g., MILLISECOND, COUNT or PERCENT.";
+            }
+            leaf delay-value {
+                type uint64;
+                description "This attribute denotes the delay value only when the PmUnit=SECOND. It is for FD, FDR, MFD, IFDV.";
+            }
+            leaf count-value {
+                type natural-number;
+                description "This attribute denotes the count value only when the PmUnit=COUNT. It is for HLI and CHLI.";
+            }
+            leaf percent-value {
+                type percentage;
+                description "This attribute denotes the percentage value only when the PmUnit=PERCENT. It is for FLR, AV, GROUP_AV and CPM.";
+            }
+            description "This data type provides the pair of <unit, value> where the unit can be ms (for frame delay), number (for HLI), and value is the correspondent value for that unit.";
+        }
+        typedef positive-integer {
+            type int64;
+            description "An integer >0";
+        }
+        typedef service-state {
+            type enumeration {
+                enum pending {
+                    description "none";
+                }
+                enum active {
+                    description "none";
+                }
+                enum inactive {
+                    description "none";
+                }
+            }
+            description "This enumeration is for Service State.";
+        }
+        grouping source-mac-address-limit-g {
+            leaf limit {
+                type natural-number;
+                description "This attribute denotes the maximum acceptable source MAC addresses.";
+            }
+            leaf time-interval {
+                type natural-number;
+                description "This attribute denotes the time interval in milliseconds.";
+            }
+            description "This limits the number of source MAC Addresses that can be used in ingress external interface frames mapped to the End Point of all types over a time interval.";
+        }
+        typedef svlan-id-control {
+            type enumeration {
+                enum full {
+                    description "Operator can support only a single SP/SO (Service Provider/Super Operator) at the ENNI.";
+                }
+                enum partial {
+                    description "Operator can support only multiple SP/SO (Service Provider/Super Operator) at the ENNI";
+                }
+            }
+            description "This lists the S Vlan ID Control, either FULL or PARTIAL.";
+        }
+        grouping sync-mode-per-link-g {
+            leaf link-id {
+                type natural-number;
+                description "This is the link ID of the link in the Aggregation Link.";
+            }
+            leaf sync-mode-enabled {
+                type boolean;
+                description "This attribute denotes whether the Synchronous Mode is enabled (on the link with the Link ID).";
+            }
+            description "A link may consist of one or more physical ports. This data type includes the link ID and the sync mode of the physical port associated to the link Id.";
+        }
+        typedef tagged-l2cp-processing {
+            type enumeration {
+                enum 802-1-compliant {
+                    description "none";
+                }
+                enum 802-1-non-compliant {
+                    description "none";
+                }
+            }
+            description "Either 802.1 compliant or not. Refer to MEF 45.";
+        }
+        grouping time-and-date-g {
+            leaf year {
+                type positive-integer;
+                description "This denotes the year.";
+            }
+            leaf month {
+                type positive-integer;
+                description "This denotes the month.";
+            }
+            leaf day {
+                type positive-integer;
+                description "This denotes the day.";
+            }
+            leaf hour {
+                type natural-number;
+                description "This denotes the hour.";
+            }
+            leaf minute {
+                type natural-number;
+                description "This denotes the minute.";
+            }
+            leaf second {
+                type natural-number;
+                description "This denotes the second.";
+            }
+            description "This data type is for Time and Date in UTC.";
+        }
+        grouping time-interval-t-g {
+            leaf unit {
+                type time-interval-unit;
+                description "Month, week, day, hour, etc.";
+            }
+            leaf number {
+                type positive-integer;
+                description "This denotes the value (for the unit), e.g., 1 (month), 20 (day), etc.";
+            }
+            description "Time interval T for PM. E.g., 1 month, 20 days, 2 weeks, etc.";
+        }
+        typedef time-interval-unit {
+            type enumeration {
+                enum year {
+                    description "none";
+                }
+                enum month {
+                    description "none";
+                }
+                enum week {
+                    description "none";
+                }
+                enum day {
+                    description "none";
+                }
+                enum hour {
+                    description "none";
+                }
+                enum minute {
+                    description "none";
+                }
+                enum second {
+                    description "none";
+                }
+            }
+            description "Time interval unit, e.g., month, day, week, hour, etc.";
+        }
+        grouping vlan-id-g {
+            leaf vlan-id {
+                type positive-integer;
+                description "This is the Vlan ID value.";
+            }
+            description "This is for VLAN ID from 1 to 4094";
+        }
+        grouping vlan-id-listing-g {
+            leaf type {
+                type vlan-id-mapping-type;
+                description "Can be LIST, or ALL, or EXCEPT.";
+            }
+            list vlan-id-list {
+                key 'vlan-id';
+                uses vlan-id-g;
+                description "This is a list of Vlan IDs.";
+            }
+            description "The list VLAN IDs, either when type=LIST, or when type==EXCEPT (which means the VLAN IDs except the listed). When type=ALL, the vlanId list is not applicable.";
+        }
+        typedef vlan-id-mapping-type {
+            type enumeration {
+                enum all {
+                    description "All Vlan IDs.";
+                }
+                enum except {
+                    description "All Vlan IDs except the listed.";
+                }
+                enum list {
+                    description "List of Vlan IDs.";
+                }
+            }
+            description "Vlan ID types, ALL for all vlan IDs, LIST for a list of Vlan IDs, EXCEPT for all Vlan IDs except the listed. ";
+        }
+        typedef vlan-id-preservation {
+            type enumeration {
+                enum preserve {
+                    description "To achieve EVC CE-VLAN ID Preservation.";
+                }
+                enum retain {
+                    description "C-Tag, if present, is encapsulated with the C-Tag VLAN ID value retained.";
+                }
+                enum strip {
+                    description "C-Tag is discarded.";
+                }
+            }
+            description "This is for Vlan ID Preservation. Refer to MEF 26.2 section 12.7.";
+        }
+        typedef vlan-tag {
+            type enumeration {
+                enum s-tag {
+                    description "none";
+                }
+                enum c-tag {
+                    description "none";
+                }
+            }
+            description "This is for Vlan Tag type, i.e., S-tag or C-tag.";
+        }
+        grouping vlan-id-list-or-untag-g {
+            leaf type {
+                type vlan-id-mapping-type-or-untag;
+                description "none";
+            }
+            list vlan-id-list {
+                key 'vlan-id';
+                uses vlan-id-g;
+                description "none";
+            }
+            description "none";
+        }
+        typedef vlan-id-mapping-type-or-untag {
+            type enumeration {
+                enum all {
+                    description "none";
+                }
+                enum except {
+                    description "none";
+                }
+                enum list {
+                    description "none";
+                }
+                enum untagged {
+                    description "none";
+                }
+            }
+            description "Vlan ID types, ALL for all Vlan IDs, LIST for a list of Vlan IDs, EXCEPT for all Vlan IDs except the listed, UNTAGGED to indicate that untagged and priority-tagged frames are mapped to this end point.";
+        }
+
+}
diff --git a/nrp-api/src/main/yang/nrm-connectivity.yang b/nrp-api/src/main/yang/nrm-connectivity.yang

index 142e8106305c451c2bb9d3bf88ee43988d3337d3..96d4f2250926866a65b4303dcaa6d4cb4422e0d5 100644 (file)
--- a/nrp-api/src/main/yang/nrm-connectivity.yang
+++ b/nrp-api/src/main/yang/nrm-connectivity.yang
@@ -4,140 +4,89 @@ module nrm-connectivity {
      import tapi-common {
          prefix tapi-common;
      }
-    import tapi-connectivity {
-        prefix tapi-connectivity;
+    import mef-common-types {
+        prefix mef-common-types;
+    }
+    import mef-common {
+        prefix mef-common;
      }
      organization "Metro Ethernet Forum (MEF)";
      contact "MEF";
      description "none";
-    revision 2017-02-27 {
+    revision 2017-05-31 {
          description "MEF NRP 1.0.alpha";
          reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020 and RFC 6087";
      }
      /***********************
      * package main
-    **********************/
+    **********************/ 
          /***********************
          * package object-classes
-        **********************/
-            grouping cg-eth-enni-spec {
-                leaf max-frame-size {
-                    type natural-number;
-                    description "MEF 7.3: This value limits the length of frames carried by an OVC that associates an OVC End Point at this ENNI in bytes. It is one of the ENNI Operator Multi-lateral attributes, which requires the CENs at the ENNI-N to agree on the values but may allow these values to be different.";
-                }
+        **********************/ 
+            grouping cg-eth-enni-spec-g {
                  container l2cp-peering-list {
-                    uses l2cp-peering;
+                    uses mef-common-types:l2cp-peering-g;
                      description "MEF 7.3: This attribute represents the L2CP Peering Service defined in MEF 45 section 8.2 when applied to the ENNI. It is one of the ENNI Operator Multi-lateral attributes, which requires the CENs at the ENNI-N to agree on the values but may allow these values to be different.";
                  }
                  leaf tagged-l2cp-processing {
-                    type tagged-l2cp-processing;
+                    type mef-common-types:tagged-l2cp-processing;
                      description "MEF 7.3: This attribute represents the Tagged L2CP Processing defined in MEF 45 section 8.3 (802.1 compliant or 802.1 non-compliant. Desired to be 802.1 compliant). It is one of the ENNI Operator Multi-lateral attributes, which requires the CENs at the ENNI-N to agree on the values but may allow these values to be different.";
                  }
-                list cg-eth-spor-sospecific-srv-attributes {
-                    key 'uuid';
-                    uses cg-eth-spor-sospecific-srv-attributes;
-                    description "none";
-                }
-                uses cg-eth-frame-aggr-trm-spec;
+                uses cg-eth-frame-aggr-spec-g;
                  description "none";
              }
-            grouping cg-eth-inni-spec {
-                leaf max-frame-size {
-                    type natural-number;
-                    description "none";
-                }
-                uses cg-eth-frame-aggr-trm-spec;
+            grouping cg-eth-inni-spec-g {
+                uses cg-eth-frame-aggr-spec-g;
                  description "none";
              }
-            grouping cg-eth-uni-spec {
+            grouping cg-eth-uni-spec-g {
                  leaf elmi-enabled {
                      type boolean;
                      description "MEF 7.3: This attribute denotes whether the ELMI is enabled or not. When the value is TRUE, the CEN MUST meet the mandatory requirements in MEF 16 that apply to the UNI-N.
                          Note: Ethernel Local Management Interface protocol contents are defined which clearly identify MEF Service/Resource constructs like UNI and EVC, hence the attribute cannot be placed in an ethernet generic class.";
                  }
-                leaf max-frame-size {
-                    type natural-number;
-                    description "10.3: The value for the UNI Maximum Service Frame Size is a positive integer in bytes.
-                        [R71] The value of the UNI Maximum Service Frame Size MUST be at least 1522 bytes.";
-                }
-                container default-ce-vlan-id {
-                    uses vlan-id;
-                    description "Mapped from original 7.3 'untaggedAndPriorityTaggedCeVlanId'
-                        10.3: At the given UNI, the Customer Edge VLAN ID (CE-VLAN ID) can be used to identify an EVC that associates this UNI. There are 4095 CE-VLAN IDs numbered 1 through 4095. The CE-VLAN ID for a VLAN
-                        Tagged Service Frame is the value of the VLAN ID in the tag.
-                        [R73] Untagged and Priority Tagged Service Frames MUST have the same CE VLAN ID.
-                        [R74] The CE-VLAN ID for Untagged and Priority Tagged Service Frames MUST be in the range 1, 2 , …, 4094.";
-                }
-                leaf max-num-of-ce-vlan-id-per-conn-serv-end-point {
-                    type positive-integer;
-                    description "none";
-                }
-                leaf service-multiplexing-enabled {
-                    type boolean;
-                    description "7.3: When this attribute value is enabled,  there can be multiple EVCs at the UNI. This attribute can be enabled only when All-to-one bundling is disabled.
-                        10.3: Service Multiplexing can be either Enabled or Disabled.
-                        [R72] A UNI with Service Multiplexing Enabled MUST be able to support multiple EVCs.
-                        [O2] When a UNI has Service Multiplexing Enabled, Point-to-Point EVCs and Multipoint EVCs MAY be multiplexed in any combination at a UNI.";
-                }
-                leaf all-to-one-bundling-enabled {
-                    type boolean;
-                    description "7.3: When a UNI has All to One Bundling Enabled, all CE-VLAN IDs MUST map to a single EVC at the UNI. This attribute can be enabled only when Service Multiplexing and Bundling are disabled.";
-                }
-                leaf token-share-enabled {
-                    type boolean;
-                    description "MEF 6.2: This is used to indicate whether a given UNI is capable of sharing tokens across Bandwidth Profile Flows in an Envelope. The allowed values, at each UNI, are Enabled or Disabled.
-                        [R2] A UNI, with Token Share Enabled, MUST be able to support two or more Bandwidth Profile Flows in at least one Envelope for Bandwidth Profile as specified in Section 11 of MEF 10.3 [6]
-                        [D1] A UNI, with Token Share Enabled, SHOULD be able to support two or more Bandwidth Profile Flows in every Envelope at that UNI.
-                        [R3] A UNI with Token Share Disabled, MUST have exactly one Bandwidth Profile Flow per Envelope";
-                }
                  leaf l2cp-address-set {
-                    type l2cp-address-set;
+                    type mef-common-types:l2cp-address-set;
                      description "MEF 45: The L2CP Address Set Service Attribute specifies the subset of the Bridge Reserved Addresses that are filtered (i.e. L2CP Frames with this destination address are Peered or Discarded but not Passed) at a L2CP Decision Point.
                          The basic construct of the L2CP behavioral model is a Decision Point that determines how an L2CP Frame is processed at an External Interface. L2CP Frames that enter
                          the Decision Point from the External Interface will either be Passed to the EVC (or OVC), or Peered by redirecting the frame to a Protocol Entity, or Discarded. L2CP Frames that enter the Decision Point
                          from the EVC (or OVC) will either be Passed to the External Interface, or Peered by redirecting the frame to a Protocol Entity, or Discarded.";
                  }
                  container l2cp-peering-list {
-                    uses l2cp-peering;
+                    uses mef-common-types:l2cp-peering-g;
                      description "MEF 45: The L2CP Peering Service Attribute is a list of Layer 2 Control Protocols that will be Peered by a protocol entity at a UNI, VUNI, or ENNI. Each entry in the list specifies the Protocol Identifier and the Destination Address in use by the protocol entity.";
                  }
                  container ingress-cg-eth-bwpflow {
-                    uses cg-eth-bwp-flow;
+                    uses cg-eth-bwp-flow-g;
                      description "none";
                  }
                  container egress-cg-eth-bwpflow {
-                    uses cg-eth-bwp-flow;
+                    uses cg-eth-bwp-flow-g;
                      description "none";
                  }
-                list cg-eth-envelope-list {
-                    key 'uuid';
-                    uses cg-eth-envelope;
-                    description "none";
-                }
-                uses cg-eth-frame-aggr-trm-spec;
+                uses cg-eth-frame-aggr-spec-g;
                  description "none";
              }
-            container cg-ety-trm-spec {
+            grouping cg-ety-spec-g {
                  leaf-list physical-layer-list {
-                    type physical-layer;
+                    type mef-common-types:physical-layer;
                      description "MEF 7.3: This attribute is a list of physical layers, one for each physical link implementing the UNI or ENNI. Different physical links can use different physical layers. The Physical Layer for each physical link implementing the UNI or ENNI MUST is one of the PHYs listed in IEEE Std 802.3 – 2012 but excluding 1000BASE-PX-D and 1000BASE-PX-U.
                          G.8052: This attribute identifies the PHY type of the ETY trail termination. See clause 30.3.2.1.2 of [IEEE 802.3].
-                        IEEE 802.3: A read-only value that identifies the PHY type. The enumeration of the type is such that the value matches the clause number of this International Standard that specifies the particular PHY. The value of this attribute maps to the value of aMAUType. The enumeration 'none' can only occur in a standard implementation where an MII exists and there is nothing connected. However, the attribute aMIIDetect should be used to determine whether an MII exists or not.";
+                        IEEE 802.3: A read-only value that identifies the PHY type. The enumeration of the type is such that the value matches the clause number of this International Standard that specifies the particular PHY. The value of this attribute maps to the value of aMAUType. The enumeration “none” can only occur in a standard implementation where an MII exists and there is nothing connected. However, the attribute aMIIDetect should be used to determine whether an MII exists or not.";
                  }
                  list sync-mode-list {
-                    key 'link-id';
                      min-elements 1;
-                    uses sync-mode-per-link;
+                    uses mef-common-types:sync-mode-per-link-g;
                      description "MEF 7.3: This attribute is a list with one item for each of the physical links. When the value of an item is 'Enabled,' the bits transmitted from the CEN to the CE on the physical link corresponding to the item can be used by the CE as a bit clock reference.
                          G.8052: no equivalent definition
                          IEEE 802.3: oTimeSync class (?), 1:1 with oMAU.";
                  }
                  leaf number-of-links {
-                    type positive-integer;
+                    type mef-common-types:positive-integer;
                      description "none";
                  }
                  container port-convs-id-to-agg-link-map-list {
-                    uses conversation-id-to-aggregation-link-map;
+                    uses mef-common-types:conversation-id-to-aggregation-link-map-g;
                      description "MEF 7.3: This attribute is applicable only when the UNI or ENNI resiliency attribute has the value of All Active. Its value is a Port Conversation ID to Aggregation Link Map as defined in IEEE Std 802.1AX – 2014.
                          G.8052: no equivalent definition - likely because refers to IEEE Std 802.1AX – 2008, where Conversation-sensitive LACP was not yet defined.";
                  }
@@ -151,107 +100,92 @@ module nrm-connectivity {
                          To be updated accordingly to the development of OAM model. E.g. can be replaced by explicit provisioning of MEP on LAG links.";
                  }
                  leaf link-aggregation {
-                    type interface-resiliency;
+                    type mef-common-types:interface-resiliency;
                      description "MEF 7.3: This attribute represents the Link Aggregation for a UNI or an ENNI. Its value is one of None, 2-Link Active/Standby, All Active, or Other. In MEF 10.3 it is called UNI Resiliency. the value of All Active is added in MEF 10.3.2.
                          G.8052: no equivalent definition found.";
                  }
                  description "none";
              }
-            grouping cg-eth-frame-aggr-trm-spec {
+            grouping cg-eth-frame-aggr-spec-g {
+                leaf max-frame-size {
+                    type mef-common-types:natural-number;
+                    description "none";
+                }
                  description "none";
              }
-            grouping cg-eth-frame-flow-cpa-aspec {
+            grouping cg-eth-frame-flow-spec-g {
                  leaf cos-mapping-type {
-                    type cos-or-eec-mapping-type;
+                    type mef-common-types:cos-or-eec-mapping-type;
                      description "MEF 7.3 (UML): The Class of Service (CoS) is used to specify ingress Bandwidth Profiles. The values of CoS is a triple of the form mapping type, SEP (Service End Point) based, PCP based or DSCP based.";
                  }
                  container source-mac-address-limit {
-                    uses source-mac-address-limit;
+                    uses mef-common-types:source-mac-address-limit-g;
                      description "MEF 10.3: Source MAC Address Limit can be either Enabled or Disabled.
                          This attribute limits the number of source MAC Addresses that can be used in ingress Service Frames of all types over a time interval. Two independent parameters control the behavior of this attribute: N : A positive integer and t : A time interval.
                          This attribute operates by maintaining a list of maximum length N of source MAC addresses which are aged-out of the list if not seen in a time interval t. If an ingress Service Frame arrives with a new source MAC address when the list is full, the Service Frame is discarded.
                          MEF 7.3: This attribute limits the number of source MAC Addresses that can be used in ingress EI Frames mapped to the EVC End Point or the OVC End Point of all types over a time interval. When not present, the number of source MAC addresses is unlimited.";
                  }
                  leaf eec-mapping-type {
-                    type cos-or-eec-mapping-type;
+                    type mef-common-types:cos-or-eec-mapping-type;
                      description "MEF 7.3 (UML): The Egress Equivalence Class (EEC) is used to specify Egress Bandwidth Profiles. The values of EEC is a triple of the form mapping type, SEP (Service End Point) based, PCP based or DSCP based. When _eecIdentifier is null this attrubute shall be null. Otherwise both shall be set.";
                  }
-                container agg-link-depth {
-                    uses agg-link-depth;
-                    description "MEF 7.3: 
-                        EvcEndPoint: This attribute only applies to an EVC End Point when the UNI resiliency has the value All Active. The EVC End Point Aggregation Link Depth Service Attribute value is a list of pairs of the form < VLAN ID, ,n> where the CE-VLAN ID value that is contained in the value of the EVC End Point Map and n is an integer in the range 1 to the value of the EI Number of Links n specifies the number of links in the value of the EI Port Conversation ID to Aggregation Link Map for the VLAN ID value.
-                        OvcEndPoint: This attribute only applies to an OVC End Point at ENNI when the EI Link Aggregation has the value All Active. This attribute value is a list of pairs of the form < S-VLAN ID, ,n> where the S-VLAN ID value that is contained in the value of the OVC End Point Map and n is an integer in the range 1 to the value of the EI Number of Links n specifies the number of links in the value of the EI Port Conversation ID to Aggregation Link Map for the VLAN ID value.";
-                }
                  container cg-eth-color-identifier {
-                    uses cg-eth-color-identifier;
+                    uses cg-eth-color-identifier-g;
                      description "none";
                  }
                  leaf end-point-role {
-                    type ovc-end-point-role;
+                    type mef-common-types:ovc-end-point-role;
                      description "End Point Role can be Root, Leaf for EVC End Points, Root, Leaf and Trunk for OVC End Poins.";
                  }
-                list s-vlan-id-list {
-                    key 'type';
-                    uses vlan-id-listing;
+                container s-vlan-id-list {
+                    uses mef-common-types:vlan-id-listing-g;
                      description "none";
                  }
-                container ce-vlan-id-list {
-                    uses vlan-id-listing;
+                container ce-vlan-id-list-or-untag {
+                    uses mef-common-types:vlan-id-listing-g;
                      description "ceVlanIdList maps 7.3 evcEndPointMap.
                          MEF 7.3: This attribute provides the list of CE-VLAN IDs those map to the EVC. MEF 10.3 lists this attribute (CE-VLAN ID/EVC map) as UNI service attribute while MEF 26.2 decided to move this on as endpoint service attribute. Decided to move this one to endpoint to be consistent. MEF 45 allows this attribute to be elastic.";
                  }
                  container root-svlan-id-list {
-                    uses vlan-id-listing;
+                    uses mef-common-types:vlan-id-listing-g;
                      description "none";
                  }
                  container leaf-svlan-id-list {
-                    uses vlan-id-listing;
+                    uses mef-common-types:vlan-id-listing-g;
                      description "none";
                  }
-                container cg-eth-spor-sospecific-srv-attributes {
-                    uses cg-eth-spor-sospecific-srv-attributes;
+                container egress-cg-eth-bwp-flow-per-sep {
+                    uses cg-eth-bwp-flow-g;
                      description "none";
                  }
-                container cg-eth-bwp-flow {
-                    uses cg-eth-bwp-flow;
+                container ingress-cg-eth-bwp-flow-per-sep {
+                    uses cg-eth-bwp-flow-g;
                      description "none";
                  }
-                container ingress-cg-ethbwpflow {
-                    uses cg-eth-bwp-flow;
-                    description "none";
-                }
-                list eth-cg-eth-cos-identifier {
-                    key 'uuid';
-                    uses eth-cg-eth-cos-identifier;
+                list cg-eth-cos-identifier {
+                    key 'cos-name';
+                    uses cg-eth-cos-identifier-g;
                      description "none";
                  }
                  list cg-eth-eec-identifier {
-                    key 'uuid';
-                    uses cg-eth-eec-identifier;
+                    key 'eec-name';
+                    uses cg-eth-eec-identifier-g;
                      description "none";
                  }
                  list cg-eth-egress-map {
-                    key 'uuid';
-                    uses cg-eth-egress-map;
+                    key 'egress-map-type';
+                    uses cg-eth-egress-map-g;
                      description "none";
                  }
                  description "none";
              }
-            grouping cg-eth-conn-serv-spec {
+            grouping cg-eth-conn-serv-spec-g {
                  leaf connection-type {
-                    type connection-type;
+                    type mef-common-types:connection-type;
                      description "7.3 'connectionType' replaced by G.8052 'connectionType' attribute.";
                  }
-                leaf unicast-frame-delivery {
-                    type frame-delivery;
-                    description "none";
-                }
-                leaf multicast-frame-delivery {
-                    type frame-delivery;
-                    description "none";
-                }
-                leaf broadcast-frame-delivery {
-                    type frame-delivery;
+                leaf is-connection-type-modifiable {
+                    type boolean;
                      description "none";
                  }
                  leaf ce-vlan-pcp-preservation {
@@ -263,15 +197,15 @@ module nrm-connectivity {
                      description "MEF 7.3 (UML): The CE-VLAN DEI Preservation Service Attribute for EVC/OVC can be used to preserve the value of the DEI field in VLAN Tagged Service Frames across a service. This is not inlcuded in MEF 10.3 but added in MEV 26.2. Future consideration will be included in MEF 10.x.";
                  }
                  leaf max-frame-size {
-                    type positive-integer;
+                    type mef-common-types:positive-integer;
                      description "none";
                  }
-                leaf cos-name-list {
+                leaf-list cos-name-list {
                      type string;
                      description "none";
                  }
                  leaf ce-vlan-id-preservation {
-                    type vlan-id-preservation;
+                    type mef-common-types:vlan-id-preservation;
                      description "MEF 7.3 EVC/OVC ceVlanIdPreservation added to CgEthConnServSpec class, with the OVC type (PRESERVE/STRIP/RETAIN) as it depends on EVC/OVC decomposition performed by SOFs.
                          MEF 7.3 defines this attribute separately in EVC and OVC. When defined in OVC, the type is more complex:
                          This attribute describes a relationship between the format of the VLAN ID and related fields values of the frame at one External Interface and the format and VLAN ID  and related fields values of the corresponding frame at another External Interface. The value of OVC CE-VLAN ID Preservation Service Attribute can be one of PRESERVE, STRIP, or RETAIN.";
@@ -284,1005 +218,61 @@ module nrm-connectivity {
                      type boolean;
                      description "MEF 7.3 (UML): This attribute describes a relationship between the S-VLAN DEI value of a frame at one ENNI and the S-VLAN DEI of the corresponding frame at another ENNI supported by the Operator CEN where each ENNI has an OVC End Point that is associated by the OVC.";
                  }
-                leaf available-meg-level {
-                    type available-meg-level;
-                    description "none";
-                }
                  leaf l2cp-address-set {
-                    type l2cp-address-set;
+                    type mef-common-types:l2cp-address-set;
                      description "l2cpAddressSet maps 7.3 ovcL2cpAddressSet.
                          MEF 7.3 (UML): This attribute is the L2CP Address Set Service Attribute that is defined in MEF 45 when it is applied to the OVC.";
                  }
-                container cg-eth-carrier-ethernet-sls {
-                    uses cg-eth-carrier-ethernet-sls;
-                    description "none";
-                }
                  description "none";
              }
-            grouping cg-eth-spor-sospecific-srv-attributes {
-                leaf sp-or-so-id {
-                    type identifier45;
-                    description "none";
-                }
-                leaf token-share-enabled {
-                    type boolean;
-                    description "none";
-                }
-                leaf-list operator-conn-serv-port-list {
-                    type leafref {
-                        path '/tapi-common:context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point/tapi-connectivity:local-id';
-                    }
-                    description "none";
-                }
+            grouping cg-eth-cos-identifier-g {
                  leaf uuid {
                      type tapi-common:universal-id;
                      description "none";
                  }
-                list cg-eth-envelope-list {
-                    key 'uuid';
-                    uses cg-eth-envelope;
-                    description "none";
-                }
+                uses mef-common:cos-identifier-g;
                  description "none";
              }
-            grouping eth-cg-eth-cos-identifier {
+            grouping cg-eth-egress-map-g {
                  leaf uuid {
                      type tapi-common:universal-id;
                      description "none";
                  }
+                uses mef-common:egress-map-g;
                  description "none";
              }
-            grouping cg-eth-egress-map {
+            grouping cg-eth-color-identifier-g {
                  leaf uuid {
                      type tapi-common:universal-id;
                      description "none";
                  }
+                uses mef-common:color-identifier-g;
                  description "none";
              }
-            grouping cg-eth-color-identifier {
+            grouping cg-eth-eec-identifier-g {
                  leaf uuid {
                      type tapi-common:universal-id;
                      description "none";
                  }
+                uses mef-common:eec-identifier-g;
                  description "none";
              }
-            grouping cg-eth-eec-identifier {
+            grouping cg-eth-bwp-flow-g {
                  leaf uuid {
                      type tapi-common:universal-id;
                      description "none";
                  }
+                uses mef-common:bwp-flow-g;
                  description "none";
              }
-            grouping cg-eth-bwp-flow {
-                leaf uuid {
-                    type tapi-common:universal-id;
-                    description "none";
-                }
-                description "none";
-            }
-            grouping cg-eth-envelope {
-                leaf uuid {
-                    type tapi-common:universal-id;
-                    description "none";
-                }
-                list cg-eth-bwp-flow-list {
-                    key 'uuid';
-                    min-elements 1;
-                    uses cg-eth-bwp-flow;
-                    description "none";
-                }
-                description "none";
-            }
-            grouping cg-eth-carrier-ethernet-sls {
-                leaf uuid {
-                    type tapi-common:universal-id;
-                    description "none";
-                }
-                list cg-eth-sls-cos-name-entry {
-                    key 'uuid';
-                    uses cg-eth-sls-cos-name-entry;
-                    description "none";
-                }
-                description "none";
-            }
-            grouping cg-eth-sls-cos-name-entry {
-                leaf uuid {
-                    type tapi-common:universal-id;
-                    description "none";
-                }
-                list cg-eth-sls-objective-and-parameters {
-                    key 'uuid';
-                    uses cg-eth-sls-objective-and-parameters;
-                    description "none";
-                }
-                description "none";
-            }
-            grouping cg-eth-sls-objective-and-parameters {
-                leaf uuid {
-                    type tapi-common:universal-id;
-                    description "none";
-                }
+            grouping cg-eth-envelope-g {
+                uses mef-common:envelope-g;
                  description "none";
              }
  
          /***********************
          * package diagrams
-        **********************/
-
-        /***********************
-        * package type-definitions
-        **********************/
-            typedef admin-state {
-                type enumeration {
-                    enum unlocked {
-                        description "The resource is administratively permitted to perform services for its users.";
-                    }
-                    enum locked {
-                        description "The resource is administratively prohibited from performing services for its users.";
-                    }
-                }
-                description "This enumeration is for Administrative states. Refer to ITU-T X.731.";
-            }
-            grouping agg-link-depth {
-                container vlan-id {
-                    uses vlan-id;
-                    description "The ingress frame Vlan ID. ";
-                }
-                leaf link-depth {
-                    type positive-integer;
-                    description "The number of links for the aggregation link.";
-                }
-                description "This is a pair of <VLAN ID, link depth> indicating that a given VLAN ID maps to a given number of links in the Port Conversation ID to Aggregation Link Map.";
-            }
-            typedef available-meg-level {
-                type enumeration {
-                    enum none {
-                        description "Indicates that SOAM EI Frames are not guaranteed to pass over this OVC at any MEG Level.";
-                    }
-                    enum 0 {
-                        description "none";
-                    }
-                    enum 1 {
-                        description "none";
-                    }
-                    enum 2 {
-                        description "none";
-                    }
-                    enum 3 {
-                        description "none";
-                    }
-                    enum 4 {
-                        description "none";
-                    }
-                    enum 5 {
-                        description "none";
-                    }
-                    enum 6 {
-                        description "none";
-                    }
-                    enum 7 {
-                        description "none";
-                    }
-                }
-                description "This enumeration is for available MEG level, can be either NONE or value 0..7.  NONE indicates that SOAM EI Frames are not guaranteed to pass over at any MEG Level.";
-            }
-            typedef connection-type {
-                type enumeration {
-                    enum point-to-point {
-                        description "none";
-                    }
-                    enum multipoint {
-                        description "none";
-                    }
-                    enum rooted-multipoint {
-                        description "none";
-                    }
-                }
-                description "This is for EVC or OVC connection types, including point to point, multi-point and rooted multi-point.";
-            }
-            typedef color-field-type {
-                type enumeration {
-                    enum pcp {
-                        description "Using PCP field to map to the color.";
-                    }
-                    enum dei {
-                        description "Using DEI field to map to the color.";
-                    }
-                    enum end-point {
-                        description "Using EVC End Point or the OVC End Point to map to the color.";
-                    }
-                    enum dscp {
-                        description "Using DSCP field to map to the color.";
-                    }
-                }
-                description "This enumeration is for selecting which frame field being used for color indication.";
-            }
-            typedef color-mode {
-                type enumeration {
-                    enum color-aware {
-                        description "none";
-                    }
-                    enum color-blind {
-                        description "none";
-                    }
-                }
-                description "This enumeration indicates whether the Color Identifier of the Service Frame is considered by the Bandwidth Profile Algorithm.";
-            }
-            grouping conversation-id-to-aggregation-link-map {
-                leaf conversation-id {
-                    type natural-number;
-                    description "The conversation ID is a Vlan ID or 0 for untagged or priority tagged frame.. ";
-                }
-                leaf-list link-id-list {
-                    type natural-number;
-                    min-elements 1;
-                    description "The link ID of the aggregation link.";
-                }
-                description "This is a Port Conversation ID to Aggregation Link Map as defined in IEEE Std 802.1AX – 2014.";
-            }
-            typedef cos-or-eec-mapping-type {
-                type enumeration {
-                    enum end-point {
-                        description "Using EVC End Point or OVC End Point to map to the CoS Name as CoS ID.";
-                    }
-                    enum pcp {
-                        description "Using PCP field to map to the CoS Name as CoS ID.";
-                    }
-                    enum dscp {
-                        description "Using DSCP field to map to the CoS Name as CoS ID.";
-                    }
-                }
-                description "This lists the Class of Service identifier type, or the Equivalence Class Identifier type. ";
-            }
-            typedef dei-or-discard {
-                type enumeration {
-                    enum discard {
-                        description "Discard the egress frame when the Egress Map determines based on CoS Name (and ingress Color).";
-                    }
-                    enum 0 {
-                        description "Set  egress frame DEI field to be 0 when the Egress Map determines based on CoS Name (and ingress Color).";
-                    }
-                    enum 1 {
-                        description "Set  egress frame DEI field to be 1 when the Egress Map determines based on CoS Name (and ingress Color).";
-                    }
-                }
-                description "This lists the DEI value for color or discard, used for Egress Map.";
-            }
-            typedef egress-map-type {
-                type enumeration {
-                    enum cn-c-tag-pcp {
-                        description "CoS Name to C-Tag PCP egress map type";
-                    }
-                    enum cc-c-tag-pcp {
-                        description "CoS Name and Color to C-Tag PCP egress map type";
-                    }
-                    enum cc-c-tag-dei {
-                        description "CoS Name and Color to C-Tag DEI egress map type";
-                    }
-                    enum cn-s-tag-pcp {
-                        description "CoS Name to S-Tag PCP egress map type";
-                    }
-                    enum cc-s-tag-pcp {
-                        description "CoS Name and Color to S-Tag PCP egress map type";
-                    }
-                    enum cc-s-tag-dei {
-                        description "CoS Name and Color to S-Tag DEI egress map type";
-                    }
-                }
-                description "This lists the Egress Map types, either CoS Name to PCP, or CoS Name and Ingress Color to PCP, or  CoS Name and Ingress Color to DEI for S-Tag or C-Tag.";
-            }
-            typedef ethernet-frame-format {
-                type enumeration {
-                    enum ethernet {
-                        description "none";
-                    }
-                }
-                description "This is a single value read only attribute. Keep this in the info model just because MEF 10.3 lists it as a service attribute.";
-            }
-            typedef evc-end-point-role {
-                type enumeration {
-                    enum root {
-                        description "EVC End Point has role of root for the EVC.";
-                    }
-                    enum leaf {
-                        description "EVC End Point has role of leaf for the EVC.";
-                    }
-                }
-                description "The value indicates how external interface frames mapped to the  EVC End Point can be forwarded.";
-            }
-            typedef frame-color {
-                type enumeration {
-                    enum green {
-                        description "none";
-                    }
-                    enum yellow {
-                        description "none";
-                    }
-                }
-                description "Frame color is either Green or Yellow.";
-            }
-            typedef frame-delivery {
-                type enumeration {
-                    enum discard {
-                        description "Frame must be discarded.";
-                    }
-                    enum conditionally {
-                        description "Frame will be delivered with specified condition.";
-                    }
-                    enum unconditionally {
-                        description "Frame will be delivered unconditionally.";
-                    }
-                }
-                description "Service frame delivery defined in MEF 10.3. When the value is conditionally, the specific condition has to be addresses by the users. What conditions should be supported are not in the scope.";
-            }
-            typedef identifier45 {
-                type string;
-                description "Unique by network administrative domain, containing no more than 45 characters and non-null RFC Display String but not contain the characters 0x00 through 0x1f.";
-            }
-            typedef identifier90 {
-                type string;
-                description "Unique by network administrative domain, containing no more than 90 characters and non-null RFC Display String but not contain the characters 0x00 through 0x1f.";
-            }
-            typedef interface-resiliency {
-                type enumeration {
-                    enum none {
-                        description "none";
-                    }
-                    enum 2-link-active-standby {
-                        description "none";
-                    }
-                    enum all-active {
-                        description "none";
-                    }
-                    enum other {
-                        description "none";
-                    }
-                }
-                description "The method for protection, if any, against a physical link failure. Refer to MEF 10.3.2 and MEF 26.2.";
-            }
-            typedef ip-version {
-                type enumeration {
-                    enum ipv4 {
-                        description "none";
-                    }
-                    enum ipv6 {
-                        description "none";
-                    }
-                    enum ipv4-and-ipv6 {
-                        description "none";
-                    }
-                }
-                description "This enumeration lists the IP versions, including IPv4, IPv6 and both.";
-            }
-            typedef l2cp-address-set {
-                type enumeration {
-                    enum cta {
-                        description "CE-Vlan Tag Aware";
-                    }
-                    enum ctb {
-                        description "CE-Vlan Tag Blind";
-                    }
-                    enum ctb2 {
-                        description "CE-Vlan Tag Blind option 2";
-                    }
-                }
-                description "This lists the L2CP Address Set. Refer to MEF 45.";
-            }
-            grouping l2cp-peering {
-                container protocol-id {
-                    uses l2cp-protocol;
-                    description "This is a L2CP Protocol Identifier.";
-                }
-                leaf destination-address {
-                    type natural-number;
-                    description "This is a Mac Address.";
-                }
-                leaf-list link-id-list {
-                    type positive-integer;
-                    description "It is possible that a protocol (e.g. ESMC) could operate on some, but not all, of the physical
-                        links. When linkId is not listed, the protocol peering applies to all members of the aggregation link.";
-                }
-                description "This is a list specifies the L2CP Protocol Identifier and the Destination Address in use by the protocol entity.";
-            }
-            grouping l2cp-protocol {
-                leaf l2cp-protocol-type {
-                    type l2cp-protocol-type;
-                    description "This attribute specifies the type of L2CP protocol, i.e., LLC or EtherType.";
-                }
-                leaf llc-address-or-ether-type {
-                    type natural-number;
-                    description "This attribute specifies the LLC address or the EtherType value.";
-                }
-                leaf sub-type {
-                    type natural-number;
-                    description "This attribute specifies the subtype of the L2CP protocol.";
-                }
-                description "This data type defines a L2CP protocol (LLC address type or EtherType) with possible subtype.";
-            }
-            typedef l2cp-protocol-type {
-                type enumeration {
-                    enum ethertype {
-                        description "EtherType for L2CP, e.g., LLDP (0x88CC).";
-                    }
-                    enum llc {
-                        description "Logical Link Control sublayer address for L2CP, e.g., STP (0x42).";
-                    }
-                }
-                description "This lists the L2CP protocol types, either EtherType, or LLC Address.";
-            }
-            typedef mep-direction {
-                type enumeration {
-                    enum down {
-                        description "none";
-                    }
-                    enum up {
-                        description "none";
-                    }
-                }
-                description "This is for MEP direction, either Down MEP or Up MEP.";
-            }
-            grouping mep-level-and-direction {
-                leaf level {
-                    type natural-number;
-                    description "This is the MEG level, value between 0..7.";
-                }
-                leaf direction {
-                    type mep-direction;
-                    description "This is MEP direction, UP or DOWN.";
-                }
-                description "This complex data type includes MEG LEVEL and MEP direction.";
-            }
-            typedef natural-number {
-                type uint64;
-                description "An integer >=0";
-            }
-            typedef operational-state {
-                type enumeration {
-                    enum enabled {
-                        description "none";
-                    }
-                    enum disabled {
-                        description "none";
-                    }
-                }
-                description "This enumeration is for Operational states. Refer to ITU-T X.731.";
-            }
-            typedef ovc-end-point-map-form {
-                type enumeration {
-                    enum form-e {
-                        description "OVC End Point Map for ENNI.";
-                    }
-                    enum form-v {
-                        description "OVC End Point Map for VUNI.";
-                    }
-                    enum form-u {
-                        description "OVC End Point Map for UNI.";
-                    }
-                    enum form-t {
-                        description "OVC End Point Map for Trunk.";
-                    }
-                }
-                description "The OVC End Point Map types, for ENNI (FORM E), for UNI (FORM U), for VUNI (FORM V), or for Trunk (FORM T).";
-            }
-            typedef ovc-end-point-role {
-                type enumeration {
-                    enum root {
-                        description "OVC End Point has role of root for the OVC.";
-                    }
-                    enum leaf {
-                        description "OVC End Point has role of leaf for the OVC.";
-                    }
-                    enum trunk {
-                        description "OVC End Point has role of trunk for the OVC.";
-                    }
-                }
-                description "The value indicates how external interface frames mapped to the  OVC End Point can be forwarded.";
-            }
-            typedef pcp-or-discard {
-                type enumeration {
-                    enum discard {
-                        description "none";
-                    }
-                    enum 0 {
-                        description "none";
-                    }
-                    enum 1 {
-                        description "none";
-                    }
-                    enum 2 {
-                        description "none";
-                    }
-                    enum 3 {
-                        description "none";
-                    }
-                    enum 4 {
-                        description "none";
-                    }
-                    enum 5 {
-                        description "none";
-                    }
-                    enum 6 {
-                        description "none";
-                    }
-                    enum 7 {
-                        description "none";
-                    }
-                }
-                description "This enumeration lists one of PCP values or DISCARD.";
-            }
-            typedef percentage {
-                type uint64;
-                description "Data type for percentage, 0%-100%.";
-            }
-            typedef physical-layer {
-                type enumeration {
-                    enum 10base2 {
-                        description "none";
-                    }
-                    enum 10base5 {
-                        description "none";
-                    }
-                    enum 10base-f {
-                        description "none";
-                    }
-                    enum 10base-fb {
-                        description "none";
-                    }
-                    enum 10base-fl {
-                        description "none";
-                    }
-                    enum 10base-fp {
-                        description "none";
-                    }
-                    enum 10base-t {
-                        description "none";
-                    }
-                    enum 10base-te {
-                        description "none";
-                    }
-                    enum 10broad36 {
-                        description "none";
-                    }
-                    enum 10pass-ts {
-                        description "none";
-                    }
-                    enum 100base-bx10 {
-                        description "none";
-                    }
-                    enum 100base-fx {
-                        description "none";
-                    }
-                    enum 100base-lx10 {
-                        description "none";
-                    }
-                    enum 100base-t {
-                        description "none";
-                    }
-                    enum 100base-t2 {
-                        description "none";
-                    }
-                    enum 100base-t4 {
-                        description "none";
-                    }
-                    enum 100base-tx {
-                        description "none";
-                    }
-                    enum 100base-x {
-                        description "none";
-                    }
-                    enum 1000base-bx10 {
-                        description "none";
-                    }
-                    enum 1000base-cx {
-                        description "none";
-                    }
-                    enum 1000base-kx {
-                        description "none";
-                    }
-                    enum 1000base-lx {
-                        description "none";
-                    }
-                    enum 1000base-lx10 {
-                        description "none";
-                    }
-                    enum 1000base-px10 {
-                        description "none";
-                    }
-                    enum 1000base-px20 {
-                        description "none";
-                    }
-                    enum 1000base-sx {
-                        description "none";
-                    }
-                    enum 1000base-t {
-                        description "none";
-                    }
-                    enum 1000base-x {
-                        description "none";
-                    }
-                    enum 10gbase-cx4 {
-                        description "none";
-                    }
-                    enum 10gbase-e {
-                        description "none";
-                    }
-                    enum 10gbase-er {
-                        description "none";
-                    }
-                    enum 10gbase-ew {
-                        description "none";
-                    }
-                    enum 10gbase-kr {
-                        description "none";
-                    }
-                    enum 10gbase-kx4 {
-                        description "none";
-                    }
-                    enum 10gbase-l {
-                        description "none";
-                    }
-                    enum 10gbase-lr {
-                        description "none";
-                    }
-                    enum 10gbase-lrm {
-                        description "none";
-                    }
-                    enum 10gbase-lw {
-                        description "none";
-                    }
-                    enum 10gbase-lx4 {
-                        description "none";
-                    }
-                    enum 10gbase-pr {
-                        description "none";
-                    }
-                    enum 10gbase-prx {
-                        description "none";
-                    }
-                    enum 10gbase-r {
-                        description "none";
-                    }
-                    enum 10gbase-s {
-                        description "none";
-                    }
-                    enum 10gbase-sr {
-                        description "none";
-                    }
-                    enum 10gbase-sw {
-                        description "none";
-                    }
-                    enum 10gbase-t {
-                        description "none";
-                    }
-                    enum 10gbase-w {
-                        description "none";
-                    }
-                    enum 10gbase-x {
-                        description "none";
-                    }
-                    enum 100gbase-r {
-                        description "none";
-                    }
-                    enum 100gbase-cr10 {
-                        description "none";
-                    }
-                    enum 100gbase-er4 {
-                        description "none";
-                    }
-                    enum 100gbase-lr4 {
-                        description "none";
-                    }
-                    enum 100gbase-sr10 {
-                        description "none";
-                    }
-                    enum 40gbase-r {
-                        description "none";
-                    }
-                    enum 40gbase-cr4 {
-                        description "none";
-                    }
-                    enum 40gbase--fr {
-                        description "none";
-                    }
-                    enum 40gbase-kr4 {
-                        description "none";
-                    }
-                    enum 40gbase-lr4 {
-                        description "none";
-                    }
-                    enum 40gbase-sr4 {
-                        description "none";
-                    }
-                    enum 1base5 {
-                        description "none";
-                    }
-                    enum 2base-tl {
-                        description "none";
-                    }
-                    enum 1g-epon {
-                        description "none";
-                    }
-                    enum 10g-epon {
-                        description "none";
-                    }
-                    enum 10-1g-epon {
-                        description "none";
-                    }
-                    enum 10-10g-epon {
-                        description "none";
-                    }
-                    enum other {
-                        description "none";
-                    }
-                    enum none {
-                        description "none";
-                    }
-                }
-                description "IEEE802.3 (2012) defined list excluding 1000BASE-PX-D and 1000BASE-PX-U. NONE is added with further MEF 10.3 discussion, for supporting logical interfaces.";
-            }
-            grouping physical-layer-per-link {
-                leaf link-id {
-                    type natural-number;
-                    description "This is the link ID.";
-                }
-                leaf physical-layer {
-                    type physical-layer;
-                    description "This is the physical layer. IEEE802.3 (2012) defined.";
-                }
-                description "A link may consist of one or more physical ports. This data type includes the link ID and the physical port associated to the link Id.";
-            }
-            typedef pm-metric-type {
-                type enumeration {
-                    enum fd {
-                        description "Frame Delay Performance Metric.";
-                    }
-                    enum fdr {
-                        description "Frame Delay Range Performance Metric.";
-                    }
-                    enum mfd {
-                        description "Mean Frame Delay Performance Metric.";
-                    }
-                    enum ifdv {
-                        description "Inter Frame Delay Variation Performance Metric.";
-                    }
-                    enum flr {
-                        description "Frame Loss Ratio Performance Metric.";
-                    }
-                    enum av {
-                        description "Availability Performance Metric.";
-                    }
-                    enum hli {
-                        description "High Loss Interval Performance Metric.";
-                    }
-                    enum chli {
-                        description "Consecutive High Loss Interval Performance Metric.";
-                    }
-                    enum group-av {
-                        description "Group Availability (for a single EVC/OVC) Performance Metric.";
-                    }
-                    enum cpm {
-                        description "Composite Performance Metric. Refer to MEF 10.3.1.";
-                    }
-                }
-                description "This enumeration provides the list of PM Metric types, including FD, MFD, FDR, IFDV, FLR, AV, HLI, CHLI, GROUP_AV, and CPM.";
-            }
-            typedef pm-unit {
-                type enumeration {
-                    enum millisecond {
-                        description "Measured Performance Metric in PM report as milliseconds, for FD, FDR, IFDV, and MFD.";
-                    }
-                    enum count {
-                        description "Measured Performance Metric in PM report as count number, for HLI and CHLI.";
-                    }
-                    enum percent {
-                        description "Measured Performance Metric in PM report as percentage, for FLR, Availability, Group Availability and Composite PM.";
-                    }
-                }
-                description "PM Unit, used for pairing with Value in data type PmUnitAndValue. Can be second, millisecond, micro second, etc. ";
-            }
-            grouping pm-unit-and-value {
-                leaf pm-unit {
-                    type pm-unit;
-                    description "This attribute denotes the 'unit',  e.g., MILLISECOND, COUNT or PERCENT.";
-                }
-                leaf delay-value {
-                    type uint64;
-                    description "This attribute denotes the delay value only when the PmUnit=SECOND. It is for FD, FDR, MFD, IFDV.";
-                }
-                leaf count-value {
-                    type natural-number;
-                    description "This attribute denotes the count value only when the PmUnit=COUNT. It is for HLI and CHLI.";
-                }
-                leaf percent-value {
-                    type percentage;
-                    description "This attribute denotes the percentage value only when the PmUnit=PERCENT. It is for FLR, AV, GROUP_AV and CPM.";
-                }
-                description "This data type provides the pair of <unit, value> where the unit can be ms (for frame delay), number (for HLI), and value is the correspondent value for that unit.";
-            }
-            typedef positive-integer {
-                type uint64;
-                description "An integer >0";
-            }
-            typedef service-state {
-                type enumeration {
-                    enum pending {
-                        description "none";
-                    }
-                    enum active {
-                        description "none";
-                    }
-                    enum inactive {
-                        description "none";
-                    }
-                }
-                description "This enumeration is for Service State.";
-            }
-            grouping source-mac-address-limit {
-                leaf limit {
-                    type natural-number;
-                    description "This attribute denotes the maximum acceptable source MAC addresses.";
-                }
-                leaf time-interval {
-                    type natural-number;
-                    description "This attribute denotes the time interval in milliseconds.";
-                }
-                description "This limits the number of source MAC Addresses that can be used in ingress external interface frames mapped to the End Point of all types over a time interval.";
-            }
-            typedef svlan-id-control {
-                type enumeration {
-                    enum full {
-                        description "Operator can support only a single SP/SO (Service Provider/Super Operator) at the ENNI.";
-                    }
-                    enum partial {
-                        description "Operator can support only multiple SP/SO (Service Provider/Super Operator) at the ENNI";
-                    }
-                }
-                description "This lists the S Vlan ID Control, either FULL or PARTIAL.";
-            }
-            grouping sync-mode-per-link {
-                leaf link-id {
-                    type natural-number;
-                    description "This is the link ID of the link in the Aggregation Link.";
-                }
-                leaf sync-mode-enabled {
-                    type boolean;
-                    description "This attribute denotes whether the Synchronous Mode is enabled (on the link with the Link ID).";
-                }
-                description "A link may consist of one or more physical ports. This data type includes the link ID and the sync mode of the physical port associated to the link Id.";
-            }
-            typedef tagged-l2cp-processing {
-                type enumeration {
-                    enum 802-1-compliant {
-                        description "none";
-                    }
-                    enum 802-1-non-compliant {
-                        description "none";
-                    }
-                }
-                description "Either 802.1 compliant or not. Refer to MEF 45.";
-            }
-            grouping time-and-date {
-                leaf year {
-                    type positive-integer;
-                    description "This denotes the year.";
-                }
-                leaf month {
-                    type positive-integer;
-                    description "This denotes the month.";
-                }
-                leaf day {
-                    type positive-integer;
-                    description "This denotes the day.";
-                }
-                leaf hour {
-                    type natural-number;
-                    description "This denotes the hour.";
-                }
-                leaf minute {
-                    type natural-number;
-                    description "This denotes the minute.";
-                }
-                leaf second {
-                    type natural-number;
-                    description "This denotes the second.";
-                }
-                description "This data type is for Time and Date in UTC.";
-            }
-            grouping time-interval-t {
-                leaf unit {
-                    type time-interval-unit;
-                    description "Month, week, day, hour, etc.";
-                }
-                leaf number {
-                    type positive-integer;
-                    description "This denotes the value (for the unit), e.g., 1 (month), 20 (day), etc.";
-                }
-                description "Time interval T for PM. E.g., 1 month, 20 days, 2 weeks, etc.";
-            }
-            typedef time-interval-unit {
-                type enumeration {
-                    enum year {
-                        description "none";
-                    }
-                    enum month {
-                        description "none";
-                    }
-                    enum week {
-                        description "none";
-                    }
-                    enum day {
-                        description "none";
-                    }
-                    enum hour {
-                        description "none";
-                    }
-                    enum minute {
-                        description "none";
-                    }
-                    enum second {
-                        description "none";
-                    }
-                }
-                description "Time interval unit, e.g., month, day, week, hour, etc.";
-            }
-            grouping vlan-id {
-                leaf vlan-id {
-                    type positive-integer;
-                    description "This is the Vlan ID value.";
-                }
-                description "This is for VLAN ID from 1 to 4094";
-            }
-            typedef vlan-id-mapping-type {
-                type enumeration {
-                    enum all {
-                        description "All Vlan IDs.";
-                    }
-                    enum except {
-                        description "All Vlan IDs except the listed.";
-                    }
-                    enum list {
-                        description "List of Vlan IDs.";
-                    }
-                }
-                description "Vlan ID types, ALL for all vlan IDs, LIST for a list of Vlan IDs, EXCEPT for all Vlan IDs except the listed. ";
-            }
-            typedef vlan-id-preservation {
-                type enumeration {
-                    enum preserve {
-                        description "To achieve EVC CE-VLAN ID Preservation.";
-                    }
-                    enum retain {
-                        description "C-Tag, if present, is encapsulated with the C-Tag VLAN ID value retained.";
-                    }
-                    enum strip {
-                        description "C-Tag is discarded.";
-                    }
-                }
-                description "This is for Vlan ID Preservation. Refer to MEF 26.2 section 12.7.";
-            }
-            grouping vlan-id-listing {
-                leaf type {
-                    type vlan-id-mapping-type;
-                    description "Can be LIST, or ALL, or EXCEPT.";
-                }
-                list vlan-id-list {
-                    key 'vlan-id';
-                    uses vlan-id;
-                    description "This is a list of Vlan IDs.";
-                }
-                description "The list VLAN IDs, either when type=LIST, or when type==EXCEPT (which means the VLAN IDs except the listed). When type=ALL, the vlanId list is not applicable.";
-            }
-            typedef vlan-tag {
-                type enumeration {
-                    enum s-tag {
-                        description "none";
-                    }
-                    enum c-tag {
-                        description "none";
-                    }
-                }
-                description "This is for Vlan Tag type, i.e., S-tag or C-tag.";
-            }
+        **********************/ 
  
  
  }
diff --git a/nrp-api/src/main/yang/nrp-interface.yang b/nrp-api/src/main/yang/nrp-interface.yang

index a230cd3ffaaea942082411c7ebdaa6b30588541f..037b64632c3c943c8fd6c7e29b8b38c48063d4a8 100644 (file)
--- a/nrp-api/src/main/yang/nrp-interface.yang
+++ b/nrp-api/src/main/yang/nrp-interface.yang
@@ -13,108 +13,94 @@ module nrp-interface {
      organization "Metro Ethernet Forum (MEF)";
      contact "MEF";
      description "none";
-    revision 2017-02-27 {
+    revision 2017-05-31 {
          description "MEF NRP 1.0.alpha";
          reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020 and RFC 6087";
      }
-    augment "/tapi-common:context/tapi-common:service-interface-point/tapi-common:layer-protocol" {
-        uses nrp-layer-protocol-attrs;
-        description "none";
-    }
-    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:input" {
-        uses nrp-create-connectivity-service-attrs;
-        description "none";
+    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {
+        uses nrp-connectivity-service-end-point-attrs-g;
+            description "none";
      }
      augment "/tapi-common:context/tapi-connectivity:connectivity-service" {
-        uses nrp-connectivity-service-attrs;
-        description "none";
+        uses nrp-connectivity-service-attrs-g;
+            description "none";
+    }
+    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {
+        uses nrp-connectivity-service-end-point-attrs-g;
+            description "none";
      }
      augment "/tapi-common:context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point" {
-        uses nrp-connectivity-service-end-point-attrs;
-        description "none";
+        uses nrp-connectivity-service-end-point-attrs-g;
+            description "none";
+    }
+    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:input" {
+        uses nrp-connectivity-service-attrs-g;
+            description "none";
+    }
+    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:output/tapi-connectivity:service" {
+        uses nrp-connectivity-service-attrs-g;
+            description "none";
+    }
+    augment "/tapi-common:context/tapi-common:service-interface-point/tapi-common:layer-protocol" {
+        uses nrp-layer-protocol-attrs-g;
+            description "none";
      }
      augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {
-        uses nrp-create-connectivity-service-end-point-attrs;
-        description "none";
+        uses nrp-layer-protocol-attrs-g;
+            description "none";
      }
      /***********************
      * package diagrams
-    **********************/
+    **********************/ 
  
      /***********************
      * package object-classes
-    **********************/
-        grouping nrp-cg-eth-uni-spec {
-            uses nrm-connectivity:cg-eth-uni-spec;
+    **********************/ 
+        grouping nrp-cg-eth-uni-spec-g {
+            uses nrm-connectivity:cg-eth-uni-spec-g;
              description "none";
          }
-        grouping nrp-cg-eth-inni-spec {
-            uses nrm-connectivity:cg-eth-inni-spec;
+        grouping nrp-cg-eth-inni-spec-g {
+            uses nrm-connectivity:cg-eth-inni-spec-g;
              description "none";
          }
-        grouping nrp-cg-eth-frame-flow-cpa-aspec {
-            uses nrm-connectivity:cg-eth-frame-flow-cpa-aspec;
+        grouping nrp-cg-eth-frame-flow-spec-g {
+            uses nrm-connectivity:cg-eth-frame-flow-spec-g;
              description "none";
          }
-        grouping nrp-cg-eth-conn-serv-spec {
-            uses nrm-connectivity:cg-eth-conn-serv-spec;
+        grouping nrp-cg-eth-conn-serv-spec-g {
+            uses nrm-connectivity:cg-eth-conn-serv-spec-g;
              description "none";
          }
-        grouping nrp-cg-eth-enni-spec {
-            uses nrm-connectivity:cg-eth-enni-spec;
+        grouping nrp-cg-eth-enni-spec-g {
+            uses nrm-connectivity:cg-eth-enni-spec-g;
              description "none";
          }
-        grouping nrp-layer-protocol-attrs {
+        grouping nrp-layer-protocol-attrs-g {
              container nrp-cg-eth-uni-spec {
-                uses nrp-cg-eth-uni-spec;
+                uses nrp-cg-eth-uni-spec-g;
                  description "none";
              }
              container nrp-cg-eth-inni-spec {
-                uses nrp-cg-eth-inni-spec;
+                uses nrp-cg-eth-inni-spec-g;
                  description "none";
              }
              container nrp-cg-eth-enni-spec {
-                uses nrp-cg-eth-enni-spec;
+                uses nrp-cg-eth-enni-spec-g;
                  description "none";
              }
              description "none";
          }
-        grouping nrp-create-connectivity-service-attrs {
+        grouping nrp-connectivity-service-attrs-g {
              container nrp-cg-eth-conn-serv-spec {
-                uses nrp-cg-eth-conn-serv-spec;
+                uses nrp-cg-eth-conn-serv-spec-g;
                  description "none";
              }
              description "none";
          }
-        grouping nrp-connectivity-service-attrs {
-            container nrp-cg-eth-conn-serv-spec {
-                uses nrp-cg-eth-conn-serv-spec;
-                description "none";
-            }
-            description "none";
-        }
-        grouping nrp-connectivity-service-end-point-attrs {
-            container nrp-cg-eth-frame-flow-cpa-aspec {
-                uses nrp-cg-eth-frame-flow-cpa-aspec;
-                description "none";
-            }
-            description "none";
-        }
-        grouping nrp-create-connectivity-service-end-point-attrs {
-            container nrp-cg-eth-frame-flow-cpa-aspec {
-                uses nrp-cg-eth-frame-flow-cpa-aspec;
-                description "none";
-            }
-            container nrp-cg-eth-enni-spec {
-                uses nrp-cg-eth-enni-spec;
-                description "none";
-            }
-            container nrp-cg-eth-inni-spec {
-                uses nrp-cg-eth-inni-spec;
-                description "none";
-            }
-            container nrp-cg-eth-uni-spec {
-                uses nrp-cg-eth-uni-spec;
+        grouping nrp-connectivity-service-end-point-attrs-g {
+            container nrp-cg-eth-frame-flow-spec {
+                uses nrp-cg-eth-frame-flow-spec-g;
                  description "none";
              }
              description "none";
diff --git a/nrp-api/src/main/yang/tapi-common.yang b/nrp-api/src/main/yang/tapi-common.yang

index 57db2f2b03a01c647f514d0063bbdf2f0ab1b190..1bd5fc38cf1ca980a04ae434fb72b0bd749f5580 100644 (file)
--- a/nrp-api/src/main/yang/tapi-common.yang
+++ b/nrp-api/src/main/yang/tapi-common.yang
@@ -4,14 +4,14 @@ module tapi-common {
      organization "Metro Ethernet Forum (MEF)";
      contact "MEF";
      description "none";
-    revision 2017-02-27 {
+    revision 2017-05-31 {
          description "MEF NRP 1.0.alpha";
          reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020 and RFC 6087";
      }
      /***********************
      * package object-classes
-    **********************/
-        grouping admin-state-pac {
+    **********************/ 
+        grouping admin-state-pac-g {
              leaf administrative-state {
                  type administrative-state;
                  description "none";
@@ -26,7 +26,7 @@ module tapi-common {
              }
              description "Provides state attributes that are applicable to an entity that can be administered. Such an entity also has operational and lifecycle aspects.";
          }
-        grouping global-class {
+        grouping global-class-g {
              leaf uuid {
                  type universal-id;
                  description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. An UUID carries no semantics with respect to the purpose or state of the entity.
@@ -36,17 +36,17 @@ module tapi-common {
              }
              list name {
                  key 'value-name';
-                uses name-and-value;
+                uses name-and-value-g;
                  description "List of names. A property of an entity with a value that is unique in some namespace but may change during the life of the entity. A name carries no semantics with respect to the purpose of the entity.";
              }
              list label {
                  key 'value-name';
-                uses name-and-value;
+                uses name-and-value-g;
                  description "List of labels.A property of an entity with a value that is not expected to be unique and is allowed to change. A label carries no semantics with respect to the purpose of the entity and has no effect on the entity behavior or state.";
              }
              description "The TAPI GlobalComponent serves as the super class for all TAPI entities that can be directly retrieved by their ID. As such, these are first class entities and their ID is expected to be globally unique. ";
          }
-        grouping layer-protocol {
+        grouping layer-protocol-g {
              leaf layer-protocol-name {
                  type layer-protocol-name;
                  description "Indicate the specific layer-protocol described by the LayerProtocol entity.";
@@ -62,31 +62,31 @@ module tapi-common {
                  type termination-state;
                  description "Indicates whether the layer is terminated and if so how.";
              }
-            uses local-class;
+            uses local-class-g;
              description "Each transport layer is represented by a LayerProtocol (LP) instance. The LayerProtocol instances it can be used for controlling termination and monitoring functionality. 
                  It can also be used for controlling the adaptation (i.e. encapsulation and/or multiplexing of client signal), tandem connection monitoring, traffic conditioning and/or shaping functionality at an intermediate point along a connection. 
                  Where the client – server relationship is fixed 1:1 and immutable, the layers can be encapsulated in a single LTP instance. Where the is a n:1 relationship between client and server, the layers must be split over two separate instances of LTP. ";
          }
-        grouping lifecycle-state-pac {
+        grouping lifecycle-state-pac-g {
              leaf lifecycle-state {
                  type lifecycle-state;
                  description "none";
              }
              description "Provides state attributes for an entity that has lifeccycle aspects only.";
          }
-        grouping local-class {
+        grouping local-class-g {
              leaf local-id {
                  type string;
                  description "none";
              }
              list name {
                  key 'value-name';
-                uses name-and-value;
+                uses name-and-value-g;
                  description "List of names. A property of an entity with a value that is unique in some namespace but may change during the life of the entity. A name carries no semantics with respect to the purpose of the entity.";
              }
              description "The TAPI GlobalComponent serves as the super class for all TAPI entities that can be directly retrieved by their ID. As such, these are first class entities and their ID is expected to be globally unique. ";
          }
-        grouping operational-state-pac {
+        grouping operational-state-pac-g {
              leaf operational-state {
                  type operational-state;
                  description "none";
@@ -97,7 +97,7 @@ module tapi-common {
              }
              description "Provides state attributes that are applicable to an entity that reflects operational aspects. Such an entity is expected to also have lifecycle aspects.";
          }
-        grouping time-range {
+        grouping time-range-g {
              leaf end-time {
                  type date-and-time;
                  description "none";
@@ -109,38 +109,38 @@ module tapi-common {
              description "none";
          }
          container context {
-            uses context-attrs;
+            uses context-g;
              description "none";
          }
-        grouping context-attrs {
+        grouping context-g {
              list service-interface-point {
                  key 'uuid';
                  config false;
-                uses service-interface-point;
+                uses service-interface-point-g;
                  description "none";
              }
-            uses global-class;
+            uses global-class-g;
              description "The Network Control Domain (NCD) object class represents the scope of control that a particular SDN controller has with respect to a particular network, (i.e., encompassing a designated set of interconnected (virtual) network elements).";
          }
-        grouping resource-spec {
-            uses global-class;
+        grouping resource-spec-g {
+            uses global-class-g;
              description "none";
          }
-        grouping service-spec {
-            uses global-class;
+        grouping service-spec-g {
+            uses global-class-g;
              description "none";
          }
-        grouping service-interface-point {
+        grouping service-interface-point-g {
              list layer-protocol {
                  key 'local-id';
                  config false;
                  min-elements 1;
-                uses layer-protocol;
+                uses layer-protocol-g;
                  description "none";
              }
              container state {
                  config false;
-                uses lifecycle-state-pac;
+                uses lifecycle-state-pac-g;
                  description "none";
              }
              leaf direction {
@@ -148,14 +148,14 @@ module tapi-common {
                  config false;
                  description "none";
              }
-            uses resource-spec;
+            uses resource-spec-g;
              description "The LogicalTerminationPoint (LTP) object class encapsulates the termination and adaptation functions of one or more transport layers. 
                  The structure of LTP supports all transport protocols including circuit and packet forms.";
          }
  
      /***********************
      * package type-definitions
-    **********************/
+    **********************/ 
          typedef administrative-state {
              type enumeration {
                  enum locked {
@@ -246,8 +246,8 @@ module tapi-common {
                  }
                  enum potential {
                      description "The supporting resources are present in the network but are shared with other clients; or require further configuration before they can be used; or both.
-                        o    When a potential resource is configured and allocated to a client it is moved to the 'installed' state for that client.
-                        o    If the potential resource has been consumed (e.g. allocated to another client) it is moved to the 'planned' state for all other clients.";
+                        o    When a potential resource is configured and allocated to a client it is moved to the “installed” state for that client.
+                        o    If the potential resource has been consumed (e.g. allocated to another client) it is moved to the “planned” state for all other clients.";
                  }
                  enum installed {
                      description "The resource is present in the network and is capable of providing the service expected.";
@@ -258,7 +258,7 @@ module tapi-common {
              }
              description "The possible values of the lifecycleState.";
          }
-        grouping name-and-value {
+        grouping name-and-value-g {
              leaf value-name {
                  type string;
                  description "The name of the value. The value need not have a name.";
@@ -380,7 +380,7 @@ module tapi-common {
  
      /***********************
      * package interfaces
-    **********************/
+    **********************/ 
          rpc get-service-interface-point-details {
              description "none";
              input {
@@ -391,7 +391,7 @@ module tapi-common {
              }
              output {
                  container sip {
-                    uses service-interface-point;
+                    uses service-interface-point-g;
                      description "none";
                  }
              }
@@ -400,7 +400,7 @@ module tapi-common {
              description "none";
              output {
                  list sip {
-                    uses service-interface-point;
+                    uses service-interface-point-g;
                      description "none";
                  }
              }
diff --git a/nrp-api/src/main/yang/tapi-connectivity.yang b/nrp-api/src/main/yang/tapi-connectivity.yang

index f30fe28a7adc3caff659f821e65820d13fcae160..f7250ab9b548e609b354eae9cff612d9e12ee8ab 100644 (file)
--- a/nrp-api/src/main/yang/tapi-connectivity.yang
+++ b/nrp-api/src/main/yang/tapi-connectivity.yang
@@ -13,29 +13,29 @@ module tapi-connectivity {
      organization "Metro Ethernet Forum (MEF)";
      contact "MEF";
      description "none";
-    revision 2017-02-27 {
+    revision 2017-05-31 {
          description "MEF NRP 1.0.alpha";
          reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020 and RFC 6087";
      }
      augment "/tapi-common:context" {
-        uses connectivity-context;
-        description "none";
+        uses connectivity-context-g;
+            description "Augments the base TAPI Context with ConnectivityService information";
      }
      /***********************
      * package object-classes
-    **********************/
-        grouping connection {
+    **********************/ 
+        grouping connection-g {
              list connection-end-point {
                  key 'uuid';
                  config false;
                  min-elements 2;
-                uses connection-end-point;
+                uses connection-end-point-g;
                  description "none";
              }
              list route {
                  key 'local-id';
                  config false;
-                uses route;
+                uses route-g;
                  description "none";
              }
              leaf node {
@@ -48,12 +48,12 @@ module tapi-connectivity {
              list switch-control {
                  key 'local-id';
                  config false;
-                uses switch-control;
+                uses switch-control-g;
                  description "none";
              }
              container state {
                  config false;
-                uses tapi-common:operational-state-pac;
+                uses tapi-common:operational-state-pac-g;
                  description "none";
              }
              leaf layer-protocol-name {
@@ -66,16 +66,16 @@ module tapi-connectivity {
                  config false;
                  description "none";
              }
-            uses tapi-common:resource-spec;
+            uses tapi-common:resource-spec-g;
              description "The ForwardingConstruct (FC) object class models enabled potential for forwarding between two or more LTPs and like the LTP supports any transport protocol including all circuit and packet forms.
                  At the lowest level of recursion, a FC represents a cross-connection within an NE.";
          }
-        grouping connection-end-point {
+        grouping connection-end-point-g {
              list layer-protocol {
                  key 'local-id';
                  config false;
                  min-elements 1;
-                uses tapi-common:layer-protocol;
+                uses tapi-common:layer-protocol-g;
                  description "none";
              }
              leaf-list client-node-edge-point {
@@ -101,7 +101,7 @@ module tapi-connectivity {
              }
              container state {
                  config false;
-                uses tapi-common:operational-state-pac;
+                uses tapi-common:operational-state-pac-g;
                  description "none";
              }
              leaf termination-direction {
@@ -119,11 +119,11 @@ module tapi-connectivity {
                  config false;
                  description "Each EP of the FC has a role (e.g., working, protection, protected, symmetric, hub, spoke, leaf, root)  in the context of the FC with respect to the FC function. ";
              }
-            uses tapi-common:resource-spec;
+            uses tapi-common:resource-spec-g;
              description "The LogicalTerminationPoint (LTP) object class encapsulates the termination and adaptation functions of one or more transport layers. 
                  The structure of LTP supports all transport protocols including circuit and packet forms.";
          }
-        grouping connectivity-constraint {
+        grouping connectivity-constraint-g {
              leaf service-type {
                  type service-type;
                  config false;
@@ -136,19 +136,19 @@ module tapi-connectivity {
              }
              container requested-capacity {
                  config false;
-                uses tapi-topology:capacity;
+                uses tapi-topology:capacity-g;
                  description "none";
              }
              list cost-characteristic {
                  key 'cost-name cost-value cost-algorithm';
                  config false;
-                uses tapi-topology:cost-characteristic;
+                uses tapi-topology:cost-characteristic-g;
                  description "The list of costs where each cost relates to some aspect of the TopologicalEntity.";
              }
              list latency-characteristic {
                  key 'traffic-property-name traffic-property-queing-latency';
                  config false;
-                uses tapi-topology:latency-characteristic;
+                uses tapi-topology:latency-characteristic-g;
                  description "The effect on the latency of a queuing process. This only has significant effect for packet based systems and has a complex characteristic.";
              }
              leaf coroute-inclusion {
@@ -165,10 +165,10 @@ module tapi-connectivity {
                  config false;
                  description "none";
              }
-            uses tapi-common:local-class;
+            uses tapi-common:local-class-g;
              description "none";
          }
-        grouping connectivity-service {
+        grouping connectivity-service-g {
              leaf-list connection {
                  type leafref {
                      path '/tapi-common:context/tapi-connectivity:connection/tapi-connectivity:uuid';
@@ -179,23 +179,23 @@ module tapi-connectivity {
              list end-point {
                  key 'local-id';
                  min-elements 2;
-                uses connectivity-service-end-point;
+                uses connectivity-service-end-point-g;
                  description "none";
              }
              container conn-constraint {
-                uses connectivity-constraint;
+                uses connectivity-constraint-g;
                  description "none";
              }
              container topo-constraint {
-                uses topology-constraint;
+                uses topology-constraint-g;
                  description "none";
              }
              container schedule {
-                uses tapi-common:time-range;
+                uses tapi-common:time-range-g;
                  description "none";
              }
              container state {
-                uses tapi-common:admin-state-pac;
+                uses tapi-common:admin-state-pac-g;
                  description "none";
              }
              leaf direction {
@@ -206,11 +206,11 @@ module tapi-connectivity {
                  type tapi-common:layer-protocol-name;
                  description "none";
              }
-            uses tapi-common:service-spec;
+            uses tapi-common:service-spec-g;
              description "The ForwardingConstruct (FC) object class models enabled potential for forwarding between two or more LTPs and like the LTP supports any transport protocol including all circuit and packet forms.
                  At the lowest level of recursion, a FC represents a cross-connection within an NE.";
          }
-        grouping connectivity-service-end-point {
+        grouping connectivity-service-end-point-g {
              leaf service-interface-point {
                  type leafref {
                      path '/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid';
@@ -233,7 +233,7 @@ module tapi-connectivity {
                  config false;
                  description "none";
              }
-            uses tapi-common:local-class;
+            uses tapi-common:local-class-g;
              description "The association of the FC to LTPs is made via EndPoints.
                  The EndPoint (EP) object class models the access to the FC function. 
                  The traffic forwarding between the associated EPs of the FC depends upon the type of FC and may be associated with FcSwitch object instances.  
@@ -242,7 +242,7 @@ module tapi-connectivity {
                  The EP replaces the Protection Unit of a traditional protection model. 
                  The ForwadingConstruct can be considered as a component and the EndPoint as a Port on that component";
          }
-        grouping route {
+        grouping route-g {
              leaf-list lower-connection {
                  type leafref {
                      path '/tapi-common:context/tapi-connectivity:connection/tapi-connectivity:uuid';
@@ -251,26 +251,26 @@ module tapi-connectivity {
                  min-elements 1;
                  description "none";
              }
-            uses tapi-common:local-class;
+            uses tapi-common:local-class-g;
              description "The FC Route (FcRoute) object class models the individual routes of an FC. 
                  The route of an FC object is represented by a list of FCs at a lower level. 
                  Note that depending on the service supported by an FC, an the FC can have multiple routes.";
          }
-        grouping connectivity-context {
+        grouping connectivity-context-g {
              list connectivity-service {
                  key 'uuid';
-                uses connectivity-service;
+                uses connectivity-service-g;
                  description "none";
              }
              list connection {
                  key 'uuid';
                  config false;
-                uses connection;
+                uses connection-g;
                  description "none";
              }
              description "none";
          }
-        grouping switch {
+        grouping switch-g {
              leaf-list selected-connection-end-point {
                  type leafref {
                      path '/tapi-common:context/tapi-connectivity:connection/tapi-connectivity:connection-end-point/tapi-connectivity:uuid';
@@ -298,7 +298,7 @@ module tapi-connectivity {
                  type tapi-common:port-direction;
                  description "Indicates whether the switch selects from ingress to the FC or to egress of the FC, or both.";
              }
-            uses tapi-common:local-class;
+            uses tapi-common:local-class-g;
              description "The class models the switched forwarding of traffic (traffic flow) between FcPorts (ConnectionEndPoints) and is present where there is protection functionality in the FC (Connection). 
                  If an FC exposes protection (having two or more FcPorts that provide alternative identical inputs/outputs), the FC will have one or more associated FcSwitch objects to represent the alternative flow choices visible at the edge of the FC.
                  The FC switch represents and defines a protection switch structure encapsulated in the FC. 
@@ -312,7 +312,7 @@ module tapi-connectivity {
                  The ability for a Switch to be 'high impedance' allows bidirectional ForwardingConstructs to be overlaid on the same bidirectional LTP where the appropriate control is enabled to prevent signal conflict.
                  This ability allows multiple alternate routes to be present that otherwise would be in conflict.";
          }
-        grouping switch-control {
+        grouping switch-control-g {
              leaf-list sub-switch-control {
                  type leafref {
                      path '/tapi-common:context/tapi-connectivity:connection/tapi-connectivity:switch-control/tapi-connectivity:local-id';
@@ -321,17 +321,17 @@ module tapi-connectivity {
              }
              list switch {
                  key 'local-id';
-                uses switch;
+                uses switch-g;
                  description "none";
              }
              container control-parameters {
-                uses control-parameters-pac;
+                uses control-parameters-pac-g;
                  description "none";
              }
-            uses tapi-common:local-class;
+            uses tapi-common:local-class-g;
              description "Represents the capability to control and coordinate switches, to add/delete/modify FCs and to add/delete/modify LTPs/LPs so as to realize a protection scheme.";
          }
-        grouping control-parameters-pac {
+        grouping control-parameters-pac-g {
              leaf prot-type {
                  type protection-type;
                  description "Indicates the protection scheme that is used for the ProtectionGroup.";
@@ -363,7 +363,7 @@ module tapi-connectivity {
              }
              description "A list of control parameters to apply to a switch.";
          }
-        grouping topology-constraint {
+        grouping topology-constraint-g {
              leaf-list include-topology {
                  type leafref {
                      path '/tapi-common:context/tapi-topology:topology/tapi-topology:uuid';
@@ -411,13 +411,13 @@ module tapi-connectivity {
                  config false;
                  description "soft constraint requested by client to indicate the layer(s) of transport connection that it prefers to carry the service. This could be same as the service layer or one of the supported server layers";
              }
-            uses tapi-common:local-class;
+            uses tapi-common:local-class-g;
              description "none";
          }
  
      /***********************
      * package type-definitions
-    **********************/
+    **********************/ 
          typedef service-type {
              type enumeration {
                  enum point-to-point-connectivity {
@@ -503,7 +503,7 @@ module tapi-connectivity {
  
      /***********************
      * package interfaces
-    **********************/
+    **********************/ 
          rpc get-connection-details {
              description "none";
              input {
@@ -518,7 +518,7 @@ module tapi-connectivity {
              }
              output {
                  container connection {
-                    uses connection;
+                    uses connection-g;
                      description "none";
                  }
              }
@@ -527,7 +527,7 @@ module tapi-connectivity {
              description "none";
              output {
                  list service {
-                    uses connectivity-service;
+                    uses connectivity-service-g;
                      description "none";
                  }
              }
@@ -542,7 +542,7 @@ module tapi-connectivity {
              }
              output {
                  container service {
-                    uses connectivity-service;
+                    uses connectivity-service-g;
                      description "none";
                  }
              }
@@ -552,29 +552,29 @@ module tapi-connectivity {
              input {
                  list end-point {
                      min-elements 2;
-                    uses connectivity-service-end-point;
+                    uses connectivity-service-end-point-g;
                      description "none";
                  }
                  container conn-constraint {
-                    uses connectivity-constraint;
+                    uses connectivity-constraint-g;
                      description "none";
                  }
                  container topo-constraint {
-                    uses topology-constraint;
+                    uses topology-constraint-g;
                      description "none";
                  }
-                leaf schedule {
-                    type string;
+                container schedule {
+                    uses tapi-common:time-range-g;
                      description "none";
                  }
-                leaf state {
-                    type string;
+                container state {
+                    uses tapi-common:admin-state-pac-g;
                      description "none";
                  }
              }
              output {
                  container service {
-                    uses connectivity-service;
+                    uses connectivity-service-g;
                      description "none";
                  }
              }
@@ -587,29 +587,29 @@ module tapi-connectivity {
                      description "none";
                  }
                  container end-point {
-                    uses connectivity-service-end-point;
+                    uses connectivity-service-end-point-g;
                      description "none";
                  }
                  container conn-constraint {
-                    uses connectivity-constraint;
+                    uses connectivity-constraint-g;
                      description "none";
                  }
                  container topo-constraint {
-                    uses topology-constraint;
+                    uses topology-constraint-g;
                      description "none";
                  }
-                leaf schedule {
-                    type string;
+                container schedule {
+                    uses tapi-common:time-range-g;
                      description "none";
                  }
-                leaf state {
-                    type string;
+                container state {
+                    uses tapi-common:admin-state-pac-g;
                      description "none";
                  }
              }
              output {
                  container service {
-                    uses connectivity-service;
+                    uses connectivity-service-g;
                      description "none";
                  }
              }
@@ -624,7 +624,7 @@ module tapi-connectivity {
              }
              output {
                  container service {
-                    uses connectivity-service;
+                    uses connectivity-service-g;
                      description "none";
                  }
              }
diff --git a/nrp-api/src/main/yang/tapi-path-computation.yang b/nrp-api/src/main/yang/tapi-path-computation.yang

index 3fc373a939f0404af4642f58df30172118129fb9..10920ce24174b7a29c295abb2494fb0f29fd8417 100644 (file)
--- a/nrp-api/src/main/yang/tapi-path-computation.yang
+++ b/nrp-api/src/main/yang/tapi-path-computation.yang
@@ -10,18 +10,18 @@ module tapi-path-computation {
      organization "Metro Ethernet Forum (MEF)";
      contact "MEF";
      description "none";
-    revision 2017-02-27 {
+    revision 2017-05-31 {
          description "MEF NRP 1.0.alpha";
          reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020 and RFC 6087";
      }
      augment "/tapi-common:context" {
-        uses path-computation-context;
-        description "none";
+        uses path-computation-context-g;
+            description "Augments the base TAPI Context with PathComputationService information";
      }
      /***********************
      * package object-classes
-    **********************/
-        grouping path {
+    **********************/ 
+        grouping path-g {
              leaf-list link {
                  type leafref {
                      path '/tapi-common:context/tapi-topology:topology/tapi-topology:link/tapi-topology:uuid';
@@ -32,13 +32,13 @@ module tapi-path-computation {
              }
              container routing-constraint {
                  config false;
-                uses routing-constraint;
+                uses routing-constraint-g;
                  description "none";
              }
-            uses tapi-common:resource-spec;
+            uses tapi-common:resource-spec-g;
              description "Path is described by an ordered list of TE Links. A TE Link is defined by a pair of Node/NodeEdgePoint IDs. A Connection is realized by concatenating link resources (associated with a Link) and the lower-level connections (cross-connections) in the different nodes";
          }
-        grouping path-service-end-point {
+        grouping path-service-end-point-g {
              leaf service-interface-point {
                  type leafref {
                      path '/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid';
@@ -61,16 +61,16 @@ module tapi-path-computation {
                  config false;
                  description "none";
              }
-            uses tapi-common:local-class;
+            uses tapi-common:local-class-g;
              description "The association of the FC to LTPs is made via EndPoints.
-                The EndPoint (EP) object class models the access to the FC function.
-                The traffic forwarding between the associated EPs of the FC depends upon the type of FC and may be associated with FcSwitch object instances.
-                In cases where there is resilience the EndPoint may convey the resilience role of the access to the FC.
+                The EndPoint (EP) object class models the access to the FC function. 
+                The traffic forwarding between the associated EPs of the FC depends upon the type of FC and may be associated with FcSwitch object instances.  
+                In cases where there is resilience the EndPoint may convey the resilience role of the access to the FC. 
                  It can represent a protected (resilient/reliable) point or a protecting (unreliable working or protection) point.
-                The EP replaces the Protection Unit of a traditional protection model.
+                The EP replaces the Protection Unit of a traditional protection model. 
                  The ForwadingConstruct can be considered as a component and the EndPoint as a Port on that component";
          }
-        grouping path-computation-service {
+        grouping path-computation-service-g {
              leaf-list path {
                  type leafref {
                      path '/tapi-common:context/tapi-path-computation:path/tapi-path-computation:uuid';
@@ -79,29 +79,29 @@ module tapi-path-computation {
                  min-elements 1;
                  description "none";
              }
-            list service-port {
+            list end-point {
                  key 'local-id';
                  min-elements 2;
                  max-elements 2;
-                uses path-service-end-point;
+                uses path-service-end-point-g;
                  description "none";
              }
              container routing-constraint {
-                uses routing-constraint;
+                uses routing-constraint-g;
                  description "none";
              }
              container objective-function {
-                uses path-objective-function;
+                uses path-objective-function-g;
                  description "none";
              }
              container optimization-constraint {
-                uses path-optimization-constraint;
+                uses path-optimization-constraint-g;
                  description "none";
              }
-            uses tapi-common:service-spec;
+            uses tapi-common:service-spec-g;
              description "none";
          }
-        grouping path-objective-function {
+        grouping path-objective-function-g {
              leaf bandwidth-optimization {
                  type tapi-common:directive-value;
                  config false;
@@ -127,22 +127,22 @@ module tapi-path-computation {
                  config false;
                  description "none";
              }
-            uses tapi-common:local-class;
+            uses tapi-common:local-class-g;
              description "none";
          }
-        grouping path-optimization-constraint {
+        grouping path-optimization-constraint-g {
              leaf traffic-interruption {
                  type tapi-common:directive-value;
                  config false;
                  description "none";
              }
-            uses tapi-common:local-class;
+            uses tapi-common:local-class-g;
              description "none";
          }
-        grouping routing-constraint {
+        grouping routing-constraint-g {
              container requested-capacity {
                  config false;
-                uses tapi-topology:capacity;
+                uses tapi-topology:capacity-g;
                  description "none";
              }
              leaf service-level {
@@ -158,13 +158,13 @@ module tapi-path-computation {
              list cost-characteristic {
                  key 'cost-name cost-value cost-algorithm';
                  config false;
-                uses tapi-topology:cost-characteristic;
+                uses tapi-topology:cost-characteristic-g;
                  description "The list of costs where each cost relates to some aspect of the TopologicalEntity.";
              }
              list latency-characteristic {
                  key 'traffic-property-name traffic-property-queing-latency';
                  config false;
-                uses tapi-topology:latency-characteristic;
+                uses tapi-topology:latency-characteristic-g;
                  description "The effect on the latency of a queuing process. This only has significant effect for packet based systems and has a complex characteristic.";
              }
              leaf-list include-topology {
@@ -181,19 +181,19 @@ module tapi-path-computation {
                  config false;
                  description "none";
              }
-            uses tapi-common:local-class;
+            uses tapi-common:local-class-g;
              description "none";
          }
-        grouping path-computation-context {
+        grouping path-computation-context-g {
              list path-comp-service {
                  key 'uuid';
-                uses path-computation-service;
+                uses path-computation-service-g;
                  description "none";
              }
              list path {
                  key 'uuid';
                  config false;
-                uses path;
+                uses path-g;
                  description "none";
              }
              description "none";
@@ -201,28 +201,28 @@ module tapi-path-computation {
  
      /***********************
      * package interfaces
-    **********************/
+    **********************/ 
          rpc compute-p2ppath {
              description "none";
              input {
                  list sep {
                      min-elements 2;
                      max-elements 2;
-                    uses path-service-end-point;
+                    uses path-service-end-point-g;
                      description "none";
                  }
                  container routing-constraint {
-                    uses routing-constraint;
+                    uses routing-constraint-g;
                      description "none";
                  }
                  container objective-function {
-                    uses path-objective-function;
+                    uses path-objective-function-g;
                      description "none";
                  }
              }
              output {
                  container service {
-                    uses path-computation-service;
+                    uses path-computation-service-g;
                      description "none";
                  }
              }
@@ -235,21 +235,21 @@ module tapi-path-computation {
                      description "none";
                  }
                  container routing-constraint {
-                    uses routing-constraint;
+                    uses routing-constraint-g;
                      description "none";
                  }
                  container optimization-constraint {
-                    uses path-optimization-constraint;
+                    uses path-optimization-constraint-g;
                      description "none";
                  }
                  container objective-function {
-                    uses path-objective-function;
+                    uses path-objective-function-g;
                      description "none";
                  }
              }
              output {
                  container service {
-                    uses path-computation-service;
+                    uses path-computation-service-g;
                      description "none";
                  }
              }
@@ -264,7 +264,7 @@ module tapi-path-computation {
              }
              output {
                  container service {
-                    uses path-computation-service;
+                    uses path-computation-service-g;
                      description "none";
                  }
              }
diff --git a/nrp-api/src/main/yang/tapi-topology.yang b/nrp-api/src/main/yang/tapi-topology.yang

index 634d1be5b15e13aeea11020013b0fe3e29ef1ef1..b522383e53335408aae557bb598d56108d7ba519 100644 (file)
--- a/nrp-api/src/main/yang/tapi-topology.yang
+++ b/nrp-api/src/main/yang/tapi-topology.yang
@@ -7,18 +7,18 @@ module tapi-topology {
      organization "Metro Ethernet Forum (MEF)";
      contact "MEF";
      description "none";
-    revision 2017-02-27 {
+    revision 2017-05-31 {
          description "MEF NRP 1.0.alpha";
          reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020 and RFC 6087";
      }
      augment "/tapi-common:context" {
-        uses topology-context;
-        description "none";
+        uses topology-context-g;
+            description "Augments the base TAPI Context with TopologyService information";
      }
      /***********************
      * package object-classes
-    **********************/
-        grouping link {
+    **********************/ 
+        grouping link-g {
              leaf-list node-edge-point {
                  type leafref {
                      path '/tapi-common:context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid';
@@ -37,42 +37,42 @@ module tapi-topology {
              }
              container state {
                  config false;
-                uses tapi-common:admin-state-pac;
+                uses tapi-common:admin-state-pac-g;
                  description "none";
              }
              container transfer-capacity {
                  config false;
-                uses transfer-capacity-pac;
+                uses transfer-capacity-pac-g;
                  description "none";
              }
              container transfer-cost {
                  config false;
-                uses transfer-cost-pac;
+                uses transfer-cost-pac-g;
                  description "none";
              }
              container transfer-integrity {
                  config false;
-                uses transfer-integrity-pac;
+                uses transfer-integrity-pac-g;
                  description "none";
              }
              container transfer-timing {
                  config false;
-                uses transfer-timing-pac;
+                uses transfer-timing-pac-g;
                  description "none";
              }
              container risk-parameter {
                  config false;
-                uses risk-parameter-pac;
+                uses risk-parameter-pac-g;
                  description "none";
              }
              container validation {
                  config false;
-                uses validation-pac;
+                uses validation-pac-g;
                  description "none";
              }
              container lp-transition {
                  config false;
-                uses layer-protocol-transition-pac;
+                uses layer-protocol-transition-pac-g;
                  description "none";
              }
              leaf-list layer-protocol-name {
@@ -88,14 +88,14 @@ module tapi-topology {
                      Is applicable to simple Links where all LinkEnds are BIDIRECTIONAL (the Link will be BIDIRECTIONAL) or UNIDIRECTIONAL (the Link will be UNIDIRECTIONAL). 
                      Is not present in more complex cases.";
              }
-            uses tapi-common:resource-spec;
+            uses tapi-common:resource-spec-g;
              description "The Link object class models effective adjacency between two or more ForwardingDomains (FD). ";
          }
-        grouping node {
+        grouping node-g {
              list owned-node-edge-point {
                  key 'uuid';
                  config false;
-                uses node-edge-point;
+                uses node-edge-point-g;
                  description "none";
              }
              leaf-list aggregated-node-edge-point {
@@ -105,6 +105,11 @@ module tapi-topology {
                  config false;
                  description "none";
              }
+            list node-rule-group {
+                key 'uuid';
+                uses node-rule-group-g;
+                description "none";
+            }
              leaf encap-topology {
                  type leafref {
                      path '/tapi-common:context/tapi-topology:topology/tapi-topology:uuid';
@@ -114,27 +119,27 @@ module tapi-topology {
              }
              container state {
                  config false;
-                uses tapi-common:admin-state-pac;
+                uses tapi-common:admin-state-pac-g;
                  description "none";
              }
              container transfer-capacity {
                  config false;
-                uses transfer-capacity-pac;
+                uses transfer-capacity-pac-g;
                  description "none";
              }
              container transfer-cost {
                  config false;
-                uses transfer-cost-pac;
+                uses transfer-cost-pac-g;
                  description "none";
              }
              container transfer-integrity {
                  config false;
-                uses transfer-integrity-pac;
+                uses transfer-integrity-pac-g;
                  description "none";
              }
              container transfer-timing {
                  config false;
-                uses transfer-timing-pac;
+                uses transfer-timing-pac-g;
                  description "none";
              }
              leaf-list layer-protocol-name {
@@ -143,21 +148,21 @@ module tapi-topology {
                  min-elements 1;
                  description "none";
              }
-            uses tapi-common:resource-spec;
-            description "The ForwardingDomain (FD) object class models the 'ForwardingDomain' topological component which is used to effect forwarding of transport characteristic information and offers the potential to enable forwarding.
+            uses tapi-common:resource-spec-g;
+            description "The ForwardingDomain (FD) object class models the “ForwardingDomain” topological component which is used to effect forwarding of transport characteristic information and offers the potential to enable forwarding. 
                  At the lowest level of recursion, an FD (within a network element (NE)) represents a switch matrix (i.e., a fabric). Note that an NE can encompass multiple switch matrices (FDs). ";
          }
-        grouping topology {
+        grouping topology-g {
              list node {
                  key 'uuid';
                  config false;
-                uses node;
+                uses node-g;
                  description "none";
              }
              list link {
                  key 'uuid';
                  config false;
-                uses link;
+                uses link-g;
                  description "none";
              }
              leaf-list layer-protocol-name {
@@ -166,11 +171,11 @@ module tapi-topology {
                  min-elements 1;
                  description "none";
              }
-            uses tapi-common:resource-spec;
-            description "The ForwardingDomain (FD) object class models the 'ForwardingDomain' topological component which is used to effect forwarding of transport characteristic information and offers the potential to enable forwarding.
+            uses tapi-common:resource-spec-g;
+            description "The ForwardingDomain (FD) object class models the “ForwardingDomain” topological component which is used to effect forwarding of transport characteristic information and offers the potential to enable forwarding. 
                  At the lowest level of recursion, an FD (within a network element (NE)) represents a switch matrix (i.e., a fabric). Note that an NE can encompass multiple switch matrices (FDs). ";
          }
-        grouping layer-protocol-transition-pac {
+        grouping layer-protocol-transition-pac-g {
              leaf-list transitioned-layer-protocol-name {
                  type string;
                  min-elements 2;
@@ -182,12 +187,12 @@ module tapi-topology {
                  This Pac provides the relevant abstractions of the LTPs and provides the necessary association to the LTPs involved.
                  Links that included details in this Pac are often referred to as Transitional Links.";
          }
-        grouping node-edge-point {
+        grouping node-edge-point-g {
              list layer-protocol {
                  key 'local-id';
                  config false;
                  min-elements 1;
-                uses tapi-common:layer-protocol;
+                uses tapi-common:layer-protocol-g;
                  description "none";
              }
              leaf-list aggregated-node-edge-point {
@@ -205,7 +210,7 @@ module tapi-topology {
              }
              container state {
                  config false;
-                uses tapi-common:admin-state-pac;
+                uses tapi-common:admin-state-pac-g;
                  description "none";
              }
              leaf termination-direction {
@@ -223,16 +228,16 @@ module tapi-topology {
                  config false;
                  description "Each LinkEnd of the Link has a role (e.g., symmetric, hub, spoke, leaf, root)  in the context of the Link with respect to the Link function. ";
              }
-            uses tapi-common:resource-spec;
+            uses tapi-common:resource-spec-g;
              description "The LogicalTerminationPoint (LTP) object class encapsulates the termination and adaptation functions of one or more transport layers. 
                  The structure of LTP supports all transport protocols including circuit and packet forms.";
          }
-        grouping risk-parameter-pac {
+        grouping risk-parameter-pac-g {
              list risk-characteristic {
                  key 'risk-characteristic-name';
                  config false;
                  min-elements 1;
-                uses risk-characteristic;
+                uses risk-characteristic-g;
                  description "A list of risk characteristics for consideration in an analysis of shared risk. Each element of the list represents a specific risk consideration.";
              }
              description "The risk characteristics of a TopologicalEntity come directly from the underlying physical realization. 
@@ -248,21 +253,21 @@ module tapi-topology {
                  Shared risk between two TopologicalEntities compromises the integrity of any solution that use one of those TopologicalEntity as a backup for the other.
                  Where two TopologicalEntities have a common risk characteristic they have an elevated probability of failing simultaneously compared to two TopologicalEntities that do not share risk characteristics.";
          }
-        grouping transfer-capacity-pac {
+        grouping transfer-capacity-pac-g {
              container total-potential-capacity {
                  config false;
-                uses capacity;
+                uses capacity-g;
                  description "An optimistic view of the capacity of the TopologicalEntity assuming that any shared capacity is available to be taken.";
              }
              container available-capacity {
                  config false;
-                uses capacity;
+                uses capacity-g;
                  description "Capacity available to be assigned.";
              }
              list capacity-assigned-to-user-view {
                  key 'total-size';
                  config false;
-                uses capacity;
+                uses capacity-g;
                  description "Capacity already assigned";
              }
              leaf capacity-interaction-algorithm {
@@ -277,12 +282,12 @@ module tapi-topology {
                  Represents the capacity available to user (client) along with client interaction and usage. 
                  A TopologicalEntity may reflect one or more client protocols and one or more members for each profile.";
          }
-        grouping transfer-cost-pac {
+        grouping transfer-cost-pac-g {
              list cost-characteristic {
                  key 'cost-name cost-value cost-algorithm';
                  config false;
                  min-elements 1;
-                uses cost-characteristic;
+                uses cost-characteristic-g;
                  description "The list of costs where each cost relates to some aspect of the TopologicalEntity.";
              }
              description "The cost characteristics of a TopologicalEntity not necessarily correlated to the cost of the underlying physical realization. 
@@ -290,7 +295,7 @@ module tapi-topology {
                  There may be many perspectives from which cost may be considered  for a particular TopologicalEntity and hence many specific costs and potentially cost algorithms. 
                  Using an entity will incur a cost. ";
          }
-        grouping transfer-integrity-pac {
+        grouping transfer-integrity-pac-g {
              leaf error-characteristic {
                  type string;
                  config false;
@@ -329,27 +334,27 @@ module tapi-topology {
                  It includes all aspects of possible degradation of signal content as well as any damage of any form to the total TopologicalEntity and to the carried signals.
                  Note that the statement is of total impact to the TopologicalEntity so any partial usage of the TopologicalEntity (e.g. a signal that does not use full capacity) will only suffer its portion of the impact.";
          }
-        grouping transfer-timing-pac {
+        grouping transfer-timing-pac-g {
              list latency-characteristic {
                  key 'traffic-property-name traffic-property-queing-latency';
                  config false;
                  min-elements 1;
-                uses latency-characteristic;
+                uses latency-characteristic-g;
                  description "The effect on the latency of a queuing process. This only has significant effect for packet based systems and has a complex characteristic.";
              }
              description "A TopologicalEntity will suffer effects from the underlying physical realization related to the timing of the information passed by the TopologicalEntity.";
          }
-        grouping validation-pac {
+        grouping validation-pac-g {
              list validation-mechanism {
                  key 'validation-mechanism layer-protocol-adjacency-validated validation-robustness';
                  config false;
                  min-elements 1;
-                uses validation-mechanism;
+                uses validation-mechanism-g;
                  description "Provides details of the specific validation mechanism(s) used to confirm the presence of an intended topologicalEntity.";
              }
              description "Validation covers the various adjacenct discovery and reachability verification protocols. Also may cover Information source and degree of integrity.";
          }
-        grouping network-topology-service {
+        grouping network-topology-service-g {
              leaf-list topology {
                  type leafref {
                      path '/tapi-common:context/tapi-topology:topology/tapi-topology:uuid';
@@ -357,28 +362,121 @@ module tapi-topology {
                  config false;
                  description "none";
              }
-            uses tapi-common:service-spec;
+            uses tapi-common:service-spec-g;
              description "none";
          }
-        grouping topology-context {
+        grouping topology-context-g {
              container nw-topology-service {
                  config false;
-                uses network-topology-service;
+                uses network-topology-service-g;
                  description "none";
              }
              list topology {
                  key 'uuid';
                  config false;
-                uses topology;
+                uses topology-g;
+                description "none";
+            }
+            description "none";
+        }
+        grouping inter-rule-group-g {
+            list rule {
+                key 'local-id';
+                min-elements 1;
+                uses rule-g;
+                description "none";
+            }
+            leaf-list associated-node-rule-group {
+                type leafref {
+                    path '/tapi-common:context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid';
+                }
+                min-elements 2;
+                description "none";
+            }
+            container transfer-capacity {
+                uses transfer-capacity-pac-g;
+                description "none";
+            }
+            container transfer-cost {
+                uses transfer-cost-pac-g;
+                description "none";
+            }
+            container transfer-timing {
+                uses transfer-timing-pac-g;
+                description "none";
+            }
+            container risk-parameter {
+                uses risk-parameter-pac-g;
                  description "none";
              }
+            uses tapi-common:resource-spec-g;
+            description "none";
+        }
+        grouping node-rule-group-g {
+            list rule {
+                key 'local-id';
+                min-elements 1;
+                uses rule-g;
+                description "none";
+            }
+            leaf-list node-edge-point {
+                type leafref {
+                    path '/tapi-common:context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid';
+                }
+                min-elements 1;
+                description "none";
+            }
+            leaf-list node-rule-group {
+                type leafref {
+                    path '/tapi-common:context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid';
+                }
+                description "none";
+            }
+            list inter-rule-group {
+                key 'uuid';
+                uses inter-rule-group-g;
+                description "none";
+            }
+            container transfer-capacity {
+                uses transfer-capacity-pac-g;
+                description "none";
+            }
+            container transfer-cost {
+                uses transfer-cost-pac-g;
+                description "none";
+            }
+            container transfer-timing {
+                uses transfer-timing-pac-g;
+                description "none";
+            }
+            container risk-parameter {
+                uses risk-parameter-pac-g;
+                description "none";
+            }
+            uses tapi-common:resource-spec-g;
+            description "none";
+        }
+        grouping rule-g {
+            leaf rule-type {
+                type rule-type;
+                description "none";
+            }
+            leaf forwarding-rule {
+                type forwarding-rule;
+                description "none";
+            }
+            leaf override-priority {
+                type uint64;
+                description "none";
+            }
+            uses tapi-common:local-class-g;
              description "none";
          }
  
      /***********************
      * package type-definitions
-    **********************/
-        grouping capacity {
+    **********************/ 
+        grouping capacity-g {
              leaf total-size {
                  type fixed-capacity-value;
                  description "Total capacity of the TopologicalEntity in MB/s";
@@ -413,7 +511,7 @@ module tapi-topology {
              }
              description "Information on capacity of a particular TopologicalEntity.";
          }
-        grouping cost-characteristic {
+        grouping cost-characteristic-g {
              leaf cost-name {
                  type string;
                  description "The cost characteristic will related to some aspect of the TopologicalEntity (e.g. $ cost, routing weight). This aspect will be conveyed by the costName.";
@@ -463,7 +561,7 @@ module tapi-topology {
              }
              description "The Capacity (Bandwidth) values that are applicable for digital layers. ";
          }
-        grouping latency-characteristic {
+        grouping latency-characteristic-g {
              leaf fixed-latency-characteristic {
                  type string;
                  config false;
@@ -491,7 +589,7 @@ module tapi-topology {
              }
              description "Provides information on latency characteristic for a particular stated trafficProperty.";
          }
-        grouping risk-characteristic {
+        grouping risk-characteristic-g {
              leaf risk-characteristic-name {
                  type string;
                  description "The name of the risk characteristic. The characteristic may be related to a specific degree of closeness. 
@@ -505,7 +603,7 @@ module tapi-topology {
              }
              description "The information for a particular risk characteristic where there is a list of risk identifiers related to that characteristic.";
          }
-        grouping validation-mechanism {
+        grouping validation-mechanism-g {
              leaf validation-mechanism {
                  type string;
                  description "Name of mechanism used to validate adjacency";
@@ -540,10 +638,50 @@ module tapi-topology {
              }
              description "none";
          }
+        typedef forwarding-rule {
+            type enumeration {
+                enum may-forward-across-group {
+                    description "none";
+                }
+                enum must-forward-across-group {
+                    description "none";
+                }
+                enum cannot-forward-across-group {
+                    description "none";
+                }
+                enum no-statement-on-forwarding {
+                    description "none";
+                }
+            }
+            description "none";
+        }
+        typedef rule-type {
+            type enumeration {
+                enum forwarding {
+                    description "none";
+                }
+                enum capacity {
+                    description "none";
+                }
+                enum cost {
+                    description "none";
+                }
+                enum timing {
+                    description "none";
+                }
+                enum risk {
+                    description "none";
+                }
+                enum grouping {
+                    description "none";
+                }
+            }
+            description "none";
+        }
  
      /***********************
      * package interfaces
-    **********************/
+    **********************/ 
          rpc get-topology-details {
              description "none";
              input {
@@ -554,7 +692,7 @@ module tapi-topology {
              }
              output {
                  container topology {
-                    uses topology;
+                    uses topology-g;
                      description "none";
                  }
              }
@@ -573,7 +711,7 @@ module tapi-topology {
              }
              output {
                  container node {
-                    uses node;
+                    uses node-g;
                      description "none";
                  }
              }
@@ -596,7 +734,7 @@ module tapi-topology {
              }
              output {
                  container node-edge-point {
-                    uses node-edge-point;
+                    uses node-edge-point-g;
                      description "none";
                  }
              }
@@ -615,7 +753,7 @@ module tapi-topology {
              }
              output {
                  container link {
-                    uses link;
+                    uses link-g;
                      description "none";
                  }
              }
@@ -624,7 +762,7 @@ module tapi-topology {
              description "none";
              output {
                  list topology {
-                    uses topology;
+                    uses topology-g;
                      description "none";
                  }
              }
diff --git a/nrp-api/src/main/yang/unimgr-ext.yang b/nrp-api/src/main/yang/unimgr-ext.yang

index 26ef787dd9c8a5bb7bfa545b045db941548dd184..ce03d49aea93a3ee70e41528b55e2b5d7c9f73e2 100644 (file)
--- a/nrp-api/src/main/yang/unimgr-ext.yang
+++ b/nrp-api/src/main/yang/unimgr-ext.yang
@@ -28,15 +28,15 @@ module unimgr-ext {
              }
              choice sip-type {
                  container uni-spec {
-                    uses nrp-interface:nrp-cg-eth-uni-spec;
+                    uses nrp-interface:nrp-cg-eth-uni-spec-g;
                      description "none";
                  }
                  container inni-spec {
-                    uses nrp-interface:nrp-cg-eth-inni-spec;
+                    uses nrp-interface:nrp-cg-eth-inni-spec-g;
                      description "none";
                  }
                  container enni-spec {
-                    uses nrp-interface:nrp-cg-eth-enni-spec;
+                    uses nrp-interface:nrp-cg-eth-enni-spec-g;
                      description "none";
                  }
              }
diff --git a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorHelper.java b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorHelper.java

index 55d9c840f0ea1b538fb6fa16eae09b7ae55716ab..6a5e1c8e459b0f00f006c7ffa724ee6a4f91694d 100644 (file)
--- a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorHelper.java
+++ b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorHelper.java
@@ -7,23 +7,23 @@
   */
  package org.opendaylight.unimgr.mef.nrp.ovs.activator;
  
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
  import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
  import org.opendaylight.unimgr.mef.nrp.common.ResourceNotAvailableException;
  import org.opendaylight.unimgr.mef.nrp.ovs.exception.VlanNotSetException;
  import org.opendaylight.unimgr.mef.nrp.ovs.transaction.TopologyTransaction;
  import org.opendaylight.unimgr.mef.nrp.ovs.util.VlanUtils;
  import org.opendaylight.unimgr.utils.NullAwareDatastoreGetter;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.nrp.create.connectivity.service.end.point.attrs.NrpCgEthFrameFlowCpaAspec;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.nrp.connectivity.service.end.point.attrs.g.NrpCgEthFrameFlowSpec;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
  /**
   * Helper class for OvsDriver activation.
   *
@@ -55,17 +55,17 @@ class OvsActivatorHelper {
       */
      int getCeVlanId() throws ResourceNotAvailableException {
  
-        if( (endPoint.getAttrs() != null) && (endPoint.getAttrs().getNrpCgEthFrameFlowCpaAspec()!=null) ){
-            NrpCgEthFrameFlowCpaAspec attr = endPoint.getAttrs().getNrpCgEthFrameFlowCpaAspec();
-            if( (attr.getCeVlanIdList()!=null) && !(attr.getCeVlanIdList().getVlanIdList().isEmpty()) ){
+        if( (endPoint.getAttrs() != null) && (endPoint.getAttrs().getNrpCgEthFrameFlowSpec()!=null) ){
+            NrpCgEthFrameFlowSpec attr = endPoint.getAttrs().getNrpCgEthFrameFlowSpec();
+            if( (attr.getCeVlanIdListOrUntag()!=null) && !(attr.getCeVlanIdListOrUntag().getVlanIdList().isEmpty()) ){
                  //for now we support only one CE VLAN
-                return attr.getCeVlanIdList().getVlanIdList().get(0).getVlanId().getValue().intValue();
+                return attr.getCeVlanIdListOrUntag().getVlanIdList().get(0).getVlanId().getValue().intValue();
              } else {
                  LOG.warn(String.format(CTAG_VLAN_ID_NOT_SET_ERROR_MESSAGE, tpName));
                  throw new VlanNotSetException(String.format(CTAG_VLAN_ID_NOT_SET_ERROR_MESSAGE, tpName));
              }
          } else {
-            String className = NrpCgEthFrameFlowCpaAspec.class.toString();
+            String className = NrpCgEthFrameFlowSpec.class.toString();
              LOG.warn(String.format(ATTRS_NOT_SET_ERROR_MESSAGE, tpName, className));
              throw new ResourceNotAvailableException(String.format(ATTRS_NOT_SET_ERROR_MESSAGE, tpName, className));
          }
diff --git a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/driver/OvsDriver.java b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/driver/OvsDriver.java

index 1eb0f2bbb6d45c924db04f35a353a1315de96498..375b5838d92e62c21c3becfce700734f62dd4614 100644 (file)
--- a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/driver/OvsDriver.java
+++ b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/driver/OvsDriver.java
@@ -7,6 +7,9 @@
   */
  package org.opendaylight.unimgr.mef.nrp.ovs.driver;
  
+import java.util.List;
+import java.util.Optional;
+
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
  import org.opendaylight.unimgr.mef.nrp.api.ActivationDriver;
@@ -15,11 +18,8 @@ import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
  import org.opendaylight.unimgr.mef.nrp.common.ResourceNotAvailableException;
  import org.opendaylight.unimgr.mef.nrp.ovs.activator.OvsActivator;
  import org.opendaylight.unimgr.mef.nrp.ovs.tapi.TopologyDataHandler;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.NrpCreateConnectivityServiceAttrs;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-
-import java.util.List;
-import java.util.Optional;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.NrpConnectivityServiceAttrsG;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
  
  /**
   * @author marek.ryznar@amartus.com
@@ -49,7 +49,7 @@ public class OvsDriver implements ActivationDriverBuilder {
              }
  
              @Override
-            public void initialize(List<EndPoint> endPoints, String serviceId, NrpCreateConnectivityServiceAttrs context) {
+            public void initialize(List<EndPoint> endPoints, String serviceId, NrpConnectivityServiceAttrsG context) {
                  this.endPoints = endPoints;
                  this.serviceId = serviceId;
              }
diff --git a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandler.java b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandler.java

index 8309409eb55a847f23cfd79084fb152d0bd8c831..5cfa6a9b642653891881da20cd5d311e8293591a 100644 (file)
--- a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandler.java
+++ b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandler.java
@@ -7,24 +7,39 @@
   */
  package org.opendaylight.unimgr.mef.nrp.ovs.tapi;
  
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import org.opendaylight.controller.md.sal.binding.api.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.BiConsumer;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
+import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
  import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
  import org.opendaylight.unimgr.mef.nrp.common.ResourceNotAvailableException;
  import org.opendaylight.unimgr.mef.nrp.ovs.transaction.TopologyTransaction;
  import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.LifecycleState;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.TerminationDirection;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePointKey;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.service._interface.point.StateBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePointKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.LifecycleState;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.TerminationDirection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePointKey;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.service._interface.point.g.StateBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePointKey;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeInternal;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
@@ -39,11 +54,8 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.*;
-import java.util.function.BiConsumer;
-import java.util.stream.Collectors;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
  
  /**
   * TopologyDataHandler listens to ovsdb topology and propagate significant changes to presto ext topology.
diff --git a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorTest.java b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorTest.java

index 989551f60df24360901cb959877940d4609d7348..3a4098f114eb60432e123d390c98e4217228d5f1 100644 (file)
--- a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorTest.java
+++ b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorTest.java
@@ -7,6 +7,20 @@
   */
  package org.opendaylight.unimgr.mef.nrp.ovs.activator;
  
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
  import org.junit.Before;
  import org.junit.Test;
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -20,13 +34,13 @@ import org.opendaylight.unimgr.mef.nrp.ovs.OpenFlowTopologyTestUtils;
  import org.opendaylight.unimgr.mef.nrp.ovs.OvsdbTopologyTestUtils;
  import org.opendaylight.unimgr.mef.nrp.ovs.util.OpenFlowUtils;
  import org.opendaylight.unimgr.utils.MdsalUtils;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrm_connectivity.rev170227.PositiveInteger;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrm_connectivity.rev170227.cg.eth.frame.flow.cpa.aspec.CeVlanIdList;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrm_connectivity.rev170227.vlan.id.listing.VlanIdList;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.NrpCreateConnectivityServiceEndPointAttrs;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.nrp.create.connectivity.service.end.point.attrs.NrpCgEthFrameFlowCpaAspec;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170227.ConnectivityServiceEndPoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.mef_types.rev170531.PositiveInteger;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.mef_types.rev170531.vlan.id.listing.g.VlanIdList;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrm_connectivity.rev170531.cg.eth.frame.flow.spec.g.CeVlanIdListOrUntag;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.NrpConnectivityServiceEndPointAttrsG;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.nrp.connectivity.service.end.point.attrs.g.NrpCgEthFrameFlowSpec;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapiconnectivity.rev170531.ConnectivityServiceEndPointG;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
@@ -37,17 +51,6 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.BiConsumer;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
  /**
   * @author marek.ryznar@amartus.com
   */
@@ -170,8 +173,8 @@ public class OvsActivatorTest extends AbstractDataBrokerTest{
      }
  
      private EndPoint mockEndPoint(String portName){
-        ConnectivityServiceEndPoint connectivityServiceEndPoint = mock(ConnectivityServiceEndPoint.class);
-        NrpCreateConnectivityServiceEndPointAttrs attrs = mock(NrpCreateConnectivityServiceEndPointAttrs.class);
+        ConnectivityServiceEndPointG connectivityServiceEndPoint = mock(ConnectivityServiceEndPointG.class);
+        NrpConnectivityServiceEndPointAttrsG attrs = mock(NrpConnectivityServiceEndPointAttrsG.class);
          //UNI port mock
          when(connectivityServiceEndPoint.getServiceInterfacePoint())
                  .thenReturn(new UniversalId(portName));
@@ -184,15 +187,15 @@ public class OvsActivatorTest extends AbstractDataBrokerTest{
          List<VlanIdList> vlanIds = new ArrayList<>();
          vlanIds.add(vlanIdList);
  
-        CeVlanIdList ceVlanIdList = mock(CeVlanIdList.class);
+        CeVlanIdListOrUntag ceVlanIdList = mock(CeVlanIdListOrUntag.class);
          when(ceVlanIdList.getVlanIdList())
                  .thenReturn(vlanIds);
  
-        NrpCgEthFrameFlowCpaAspec nrpCgEthFrameFlowCpaAspec = mock(NrpCgEthFrameFlowCpaAspec.class);
-        when(nrpCgEthFrameFlowCpaAspec.getCeVlanIdList())
+        NrpCgEthFrameFlowSpec nrpCgEthFrameFlowCpaAspec = mock(NrpCgEthFrameFlowSpec.class);
+        when(nrpCgEthFrameFlowCpaAspec.getCeVlanIdListOrUntag())
                  .thenReturn(ceVlanIdList);
  
-        when(attrs.getNrpCgEthFrameFlowCpaAspec())
+        when(attrs.getNrpCgEthFrameFlowSpec())
                  .thenReturn(nrpCgEthFrameFlowCpaAspec);
  
          return new EndPoint(connectivityServiceEndPoint,attrs);
diff --git a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTest.java b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTest.java

index 55080367810e4ba16512e00ca66e5cf2b0a2314a..b31157e9204136656f9766f9ebb8ab97ba142833 100644 (file)
--- a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTest.java
+++ b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTest.java
@@ -7,24 +7,26 @@
   */
  package org.opendaylight.unimgr.mef.nrp.ovs.tapi;
  
+import static junit.framework.TestCase.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.BiFunction;
+
  import org.junit.Before;
  import org.junit.Test;
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest;
  import org.opendaylight.unimgr.mef.nrp.ovs.FlowTopologyTestUtils;
  import org.opendaylight.unimgr.mef.nrp.ovs.OvsdbTopologyTestUtils;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.Node;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.Node;
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Link;
  
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.BiFunction;
-
-import static junit.framework.TestCase.assertNotNull;
-import static org.junit.Assert.*;
-
  /**
   * @author marek.ryznar@amartus.com
   */
@@ -133,11 +135,11 @@ public class TopologyDataHandlerTest extends AbstractDataBrokerTest{
                  .forEach(nep -> assertTrue(checkNep.apply(node,nep)));
      }
  
-    private BiFunction<List<org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePoint>, String, Boolean> checkSip =
+    private BiFunction<List<org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePoint>, String, Boolean> checkSip =
              (sips, nep) -> sips.stream()
                  .anyMatch(sip -> sip.getUuid().getValue().equals(sip_prefix + ovs_nep_prefix + nep));
  
-    private void checkSips(List<org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePoint> sips, String ... neps){
+    private void checkSips(List<org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePoint> sips, String ... neps){
          Arrays.stream(neps)
                  .forEach(nep -> assertTrue(checkSip.apply(sips,nep)));
      }
diff --git a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTestUtils.java b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTestUtils.java

index 785365ccf875397e4e6b898de1ab2185ba70275c..55b8724faeca1b76e8f7381a3efe9bfe968bc9b1 100644 (file)
--- a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTestUtils.java
+++ b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTestUtils.java
@@ -7,7 +7,12 @@
   */
  package org.opendaylight.unimgr.mef.nrp.ovs.tapi;
  
-import com.google.common.base.Optional;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -16,9 +21,9 @@ import org.opendaylight.unimgr.mef.nrp.impl.NrpInitializer;
  import org.opendaylight.unimgr.mef.nrp.ovs.DataStoreTestUtils;
  import org.opendaylight.unimgr.mef.nrp.ovs.OpenFlowTopologyTestUtils;
  import org.opendaylight.unimgr.mef.nrp.ovs.OvsdbTopologyTestUtils;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.Context;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.Context1;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.Context;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.Context1;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnectorBuilder;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortNumberUni;
@@ -32,11 +37,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
  import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import static org.junit.Assert.fail;
+import com.google.common.base.Optional;
  
  /**
   * @author marek.ryznar@amartus.com
@@ -161,11 +162,11 @@ public class TopologyDataHandlerTestUtils {
          }
      }
  
-    protected org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.Node readOvsNode(){
+    protected org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.Node readOvsNode(){
          return DataStoreTestUtils.read(getNodeIid(),dataBroker);
      }
  
-    protected List<org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePoint> readSips(){
+    protected List<org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePoint> readSips(){
          ReadWriteTransaction readWriteTransaction = dataBroker.newReadWriteTransaction();
          try {
              Optional<Context> opt = readWriteTransaction.read(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Context.class)).checkedGet();
@@ -182,14 +183,14 @@ public class TopologyDataHandlerTestUtils {
  
      private static InstanceIdentifier getNodeIid(){
          return getTopoIid()
-                .child(org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.Node.class,
-                        new org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.NodeKey(new UniversalId(ovsNodeId)));
+                .child(org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.Node.class,
+                        new org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.g.NodeKey(new UniversalId(ovsNodeId)));
      }
  
      private static InstanceIdentifier getTopoIid(){
          return InstanceIdentifier.create(Context.class)
                  .augmentation(Context1.class)
-                .child(org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.Topology.class,
-                        new org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.TopologyKey(new UniversalId(prestoNrpTopoId)));
+                .child(org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.context.g.Topology.class,
+                        new org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.context.g.TopologyKey(new UniversalId(prestoNrpTopoId)));
      }
  }
 \ No newline at end of file
diff --git a/template-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/template/driver/TemplateDriver.java b/template-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/template/driver/TemplateDriver.java

index 63e29845964c4f295efbdd91d823a750341f7c09..d382c0052ed87748b8677981421f90b2b859da36 100644 (file)
--- a/template-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/template/driver/TemplateDriver.java
+++ b/template-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/template/driver/TemplateDriver.java
@@ -8,19 +8,19 @@
  
  package org.opendaylight.unimgr.mef.nrp.template.driver;
  
+import java.util.List;
+import java.util.Optional;
+
  import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
  import org.opendaylight.unimgr.mef.nrp.api.ActivationDriver;
  import org.opendaylight.unimgr.mef.nrp.api.ActivationDriverBuilder;
  import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
  import org.opendaylight.unimgr.mef.nrp.common.ResourceActivatorException;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.NrpCreateConnectivityServiceAttrs;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.NrpConnectivityServiceAttrsG;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import java.util.List;
-import java.util.Optional;
-
  /**
   * Example driver builder
   * @author bartosz.michalik@amartus.com
@@ -50,7 +50,7 @@ public class TemplateDriver implements ActivationDriverBuilder {
              }
  
              @Override
-            public void initialize(List<EndPoint> endPoints, String serviceId, NrpCreateConnectivityServiceAttrs context) {
+            public void initialize(List<EndPoint> endPoints, String serviceId, NrpConnectivityServiceAttrsG context) {
                  this.serviceId = serviceId;
              }
  
diff --git a/template-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandler.java b/template-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandler.java

index 9b86b2aa381fa328f641d4eb541a4f655897f5b6..842eb5511e2124ed72adf3a5acd461435c10350c 100644 (file)
--- a/template-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandler.java
+++ b/template-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandler.java
@@ -8,32 +8,35 @@
  
  package org.opendaylight.unimgr.mef.nrp.template.tapi;
  
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
  import org.opendaylight.controller.md.sal.binding.api.DataBroker;
  import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
  import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
  import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
  import org.opendaylight.unimgr.mef.nrp.template.TemplateConstants;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrm_connectivity.rev170227.NaturalNumber;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.LayerProtocol1;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.LayerProtocol1Builder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170227.nrp.layer.protocol.attrs.NrpCgEthUniSpecBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.*;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.context.attrs.ServiceInterfacePointBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.service._interface.point.LayerProtocol;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170227.service._interface.point.LayerProtocolBuilder;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePoint;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.OwnedNodeEdgePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.mef_types.rev170531.NaturalNumber;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.LayerProtocol1;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.LayerProtocol1Builder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.nrp_interface.rev170531.nrp.layer.protocol.attrs.g.NrpCgEthUniSpecBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.LayerProtocolName;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.PortDirection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.PortRole;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.TerminationDirection;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.UniversalId;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.context.g.ServiceInterfacePointBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.service._interface.point.g.LayerProtocol;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapicommon.rev170531.service._interface.point.g.LayerProtocolBuilder;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePoint;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.g.OwnedNodeEdgePointBuilder;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
  /**
   * @author bartosz.michalik@amartus.com
   */
@@ -96,7 +99,7 @@ public class TopologyDataHandler {
                  .addAugmentation(LayerProtocol1.class, new LayerProtocol1Builder()
                          .setNrpCgEthUniSpec(
                                  new NrpCgEthUniSpecBuilder()
-                                        .setMaxFrameSize(new NaturalNumber(new BigInteger("1703")))
+                                        .setMaxFrameSize(new NaturalNumber(new Long(1703)))
                                          .build()
                          ).build()
                  ).build();
@@ -109,7 +112,7 @@ public class TopologyDataHandler {
          return Arrays.stream(indexes).mapToObj(idx -> new OwnedNodeEdgePointBuilder()
                  .setUuid(new UniversalId(TemplateConstants.DRIVER_ID + ":nep" + idx))
                  .setLayerProtocol(Collections.singletonList(
-                        new org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.node.edge.point.LayerProtocolBuilder()
+                        new org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.node.edge.point.g.LayerProtocolBuilder()
                              .setLocalId("eth")
                              .setLayerProtocolName(LayerProtocolName.Eth)
                              .build()))
diff --git a/template-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandlerTest.java b/template-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandlerTest.java

index 261c6eac771adb121ad6f9e6dde7c4b28adadd03..31899ce79102974bfc1c19f2a583fb97facdf109 100644 (file)
--- a/template-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandlerTest.java
+++ b/template-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandlerTest.java
@@ -8,6 +8,9 @@
  
  package org.opendaylight.unimgr.mef.nrp.template.tapi;
  
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
  import org.junit.Before;
  import org.junit.Test;
  import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
@@ -15,9 +18,7 @@ import org.opendaylight.unimgr.mef.nrp.api.TapiConstants;
  import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
  import org.opendaylight.unimgr.mef.nrp.impl.AbstractTestWithTopo;
  import org.opendaylight.unimgr.mef.nrp.template.TemplateConstants;
-import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170227.topology.context.Topology;
-
-import static org.junit.Assert.*;
+import org.opendaylight.yang.gen.v1.urn.mef.yang.tapitopology.rev170531.topology.context.g.Topology;
  
  /**
   * A simple integration test to look at the handler
author	Donald Hunter <donaldh@cisco.com>
	Wed, 5 Jul 2017 14:56:01 +0000 (15:56 +0100)
committer	Donald Hunter <donaldh@cisco.com>
	Wed, 5 Jul 2017 20:49:24 +0000 (21:49 +0100)
cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/TopologyDataHandler.java		patch \| blob \| history
cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/driver/XrDriverBuilder.java		patch \| blob \| history
cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/LoopbackUtilsTest.java		patch \| blob \| history
cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnLocalConnectionActivatorTest.java		patch \| blob \| history
cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnP2pConnectionActivatorTest.java		patch \| blob \| history
cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnTestUtils.java		patch \| blob \| history
edgeassure-1000/src/main/java/org/opendaylight/unimgr/mef/nrp/edgeassure/EdgeAssureActivator.java		patch \| blob \| history
edgeassure-1000/src/main/java/org/opendaylight/unimgr/mef/nrp/edgeassure/EdgeAssureDriverBuilder.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriver.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriverBuilder.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/ActivationDriverRepoService.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/EndPoint.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestDecomposer.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/RequestValidator.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/api/Subrequrest.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/NrpDao.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/ServicePort.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandler.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImpl.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/DefaultValidator.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/NrpInitializer.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/CreateConnectivityAction.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/DeleteConnectivityAction.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImpl.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/decomposer/DecompositionAction.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImpl.java		patch \| blob \| history
impl/src/main/java/org/opendaylight/unimgr/utils/SipHandler.java		patch \| blob \| history
impl/src/main/resources/org/opendaylight/blueprint/unimgr.xml		patch \| blob \| history
impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandlerTest.java		patch \| blob \| history
impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractTestWithTopo.java		patch \| blob \| history
impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/ActivationDriverRepoServiceImplTest.java		patch \| blob \| history
impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/BasicDecomposerTest.java		patch \| blob \| history
impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceImplTest.java		patch \| blob \| history
impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceInplIntTest.java		patch \| blob \| history
impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/ext/UnimgrExtServiceImplTest.java		patch \| blob \| history
impl/src/test/java/org/opendaylight/unimgr/utils/ActivationDriverMocks.java		patch \| blob \| history
it/pom.xml		patch \| blob \| history
nrp-api/src/main/yang/mef-common.yang	[new file with mode: 0644]	patch \| blob
nrp-api/src/main/yang/mef-types.yang	[new file with mode: 0644]	patch \| blob
nrp-api/src/main/yang/nrm-connectivity.yang		patch \| blob \| history
nrp-api/src/main/yang/nrp-interface.yang		patch \| blob \| history
nrp-api/src/main/yang/tapi-common.yang		patch \| blob \| history
nrp-api/src/main/yang/tapi-connectivity.yang		patch \| blob \| history
nrp-api/src/main/yang/tapi-path-computation.yang		patch \| blob \| history
nrp-api/src/main/yang/tapi-topology.yang		patch \| blob \| history
nrp-api/src/main/yang/unimgr-ext.yang		patch \| blob \| history
ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorHelper.java		patch \| blob \| history
ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/driver/OvsDriver.java		patch \| blob \| history
ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandler.java		patch \| blob \| history
ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorTest.java		patch \| blob \| history
ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTest.java		patch \| blob \| history
ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTestUtils.java		patch \| blob \| history
template-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/template/driver/TemplateDriver.java		patch \| blob \| history
template-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandler.java		patch \| blob \| history
template-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/template/tapi/TopologyDataHandlerTest.java		patch \| blob \| history