<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>10.0.6</version>
+ <version>11.0.6</version>
<relativePath/>
</parent>
<packaging>bundle</packaging>
<properties>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
</properties>
<dependencyManagement>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
<artifactId>rfc8345-ietf-network-topology</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>yang-binding</artifactId>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>11.0.4</version>
+ <version>12.0.2</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>10.0.6</version>
+ <version>11.0.6</version>
<relativePath/>
</parent>
<packaging>bundle</packaging>
<properties>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
</properties>
<dependencyManagement>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
- <version>4.0.5</version>
+ <version>5.0.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-binding-runtime-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-topology</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPoint;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointKey;
-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.opendaylight.netconf.node.topology.rev221225.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;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>10.0.6</version>
+ <version>11.0.6</version>
<relativePath/>
</parent>
<description>client to send message to Dmaap message router</description>
<properties>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>11.0.4</version>
+ <version>12.0.2</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>11.0.4</version>
+ <version>12.0.2</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>11.0.4</version>
+ <version>12.0.2</version>
<relativePath/>
</parent>
<name>OpenDaylight :: transportpce :: Inventory</name>
<properties>
- <mdsal.version>10.0.6</mdsal.version>
- <netconf.version>4.0.5</netconf.version>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <mdsal.version>11.0.6</mdsal.version>
+ <netconf.version>5.0.2</netconf.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
<transportpce.db.host>localhost:3306</transportpce.db.host>
<transportpce.db.database>transportpce</transportpce.db.database>
<transportpce.db.username>root</transportpce.db.username>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>11.0.4</version>
+ <version>12.0.2</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>11.0.4</version>
+ <version>12.0.2</version>
<relativePath/>
</parent>
<name>OpenDaylight :: transportpce :: swagger</name>
<properties>
- <netconf.version>4.0.5</netconf.version>
+ <netconf.version>5.0.2</netconf.version>
<configfile.directory>etc/opendaylight/karaf</configfile.directory>
<skip.karaf.featureTest>false</skip.karaf.featureTest>
</properties>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>11.0.4</version>
+ <version>12.0.2</version>
<relativePath/>
</parent>
<name>OpenDaylight :: transportpce :: tapi</name>
<properties>
- <mdsal.version>10.0.6</mdsal.version>
- <netconf.version>4.0.5</netconf.version>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <mdsal.version>11.0.6</mdsal.version>
+ <netconf.version>5.0.2</netconf.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
<skip.karaf.featureTest>false</skip.karaf.featureTest>
</properties>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>10.0.6</version>
+ <version>11.0.6</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>11.0.4</version>
+ <version>12.0.2</version>
<relativePath/>
</parent>
<name>OpenDaylight :: transportpce</name>
<properties>
- <netconf.version>4.0.5</netconf.version>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <netconf.version>5.0.2</netconf.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
<configfile.directory>etc/opendaylight/karaf</configfile.directory>
<skip.karaf.featureTest>false</skip.karaf.featureTest>
</properties>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>11.0.4</version>
+ <version>12.0.2</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>10.0.6</version>
+ <version>11.0.6</version>
<relativePath/>
</parent>
<packaging>bundle</packaging>
<properties>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
</properties>
<dependencyManagement>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
- <version>4.0.5</version>
+ <version>5.0.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-topology</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
import org.opendaylight.mdsal.binding.api.DataTreeModification;
import org.opendaylight.transportpce.common.StringConstants;
import org.opendaylight.transportpce.inventory.DeviceInventory;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
LOG.debug("nodeId {}", nodeId);
NetconfNode netconfNode = rootNode.getDataAfter().augmentation(NetconfNode.class);
- NetconfNodeConnectionStatus.ConnectionStatus connectionStatus =
+ ConnectionStatus connectionStatus =
netconfNode.getConnectionStatus();
long count = netconfNode.getAvailableCapabilities().getAvailableCapability().stream()
.filter(cp -> cp.getCapability().contains(StringConstants.OPENROADM_DEVICE_MODEL_NAME))
*/
private void processModifiedSubtree(String nodeId, NetconfNode netconfNode, String openROADMversion)
throws InterruptedException, ExecutionException {
- NetconfNodeConnectionStatus.ConnectionStatus connectionStatus = netconfNode.getConnectionStatus();
+ ConnectionStatus connectionStatus = netconfNode.getConnectionStatus();
/*long count = netconfNode.getAvailableCapabilities().getAvailableCapability().stream()
.filter(cp -> cp.getCapability().contains(StringConstants.OPENROADM_DEVICE_MODEL_NAME)).count();
if (count < 1) {
import org.opendaylight.mdsal.binding.api.DataTreeModification;
import org.opendaylight.transportpce.common.StringConstants;
import org.opendaylight.transportpce.inventory.DeviceInventory;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
for (DataTreeModification<Node> device : changesWithoutDefaultNetconfNode) {
String nodeId = device.getRootNode().getDataAfter().key().getNodeId().getValue();
NetconfNode netconfNode = device.getRootNode().getDataAfter().augmentation(NetconfNode.class);
- NetconfNodeConnectionStatus.ConnectionStatus connectionStatus =
- netconfNode.getConnectionStatus();
+ ConnectionStatus connectionStatus = netconfNode.getConnectionStatus();
long count = netconfNode.getAvailableCapabilities().getAvailableCapability().stream()
.filter(cp -> cp.getCapability().contains(StringConstants.OPENROADM_DEVICE_MODEL_NAME))
.count();
*/
private void processModifiedSubtree(String nodeId, NetconfNode netconfNode, String openROADMversion)
throws InterruptedException, ExecutionException {
- NetconfNodeConnectionStatus.ConnectionStatus connectionStatus = netconfNode.getConnectionStatus();
+ ConnectionStatus connectionStatus = netconfNode.getConnectionStatus();
long count = netconfNode.getAvailableCapabilities().getAvailableCapability().stream()
.filter(cp -> cp.getCapability().contains(StringConstants.OPENROADM_DEVICE_MODEL_NAME))
return change.getRootNode().getDataBefore() != null && change.getRootNode().getDataAfter() == null
&& ModificationType.DELETE.equals(change.getRootNode().getModificationType());
}
-}
+}
\ No newline at end of file
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>11.0.4</version>
+ <version>12.0.2</version>
<relativePath/>
</parent>
<application.attach.zip>true</application.attach.zip>
<maven.deploy.skip>true</maven.deploy.skip>
<transportpce.version>7.0.0-SNAPSHOT</transportpce.version>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
</properties>
<dependencyManagement>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>10.0.6</version>
+ <version>11.0.6</version>
<relativePath/>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
<kafka.version>3.0.0</kafka.version>
</properties>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>11.0.4</version>
+ <version>12.0.2</version>
<relativePath/>
</parent>
<packaging>bundle</packaging>
<properties>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
</properties>
<dependencyManagement>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
- <version>9.0.6</version>
+ <version>10.0.3</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>10.0.6</version>
+ <version>11.0.6</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
- <version>4.0.5</version>
+ <version>5.0.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<groupId>org.opendaylight.netconf.model</groupId>
<artifactId>rfc5277</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-topology</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.Netconf;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.Streams;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.streams.Stream;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapability;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapability;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev220630.OtnLinkType;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220316.mapping.Mapping;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.renderer.rpc.result.sp.Link;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
import org.opendaylight.yangtools.yang.common.Uint32;
/**
* @param connectionStatus
* connection status of the node
*/
- void setOpenRoadmNodeStatus(String nodeId, NetconfNodeConnectionStatus.ConnectionStatus connectionStatus);
+ void setOpenRoadmNodeStatus(String nodeId, ConnectionStatus connectionStatus);
/**
* create new otn link in otn-topology.
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPoint;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointKey;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.termination.point.SupportingTerminationPoint;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
}
@Override
- public void setOpenRoadmNodeStatus(String nodeId, NetconfNodeConnectionStatus.ConnectionStatus connectionStatus) {
+ public void setOpenRoadmNodeStatus(String nodeId, ConnectionStatus connectionStatus) {
LOG.info("setOpenROADMNodeStatus: {} {}", nodeId, connectionStatus.name());
/*
TODO: set connection status of the device in model,
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;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.AvailableCapabilities;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.AvailableCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapability;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapabilityBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPasswordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.AvailableCapabilities;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.AvailableCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapability;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.credentials.credentials.LoginPasswordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNodeBuilder;
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.network.topology.topology.Node;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
changes.add(ch);
when(ch.getRootNode()).thenReturn(node);
- final Node netconfNode = getNetconfNode("netconfNode1", NetconfNodeConnectionStatus.ConnectionStatus.Connecting,
+ final Node netconfNode = getNetconfNode("netconfNode1", ConnectionStatus.Connecting,
OPENROADM_DEVICE_VERSION_2_2_1);
when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.DELETE);
when(node.getDataBefore()).thenReturn(netconfNode);
when(ch.getRootNode()).thenReturn(node);
final Node netconfNodeBefore = getNetconfNode("netconfNode1",
- NetconfNodeConnectionStatus.ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1);
+ ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1);
final Node netconfNodeAfter = getNetconfNode("netconfNode1",
- NetconfNodeConnectionStatus.ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1);
+ ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1);
when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.WRITE);
when(node.getDataBefore()).thenReturn(netconfNodeBefore);
when(node.getDataAfter()).thenReturn(netconfNodeAfter);
when(ch.getRootNode()).thenReturn(node);
final Node netconfNodeBefore = getNetconfNode("netconfNode1",
- NetconfNodeConnectionStatus.ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1);
+ ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1);
final Node netconfNodeAfter = getNetconfNode("netconfNode1",
- NetconfNodeConnectionStatus.ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1);
+ ConnectionStatus.Connecting, OPENROADM_DEVICE_VERSION_2_2_1);
when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.WRITE);
when(node.getDataBefore()).thenReturn(netconfNodeBefore);
when(node.getDataAfter()).thenReturn(netconfNodeAfter);
when(ch.getRootNode()).thenReturn(node);
final Node netconfNodeBefore = getNetconfNode("netconfNode1",
- NetconfNodeConnectionStatus.ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1);
+ ConnectionStatus.Connected, OPENROADM_DEVICE_VERSION_2_2_1);
when(node.getModificationType()).thenReturn(DataObjectModification.ModificationType.SUBTREE_MODIFIED);
when(node.getDataBefore()).thenReturn(netconfNodeBefore);
verify(networkModelService, never()).deleteOpenRoadmnode(anyString());
}
- private Node getNetconfNode(final String nodeId, final NetconfNodeConnectionStatus.ConnectionStatus cs,
+ private Node getNetconfNode(final String nodeId, final ConnectionStatus cs,
final String openRoadmVersion) {
final List<AvailableCapability> avCapList = new ArrayList<>();
avCapList.add(new AvailableCapabilityBuilder()
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>10.0.6</version>
+ <version>11.0.6</version>
<relativePath/>
</parent>
<packaging>bundle</packaging>
<properties>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
</properties>
<dependencyManagement>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>10.0.6</version>
+ <version>11.0.6</version>
<relativePath/>
</parent>
<packaging>bundle</packaging>
<properties>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
</properties>
<dependencyManagement>
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-artifacts</artifactId>
+ <version>11.0.6</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
</dependencies>
</dependencyManagement>
@Override
@SuppressWarnings("java:S1872")
public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
- return "org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev220221.Request$$$codecImpl"
+ return "org.opendaylight.yang.rt.v1.obj.gnpy.gnpy.api.rev220221.Request"
.equals(type.getName())
- || "org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev220221.RequestBuilder$RequestImpl"
- .equals(type.getName());
+ || "org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev220221.RequestBuilder$RequestImpl"
+ .equals(type.getName());
}
@Override
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>11.0.4</version>
+ <version>12.0.2</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>10.0.6</version>
+ <version>11.0.6</version>
<relativePath/>
</parent>
<packaging>bundle</packaging>
<properties>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
</properties>
<dependencyManagement>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>10.0.6</version>
+ <version>11.0.6</version>
<relativePath/>
</parent>
<packaging>bundle</packaging>
<properties>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
</properties>
<dependencyManagement>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>10.0.6</version>
+ <version>11.0.6</version>
<relativePath/>
</parent>
<packaging>bundle</packaging>
<properties>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
</properties>
<dependencyManagement>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
- <version>4.0.5</version>
+ <version>5.0.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-topology</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-netconf-connector</artifactId>
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.NodeKey;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.context.Topology;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.context.TopologyKey;
-import org.opendaylight.yangtools.yang.binding.Enumeration;
+import org.opendaylight.yangtools.yang.binding.EnumTypeObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
return;
}
ConnectivityContext connContext = optConnContext.get();
- Map<Uuid, Enumeration[]> states = new HashMap<>();
+ Map<Uuid, EnumTypeObject[]> states = new HashMap<>();
if (connContext.getConnectivityService() == null) {
return;
}
}
}
- private Enumeration[] getStates(ConnectivityService connService) throws InterruptedException, ExecutionException {
+ private EnumTypeObject[] getStates(ConnectivityService connService)
+ throws InterruptedException, ExecutionException {
OperationalState operState = OperationalState.ENABLED;
AdministrativeState adminState = AdministrativeState.UNLOCKED;
if (connService.getConnection() == null) {
LOG.info("No connections on service = {}", connService);
- return new Enumeration[]{null, null};
+ return new EnumTypeObject[]{null, null};
}
for (org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev181210
.connectivity.service.Connection connection : connService.getConnection().values()) {
operState = OperationalState.DISABLED;
}
}
- return new Enumeration[]{adminState, operState};
+ return new EnumTypeObject[]{adminState, operState};
}
private void updateConnections(List<Uuid> changedOneps, List<String> onepStates) {
import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
import org.opendaylight.mdsal.binding.api.DataTreeModification;
import org.opendaylight.transportpce.common.StringConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapability;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.available.capabilities.AvailableCapability;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>10.0.6</version>
+ <version>11.0.6</version>
<relativePath/>
</parent>
<packaging>bundle</packaging>
<properties>
- <transportpce.models.version>17.2.0</transportpce.models.version>
+ <transportpce.models.version>18.0.0-SNAPSHOT</transportpce.models.version>
</properties>
<dependencyManagement>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
- <version>4.0.5</version>
+ <version>5.0.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
SIMS = simulators.SIMS
HONEYNODE_OK_START_MSG = 'Netconf SSH endpoint started successfully at 0.0.0.0'
-KARAF_OK_START_MSG = "Blueprint container for bundle org.opendaylight.netconf.restconf.* was successfully created"
+KARAF_OK_START_MSG = "Blueprint container for bundle org.opendaylight.transportpce.servicehandler.+" \
+ "was successfully created"
LIGHTY_OK_START_MSG = re.escape("lighty.io and RESTCONF-NETCONF started")
ODL_LOGIN = 'admin'
else:
process = start_karaf()
start_msg = KARAF_OK_START_MSG
- if wait_until_log_contains(TPCE_LOG, start_msg, time_to_wait=300):
+ if wait_until_log_contains(TPCE_LOG, start_msg, time_to_wait=100):
print('OpenDaylight started !')
else:
print('OpenDaylight failed to start !')