Merge pull request #232 from Tobianas/19.3.0

ihrasko · web-flow · commit 1b6139597d5f · 2024-06-26T12:29:49.000+02:00
Prepare release 19.3.0
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ mvn clean install
 ```
 * The NETCONF Device Library build is located at:
 
-`lighty-netconf-device\target\lighty-netconf-device-19.3.0-SNAPSHOT.jar`
+`lighty-netconf-device\target\lighty-netconf-device-19.3.0.jar`
 
 * The build & run procedures for the example devices are described in each device's README.
 
diff --git a/examples/devices/lighty-actions-device/README.md b/examples/devices/lighty-actions-device/README.md
@@ -28,12 +28,12 @@ Build root project - for more details check: [README](../../../README.md)
 * extract binary distribution in target directory
 * run jar file from zip with default parameter
 ```
-java -jar lighty-action-device-19.3.0-SNAPSHOT.jar
+java -jar lighty-action-device-19.3.0.jar
 ```
 To run device on specific port, add port number as an argument
 * run device on specific port `12345` (any available port)
 ```
-java -jar lighty-action-device-19.3.0-SNAPSHOT.jar 12345
+java -jar lighty-action-device-19.3.0.jar 12345
 ```
 
 ### Connect to device via SSH
diff --git a/examples/devices/lighty-actions-device/pom.xml b/examples/devices/lighty-actions-device/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>io.lighty.netconf.device.examples</groupId>
         <artifactId>examples-parent</artifactId>
-        <version>19.3.0-SNAPSHOT</version>
+        <version>19.3.0</version>
         <relativePath>../../parents/examples-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/devices/lighty-actions-device/src/assembly/resources/start-device.sh b/examples/devices/lighty-actions-device/src/assembly/resources/start-device.sh
@@ -6,7 +6,7 @@
 #
 # When run without a parameter a default port 17830 will be used.
 
-CLASSPATH=lighty-action-device-19.3.0-SNAPSHOT.jar
+CLASSPATH=lighty-action-device-19.3.0.jar
 
 for jar in `ls -1 lib/`;
 do
diff --git a/examples/devices/lighty-network-topology-device/README.md b/examples/devices/lighty-network-topology-device/README.md
@@ -19,12 +19,12 @@ Build root project - for more details check: [README](../../../README.md)
 * extract binary distribution in target directory
 * run jar file from zip with default parameter
 ```
-java -jar lighty-network-topology-device-19.3.0-SNAPSHOT.jar
+java -jar lighty-network-topology-device-19.3.0.jar
 ```
 * to run device on specific port it is necessary to add port number as an argument
 * run device on specific port `12345` (any available port)
 ```
