Use newer revision of netconf-node-topology/optional

opendaylight/netconf@3a7861b Signed-off-by: tobias.pobocik <[email protected]>
PANTHEONtech · Apr 18, 2024 · d3c391d · d3c391d
1 parent b3e80d2
commit d3c391d
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 18 deletions.
diff --git a/.github/workflows/lighty-rnc-app/test-lighty-rnc-app-cluster.sh b/.github/workflows/lighty-rnc-app/test-lighty-rnc-app-cluster.sh
@@ -201,8 +201,10 @@ do \
 	      "node-id": "node-'"${SIMULATOR_IP//.}"'",
 	      "host": "'"$SIMULATOR_IP"'",
         "port": '"$SIMULATOR_PORT"',
-	      "username": "admin",
-	      "password": "admin",
+	      "login-password-unencrypted": {
+          "username": "admin",
+          "password": "admin"
+        },
 	      "tcp-only": false,
 	      "keepalive-delay": 0
       }

diff --git a/.github/workflows/lighty-rnc-app/tests-lighty-rnc-app.sh b/.github/workflows/lighty-rnc-app/tests-lighty-rnc-app.sh
@@ -102,8 +102,10 @@ sleep 1
 	      "node-id": "node-'"${SIMULATOR_IP//.}"'",
 	      "host": "'"$SIMULATOR_IP"'",
         "port": '"$SIMULATOR_PORT"',
-	      "username": "admin",
-	      "password": "admin",
+        "login-password-unencrypted": {
+	        "username": "admin",
+	        "password": "admin"
+	      },
 	      "tcp-only": false,
 	      "keepalive-delay": 0
       }