-java -jar lighty-network-topology-device-19.3.0-SNAPSHOT.jar 12345
+java -jar lighty-network-topology-device-19.3.0.jar 12345
 ```
 
 ### Connect to device via SSH
diff --git a/examples/devices/lighty-network-topology-device/pom.xml b/examples/devices/lighty-network-topology-device/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>io.lighty.netconf.device.examples</groupId>
         <artifactId>examples-parent</artifactId>
-        <version>19.3.0-SNAPSHOT</version>
+        <version>19.3.0</version>
         <relativePath>../../parents/examples-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/devices/lighty-network-topology-device/src/assembly/resources/start-device.sh b/examples/devices/lighty-network-topology-device/src/assembly/resources/start-device.sh
@@ -6,7 +6,7 @@
 #
 # When run without a parameter a default port 17830 will be used.
 
-CLASSPATH=lighty-network-topology-device-19.3.0-SNAPSHOT.jar
+CLASSPATH=lighty-network-topology-device-19.3.0.jar
 
 for jar in `ls -1 lib/`;
 do
diff --git a/examples/devices/lighty-network-topology-device/src/main/java/io/lighty/netconf/device/topology/rpcs/NetworkTopologyServiceImpl.java b/examples/devices/lighty-network-topology-device/src/main/java/io/lighty/netconf/device/topology/rpcs/NetworkTopologyServiceImpl.java
@@ -30,13 +30,13 @@
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.ConnectionOper.ConnectionStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.AvailableCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.UnavailableCapabilitiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.available.capabilities.AvailableCapability;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240118.connection.oper.available.capabilities.AvailableCapabilityBuilder;
-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.opendaylight.netconf.device.rev240223.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240223.connection.oper.AvailableCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240223.connection.oper.UnavailableCapabilitiesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240223.connection.oper.available.capabilities.AvailableCapability;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240223.connection.oper.available.capabilities.AvailableCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev240223.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev240223.NetconfNodeBuilder;
 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;
diff --git a/examples/devices/lighty-network-topology-device/src/test/resources/add_node_rpc_request.xml b/examples/devices/lighty-network-topology-device/src/test/resources/add_node_rpc_request.xml
@@ -5,8 +5,10 @@
             <node-id>test-nettopo-node</node-id>
             <host>127.0.0.1</host>
             <port>17835</port>
-            <username>admin</username>
-            <password>admin</password>
+            <login-password-unencrypted>
+                <username>admin</username>
+                <password>admin</password>
+            </login-password-unencrypted>
             <tcp-only>false</tcp-only>
             <keepalive-delay>0</keepalive-delay>
             <schemaless>false</schemaless>
diff --git a/examples/devices/lighty-notifications-device/README.md b/examples/devices/lighty-notifications-device/README.md
@@ -10,16 +10,16 @@ Check commands in [Notifications device model](#notifications-device-model) on h
 Build root project - for more details check: [README](../../../README.md)
 
 **Run device**
-* extract binary distribution `lighty-notifications-device-19.3.0-SNAPSHOT-bin.zip`
+* extract binary distribution `lighty-notifications-device-19.3.0-bin.zip`
 from target directory
 * run jar file from zip with default parameter
 ```
-java -jar lighty-notifications-device-19.3.0-SNAPSHOT.jar
+java -jar lighty-notifications-device-19.3.0.jar
 ```
 To run device on specific port, add port number as an argument
 * run device on specific port `12345` (any available port)
 ```
-java -jar lighty-notifications-device-19.3.0-SNAPSHOT.jar 12345
+java -jar lighty-notifications-device-19.3.0.jar 12345
 ```
 
 ### Connect to device via SSH
diff --git a/examples/devices/lighty-notifications-device/pom.xml b/examples/devices/lighty-notifications-device/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>io.lighty.netconf.device.examples</groupId>
         <artifactId>examples-parent</artifactId>
-        <version>19.3.0-SNAPSHOT</version>
+        <version>19.3.0</version>
         <relativePath>../../parents/examples-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/devices/lighty-notifications-device/src/assembly/resources/start-device.sh b/examples/devices/lighty-notifications-device/src/assembly/resources/start-device.sh
@@ -6,7 +6,7 @@
 #
 # When run without a parameter a default port 17830 will be used.
 
-CLASSPATH=lighty-notifications-device-19.3.0-SNAPSHOT.jar
+CLASSPATH=lighty-notifications-device-19.3.0.jar
 
 for jar in `ls -1 lib/`;
 do
diff --git a/examples/devices/lighty-toaster-device/README.md b/examples/devices/lighty-toaster-device/README.md
@@ -13,16 +13,16 @@ of the processor calls method of `ToasterServiceImpl` which implements
 Build root project - for more details check: [README](../../../README.md)
 
 **Run device**
-* extract binary distribution `lighty-toaster-device-19.3.0-SNAPSHOT-bin.zip`
+* extract binary distribution `lighty-toaster-device-19.3.0-bin.zip`
 from target directory
 * run jar file from zip with default parameter
 ```
-java -jar lighty-toaster-device-19.3.0-SNAPSHOT.jar
+java -jar lighty-toaster-device-19.3.0.jar
 ```
 To run device on specific port, add port number as an argument
 * run device on specific port `12345` (any available port)
 ```
-java -jar lighty-toaster-device-19.3.0-SNAPSHOT.jar 12345
+java -jar lighty-toaster-device-19.3.0.jar 12345
 ```
 
 ### Connect to device via SSH
diff --git a/examples/devices/lighty-toaster-device/pom.xml b/examples/devices/lighty-toaster-device/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>io.lighty.netconf.device.examples</groupId>
         <artifactId>examples-parent</artifactId>
-        <version>19.3.0-SNAPSHOT</version>
+        <version>19.3.0</version>
         <relativePath>../../parents/examples-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/devices/lighty-toaster-device/src/assembly/resources/start-device.sh b/examples/devices/lighty-toaster-device/src/assembly/resources/start-device.sh
@@ -6,7 +6,7 @@
 #
 # When run without a parameter a default port 17830 will be used.
 
-CLASSPATH=lighty-toaster-device-19.3.0-SNAPSHOT.jar
+CLASSPATH=lighty-toaster-device-19.3.0.jar
 
 for jar in `ls -1 lib/`;
 do
diff --git a/examples/devices/lighty-toaster-multiple-devices/README.md b/examples/devices/lighty-toaster-multiple-devices/README.md
@@ -13,7 +13,7 @@ Build root project - for more details check: [README](../../../README.md)
 `--starting-port STARTING-PORT` (Default 17380) First port for simulated device. Each other device will use incremented port number.    
 `--thread-pool-size THREAD-POOL-SIZE` (Default 8) The number of threads to keep in the pool, when creating a device simulator, even if they are idle.    
 ```