diff --git a/...cations/lighty-rnc-app-aggregator/lighty-rnc-app-docker/example-config/configuration.json b/...cations/lighty-rnc-app-aggregator/lighty-rnc-app-docker/example-config/configuration.json
@@ -40,8 +40,8 @@
                 { "usedBy": "RESTCONF", "name": "sal-remote-augment", "revision": "2023-11-03", "nameSpace": "urn:sal:restconf:event:subscription"},
                 { "usedBy": "RESTCONF", "name": "instance-identifier-patch-module", "revision": "2015-11-21", "nameSpace": "instance:identifier:patch:module"},
                 { "usedBy": "RESTCONF/NETCONF", "name": "ietf-yang-library", "revision": "2019-01-04", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-library"},
-                { "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2022-12-25", "nameSpace": "urn:opendaylight:netconf-node-topology"},
                 { "usedBy": "NETCONF", "name": "netconf-keystore", "revision": "2023-11-09", "nameSpace": "urn:opendaylight:netconf:keystore"},
+                { "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2023-11-21", "nameSpace": "urn:opendaylight:netconf-node-topology"},
                 { "usedBy": "NETCONF", "name":"ietf-netconf", "revision":"2011-06-01", "nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"},
                 { "usedBy": "AAA", "name": "aaa-cert-mdsal", "revision":"2016-03-21", "nameSpace":"urn:opendaylight:yang:aaa:cert:mdsal"},
                 { "usedBy": "AAA", "name": "aaa", "revision": "2016-12-14", "nameSpace": "urn:opendaylight:params:xml:ns:yang:aaa"},

diff --git a/...rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/templates/configmaps.yaml b/...rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/templates/configmaps.yaml
@@ -47,8 +47,8 @@ data:
                   { "usedBy": "RESTCONF", "name": "ietf-restconf", "revision": "2017-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-restconf"},
                   { "usedBy": "RESTCONF", "name": "instance-identifier-patch-module", "revision": "2015-11-21", "nameSpace": "instance:identifier:patch:module"},
                   { "usedBy": "RESTCONF/NETCONF", "name": "ietf-yang-library", "revision": "2019-01-04", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-library"},
-                  { "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2022-12-25", "nameSpace": "urn:opendaylight:netconf-node-topology"},
                   { "usedBy": "NETCONF", "name": "netconf-keystore", "revision": "2023-11-09", "nameSpace": "urn:opendaylight:netconf:keystore"},
+                  { "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2023-11-21", "nameSpace": "urn:opendaylight:netconf-node-topology"},
                   { "usedBy": "NETCONF", "name":"ietf-netconf", "revision":"2011-06-01", "nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"},
                   { "usedBy": "AAA", "name": "aaa-cert-mdsal", "revision":"2016-03-21", "nameSpace":"urn:opendaylight:yang:aaa:cert:mdsal"},
                   { "usedBy": "AAA", "name": "aaa", "revision": "2016-12-14", "nameSpace": "urn:opendaylight:params:xml:ns:yang:aaa"},

diff --git a/...y-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/config.json b/...y-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/config.json
@@ -36,8 +36,8 @@
                 { "usedBy": "RESTCONF", "name": "ietf-restconf-monitoring", "revision": "2017-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-restconf-monitoring"},
                 { "usedBy": "RESTCONF", "name": "instance-identifier-patch-module", "revision": "2015-11-21", "nameSpace": "instance:identifier:patch:module"},
                 { "usedBy": "RESTCONF/NETCONF", "name": "ietf-yang-library", "revision": "2019-01-04", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-library"},
-                { "usedBy": "NETCONF", "name": "netconf-keystore", "revision": "2017-10-17", "nameSpace": "urn:opendaylight:netconf:keystore"},
                 { "usedBy": "NETCONF", "name": "netconf-keystore", "revision": "2023-11-09", "nameSpace": "urn:opendaylight:netconf:keystore"},
+                { "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2023-11-21", "nameSpace": "urn:opendaylight:netconf-node-topology"},
                 { "usedBy": "NETCONF", "name":"ietf-netconf", "revision":"2011-06-01", "nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"},
                 { "usedBy": "AAA", "name": "aaa", "revision": "2016-12-14", "nameSpace": "urn:opendaylight:params:xml:ns:yang:aaa"},
                 { "usedBy": "AAA", "name": "aaa-cert-mdsal", "revision":"2016-03-21", "nameSpace":"urn:opendaylight:yang:aaa:cert:mdsal"},

diff --git a/...lications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/http2Config.json b/...lications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/http2Config.json
@@ -33,8 +33,8 @@
         { "usedBy": "RESTCONF", "name": "sal-remote-augment", "revision": "2023-11-03", "nameSpace": "urn:sal:restconf:event:subscription"},
         { "usedBy": "RESTCONF", "name": "instance-identifier-patch-module", "revision": "2015-11-21", "nameSpace": "instance:identifier:patch:module"},
         { "usedBy": "RESTCONF/NETCONF", "name": "ietf-yang-library", "revision": "2019-01-04", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-library"},
-        { "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2022-12-25", "nameSpace": "urn:opendaylight:netconf-node-topology"},
         { "usedBy": "NETCONF", "name": "netconf-keystore", "revision": "2023-11-09", "nameSpace": "urn:opendaylight:netconf:keystore"},
+        { "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2023-11-21", "nameSpace": "urn:opendaylight:netconf-node-topology"},
         { "usedBy": "NETCONF", "name":"ietf-netconf", "revision":"2011-06-01", "nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"},
         { "usedBy": "AAA", "name": "aaa-cert-mdsal", "revision":"2016-03-21", "nameSpace":"urn:opendaylight:yang:aaa:cert:mdsal"},
         { "usedBy": "AAA", "name": "aaa", "revision": "2016-12-14", "nameSpace": "urn:opendaylight:params:xml:ns:yang:aaa"},

diff --git a/...lications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/httpsConfig.json b/...lications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/httpsConfig.json
@@ -33,8 +33,8 @@
         { "usedBy": "RESTCONF", "name": "sal-remote-augment", "revision": "2023-11-03", "nameSpace": "urn:sal:restconf:event:subscription"},
         { "usedBy": "RESTCONF", "name": "instance-identifier-patch-module", "revision": "2015-11-21", "nameSpace": "instance:identifier:patch:module"},
         { "usedBy": "RESTCONF/NETCONF", "name": "ietf-yang-library", "revision": "2019-01-04", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-library"},
-        { "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2022-12-25", "nameSpace": "urn:opendaylight:netconf-node-topology"},
         { "usedBy": "NETCONF", "name": "netconf-keystore", "revision": "2023-11-09", "nameSpace": "urn:opendaylight:netconf:keystore"},
+        { "usedBy": "NETCONF", "name": "netconf-node-topology", "revision": "2023-11-21", "nameSpace": "urn:opendaylight:netconf-node-topology"},
         { "usedBy": "NETCONF", "name":"ietf-netconf", "revision":"2011-06-01", "nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"},
         { "usedBy": "AAA", "name": "aaa-cert-mdsal", "revision":"2016-03-21", "nameSpace":"urn:opendaylight:yang:aaa:cert:mdsal"},
         { "usedBy": "AAA", "name": "aaa", "revision": "2016-12-14", "nameSpace": "urn:opendaylight:params:xml:ns:yang:aaa"},

diff --git a/...ations/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/openapi_config.json b/...ations/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/openapi_config.json
@@ -54,7 +54,7 @@
                 { "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider", "name": "opendaylight-inmemory-datastore-provider", "revision": "2014-06-17" },
                 { "nameSpace": "urn:ietf:params:xml:ns:yang:iana-afn-safi", "name": "iana-afn-safi", "revision": "2013-07-04" },
                 { "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl", "name": "opendaylight-sal-binding-broker-impl", "revision": "2013-10-28" },
-                { "nameSpace": "urn:opendaylight:netconf-node-topology", "name": "netconf-node-topology", "revision": "2022-12-25" },
+                { "nameSpace": "urn:opendaylight:netconf-node-topology", "name": "netconf-node-topology", "revision": "2023-11-21" },
                 { "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-restconf", "name": "ietf-restconf", "revision": "2017-01-26" },
                 { "nameSpace": "urn:ietf:params:xml:ns:netmod:notification", "name": "nc-notifications", "revision": "2008-07-14" },
                 { "nameSpace": "urn:opendaylight:l2:types", "name": "opendaylight-l2-types", "revision": "2013-08-27" },

diff --git a/...ty-community-restconf-actions-app/src/main/assembly/resources/sampleConfigSingleNode.json b/...ty-community-restconf-actions-app/src/main/assembly/resources/sampleConfigSingleNode.json
@@ -40,9 +40,9 @@
                 { "usedBy":"RESTCONF","name":"sal-remote-augment","revision":"2023-11-03","nameSpace":"urn:sal:restconf:event:subscription"},
                 { "usedBy":"RESTCONF","name":"subscribe-to-notification","revision":"2016-10-28","nameSpace":"subscribe:to:notification"},
                 { "usedBy":"RESTCONF", "name": "instance-identifier-patch-module", "revision": "2015-11-21", "nameSpace": "instance:identifier:patch:module"},
-                { "usedBy":"NETCONF","name":"netconf-node-topology","revision":"2022-12-25","nameSpace":"urn:opendaylight:netconf-node-topology"},
-                { "usedBy":"NETCONF","name":"netconf-node-optional","revision":"2022-12-25","nameSpace":"urn:opendaylight:netconf-node-optional"},
                 { "usedBy":"NETCONF","name":"netconf-keystore","revision":"2023-11-09","nameSpace":"urn:opendaylight:netconf:keystore"},
+                { "usedBy":"NETCONF","name":"netconf-node-topology","revision":"2023-11-21","nameSpace":"urn:opendaylight:netconf-node-topology"},
+                { "usedBy":"NETCONF","name":"netconf-node-optional","revision":"2023-11-21","nameSpace":"urn:opendaylight:netconf-node-optional"},
                 { "usedBy":"NETCONF","name":"ietf-netconf","revision":"2011-06-01","nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"},
                 { "usedBy":"NETCONF_ACTION","name":"example-data-center","revision":"2018-08-07","nameSpace":"urn:example:data-center"}
             ]

diff --git a/...ty-community-restconf-netconf-app/src/main/assembly/resources/sampleConfigSingleNode.json b/...ty-community-restconf-netconf-app/src/main/assembly/resources/sampleConfigSingleNode.json
@@ -40,9 +40,9 @@
                 { "usedBy":"RESTCONF","name":"sal-remote-augment","revision":"2023-11-03","nameSpace":"urn:sal:restconf:event:subscription"},
                 { "usedBy":"RESTCONF","name":"subscribe-to-notification","revision":"2016-10-28","nameSpace":"subscribe:to:notification"},
                 { "usedBy":"RESTCONF", "name": "instance-identifier-patch-module", "revision": "2015-11-21", "nameSpace": "instance:identifier:patch:module"},
-                { "usedBy":"NETCONF","name":"netconf-node-topology","revision":"2022-12-25","nameSpace":"urn:opendaylight:netconf-node-topology"},
-                { "usedBy":"NETCONF","name":"netconf-node-optional","revision":"2022-12-25","nameSpace":"urn:opendaylight:netconf-node-optional"},
                 { "usedBy":"NETCONF","name":"netconf-keystore","revision":"2023-11-09","nameSpace":"urn:opendaylight:netconf:keystore"},
+                { "usedBy":"NETCONF","name":"netconf-node-topology","revision":"2023-11-21","nameSpace":"urn:opendaylight:netconf-node-topology"},
+                { "usedBy":"NETCONF","name":"netconf-node-optional","revision":"2023-11-21","nameSpace":"urn:opendaylight:netconf-node-optional"},
                 { "usedBy":"NETCONF","name":"ietf-netconf","revision":"2011-06-01","nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"}
             ]
         }

diff --git a/lighty-modules/lighty-netconf-sb/src/main/resources/sampleConfigCluster.json b/lighty-modules/lighty-netconf-sb/src/main/resources/sampleConfigCluster.json
@@ -28,9 +28,9 @@
                 { "usedBy":"CONTROLLER","name":"odl-general-entity","revision":"2015-09-30","nameSpace":"urn:opendaylight:params:xml:ns:yang:mdsal:core:general-entity"},
                 { "usedBy":"CONTROLLER","name":"distributed-datastore-provider","revision":"2023-12-29","nameSpace":"urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider"},
                 { "usedBy":"CONTROLLER","name":"odl-entity-owners","nameSpace":"urn:opendaylight:params:xml:ns:yang:controller:entity-owners"},
-                { "usedBy":"NETCONF","name":"netconf-node-topology","revision":"2022-12-25","nameSpace":"urn:opendaylight:netconf-node-topology"},
-                { "usedBy":"NETCONF","name":"netconf-node-optional","revision":"2022-12-25","nameSpace":"urn:opendaylight:netconf-node-optional"},
                 { "usedBy":"NETCONF","name":"netconf-keystore","revision":"2023-11-09","nameSpace":"urn:opendaylight:netconf:keystore"},
+                { "usedBy":"NETCONF","name":"netconf-node-topology","revision":"2023-11-21","nameSpace":"urn:opendaylight:netconf-node-topology"},
+                { "usedBy":"NETCONF","name":"netconf-node-optional","revision":"2023-11-21","nameSpace":"urn:opendaylight:netconf-node-optional"},
                 { "usedBy":"NETCONF","name":"ietf-netconf","revision":"2011-06-01","nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"},
                 { "usedBy":"CLUSTER","name": "netconf-clustered-topology-config","revision":"2017-04-19","nameSpace":"urn:opendaylight:netconf:topology:singleton:config" }
             ]

diff --git a/lighty-modules/lighty-netconf-sb/src/main/resources/sampleConfigSingleNode.json b/lighty-modules/lighty-netconf-sb/src/main/resources/sampleConfigSingleNode.json
@@ -28,9 +28,9 @@
                 { "usedBy":"CONTROLLER","name":"odl-general-entity","revision":"2015-09-30","nameSpace":"urn:opendaylight:params:xml:ns:yang:mdsal:core:general-entity"},
                 { "usedBy":"CONTROLLER","name":"distributed-datastore-provider","revision": "2023-12-29","nameSpace":"urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider"},
                 { "usedBy":"CONTROLLER","name":"odl-entity-owners","nameSpace":"urn:opendaylight:params:xml:ns:yang:controller:entity-owners"},
-                { "usedBy":"NETCONF","name":"netconf-node-topology","revision":"2022-12-25","nameSpace":"urn:opendaylight:netconf-node-topology"},
-                { "usedBy":"NETCONF","name":"netconf-node-optional","revision":"2022-12-25","nameSpace":"urn:opendaylight:netconf-node-optional"},
                 { "usedBy":"NETCONF","name":"netconf-keystore","revision":"2023-11-09","nameSpace":"urn:opendaylight:netconf:keystore"},
+                { "usedBy":"NETCONF","name":"netconf-node-topology","revision":"2023-11-21","nameSpace":"urn:opendaylight:netconf-node-topology"},
+                { "usedBy":"NETCONF","name":"netconf-node-optional","revision":"2023-11-21","nameSpace":"urn:opendaylight:netconf-node-optional"},
                 { "usedBy":"NETCONF","name":"ietf-netconf","revision":"2011-06-01","nameSpace":"urn:ietf:params:xml:ns:netconf:base:1.0"}
             ]
         }