-java -jar lighty-toaster-multiple-devices-19.3.0-SNAPSHOT.jar --starting-port 20000 --device-count 200 --thread-pool-size 200
+java -jar lighty-toaster-multiple-devices-19.3.0.jar --starting-port 20000 --device-count 200 --thread-pool-size 200
 ```
 
 ### Connect to device via SSH
diff --git a/examples/devices/lighty-toaster-multiple-devices/pom.xml b/examples/devices/lighty-toaster-multiple-devices/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>io.lighty.netconf.device.examples</groupId>
         <artifactId>examples-parent</artifactId>
-        <version>19.3.0-SNAPSHOT</version>
+        <version>19.3.0</version>
         <relativePath>../../parents/examples-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/examples/devices/lighty-toaster-multiple-devices/src/assembly/resources/start-device.sh b/examples/devices/lighty-toaster-multiple-devices/src/assembly/resources/start-device.sh
@@ -15,7 +15,7 @@
 # ./start-device --starting-port 20000 --device-count 200 --thread-pool-size 200
 #
 
-CLASSPATH=lighty-toaster-multiple-devices-19.3.0-SNAPSHOT.jar
+CLASSPATH=lighty-toaster-multiple-devices-19.3.0.jar
 
 ARGUMENT_LIST=(
     "device-count"
diff --git a/examples/devices/pom.xml b/examples/devices/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>io.lighty.netconf.device.examples</groupId>
     <artifactId>devices-aggregator</artifactId>
-    <version>19.3.0-SNAPSHOT</version>
+    <version>19.3.0</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/examples/models/lighty-example-data-center-model/pom.xml b/examples/models/lighty-example-data-center-model/pom.xml
@@ -12,11 +12,11 @@
     <parent>
         <groupId>io.lighty.core</groupId>
         <artifactId>lighty-binding-parent</artifactId>
-        <version>19.2.0</version>
+        <version>19.3.0</version>
         <relativePath/>
     </parent>
 
     <groupId>io.lighty.netconf.device.examples.models</groupId>
     <artifactId>lighty-example-data-center-model</artifactId>
-    <version>19.3.0-SNAPSHOT</version>
+    <version>19.3.0</version>
 </project>
diff --git a/examples/models/lighty-example-network-topology-device-model/pom.xml b/examples/models/lighty-example-network-topology-device-model/pom.xml
@@ -12,13 +12,13 @@
     <parent>
         <groupId>io.lighty.core</groupId>
         <artifactId>lighty-binding-parent</artifactId>
-        <version>19.2.0</version>
+        <version>19.3.0</version>
         <relativePath/>
     </parent>
 
     <groupId>io.lighty.netconf.device.examples.models</groupId>
     <artifactId>lighty-example-network-topology-device-model</artifactId>
-    <version>19.3.0-SNAPSHOT</version>
+    <version>19.3.0</version>
 
     <dependencies>
         <dependency>
diff --git a/examples/models/lighty-example-network-topology-device-model/src/main/yang/network-topology-rpcs@2024-02-02.yang b/examples/models/lighty-example-network-topology-device-model/src/main/yang/network-topology-rpcs@2024-02-02.yang
@@ -6,8 +6,8 @@ module network-topology-rpcs {
     prefix "ntr";
 
     import network-topology { prefix "nt"; revision-date 2013-10-21; }
-    import netconf-node-topology { prefix "nnt"; revision-date 2022-12-25; }
-    import odl-netconf-device { prefix "ond"; revision-date 2024-01-18; }
+    import netconf-node-topology { prefix "nnt"; revision-date 2024-02-23; }
+    import odl-netconf-device { prefix "ond"; revision-date 2024-02-23; }
 
     organization "Pantheon.tech";
 
@@ -35,6 +35,7 @@ module network-topology-rpcs {
           key "node-id";
           uses nt:node-attributes;
           uses nnt:netconf-node-fields;
+          uses ond:credentials;
           uses ond:connection-oper;
           must "boolean(../underlay-topology[*]/node[./supporting-nodes/node-ref])";
               // This constraint is meant to ensure that a referenced node is in fact
diff --git a/examples/models/lighty-example-notifications-model/pom.xml b/examples/models/lighty-example-notifications-model/pom.xml
@@ -12,12 +12,12 @@
     <parent>
         <groupId>io.lighty.core</groupId>
         <artifactId>lighty-binding-parent</artifactId>
-        <version>19.2.0</version>
+        <version>19.3.0</version>
         <relativePath/>
     </parent>
 
     <groupId>io.lighty.netconf.device.examples.models</groupId>
     <artifactId>lighty-example-notifications-model</artifactId>
-    <version>19.3.0-SNAPSHOT</version>
+    <version>19.3.0</version>
 
 </project>
diff --git a/examples/models/pom.xml b/examples/models/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>io.lighty.netconf.device.examples.models</groupId>
     <artifactId>lighty-models-aggregator</artifactId>
-    <version>19.3.0-SNAPSHOT</version>
+    <version>19.3.0</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/examples/parents/examples-bom/pom.xml b/examples/parents/examples-bom/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>io.lighty.netconf.device.examples</groupId>
     <artifactId>examples-bom</artifactId>
-    <version>19.3.0-SNAPSHOT</version>
+    <version>19.3.0</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -26,42 +26,42 @@
             <dependency>
                 <groupId>io.lighty.netconf.device.examples.models</groupId>
                 <artifactId>lighty-example-network-topology-device-model</artifactId>
-                <version>19.3.0-SNAPSHOT</version>
+                <version>19.3.0</version>
             </dependency>
             <dependency>
                 <groupId>io.lighty.netconf.device.examples.models</groupId>
                 <artifactId>lighty-example-data-center-model</artifactId>
-                <version>19.3.0-SNAPSHOT</version>
+                <version>19.3.0</version>
             </dependency>
             <dependency>
                 <groupId>io.lighty.netconf.device</groupId>
                 <artifactId>lighty-netconf-device</artifactId>
-                <version>19.3.0-SNAPSHOT</version>
+                <version>19.3.0</version>
             </dependency>
             <dependency>
                 <groupId>io.lighty.netconf.device.examples</groupId>
                 <artifactId>lighty-actions-device</artifactId>
-                <version>19.3.0-SNAPSHOT</version>
+                <version>19.3.0</version>
             </dependency>
             <dependency>
                 <groupId>io.lighty.netconf.device.examples</groupId>
                 <artifactId>lighty-toaster-device</artifactId>
-                <version>19.3.0-SNAPSHOT</version>
+                <version>19.3.0</version>
             </dependency>
             <dependency>
                 <groupId>io.lighty.netconf.device.examples</groupId>
                 <artifactId>lighty-network-topology-device</artifactId>
-                <version>19.3.0-SNAPSHOT</version>
+                <version>19.3.0</version>
             </dependency>
             <dependency>
                 <groupId>io.lighty.netconf.device.examples</groupId>
                 <artifactId>lighty-toaster-multiple-devices</artifactId>
-                <version>19.3.0-SNAPSHOT</version>
+                <version>19.3.0</version>
             </dependency>
             <dependency>
                 <groupId>io.lighty.netconf.device.examples.models</groupId>
                 <artifactId>lighty-example-notifications-model</artifactId>
-                <version>19.3.0-SNAPSHOT</version>
+                <version>19.3.0</version>
             </dependency>
 
             <dependency>
diff --git a/examples/parents/examples-parent/pom.xml b/examples/parents/examples-parent/pom.xml
@@ -14,13 +14,13 @@
     <parent>
         <groupId>io.lighty.core</groupId>
         <artifactId>lighty-app-parent</artifactId>
-        <version>19.2.0</version>
+        <version>19.3.0</version>
         <relativePath/>
     </parent>
 
     <groupId>io.lighty.netconf.device.examples</groupId>
     <artifactId>examples-parent</artifactId>
-    <version>19.3.0-SNAPSHOT</version>
+    <version>19.3.0</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -45,7 +45,7 @@
             <dependency>
                 <groupId>io.lighty.netconf.device.examples</groupId>
                 <artifactId>examples-bom</artifactId>
-                <version>19.3.0-SNAPSHOT</version>
+                <version>19.3.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/examples/parents/pom.xml b/examples/parents/pom.xml
@@ -12,7 +12,7 @@
     <groupId>io.lighty.netconf.device.examples.parents</groupId>
     <artifactId>parents-aggregator</artifactId>
     <packaging>pom</packaging>
-    <version>19.3.0-SNAPSHOT</version>
+    <version>19.3.0</version>
 
     <modules>
         <module>examples-parent</module>
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -14,7 +14,7 @@
     <groupId>io.lighty.netconf.device.examples</groupId>
     <artifactId>examples-aggregator</artifactId>
     <packaging>pom</packaging>
-    <version>19.3.0-SNAPSHOT</version>
+    <version>19.3.0</version>
 
     <modules>
         <module>parents</module>
diff --git a/lighty-netconf-device/pom.xml b/lighty-netconf-device/pom.xml
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#`
`7`	`7`	`# When run without a parameter a default port 17830 will be used.`
`8`	`8`
`9`		`-CLASSPATH=lighty-action-device-19.3.0-SNAPSHOT.jar`
	`9`	`+CLASSPATH=lighty-action-device-19.3.0.jar`
`10`	`10`
`11`	`11`	for jar in `ls -1 lib/`;
`12`	`12`	`do`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#`
`7`	`7`	`# When run without a parameter a default port 17830 will be used.`
`8`	`8`
`9`		`-CLASSPATH=lighty-network-topology-device-19.3.0-SNAPSHOT.jar`
	`9`	`+CLASSPATH=lighty-network-topology-device-19.3.0.jar`
`10`	`10`
`11`	`11`	for jar in `ls -1 lib/`;
`12`	`12`	`do`