From 92c34534491f93cab173cd22820ed7f26b4ec119 Mon Sep 17 00:00:00 2001 From: "tobias.pobocik" Date: Thu, 2 Nov 2023 13:19:15 +0100 Subject: [PATCH] Bump iana-if-type to 2023-01-26 Update config files to match: https://github.com/opendaylight/mdsal/commit/659d92dbafde4417bd2064ce62fe83e6adae2dfe JIRA: LIGHTY-265 Signed-off-by: tobias.pobocik Signed-off-by: Ivan Hrasko --- .../helm/lighty-rcgnmi-app-helm/templates/configmaps.yaml | 2 +- .../lighty-rcgnmi-app-module/src/test/resources/config.json | 2 +- .../src/main/resources/example-config/example_config.json | 2 +- .../lighty-rnc-app-docker/example-config/configuration.json | 2 +- .../helm/lighty-rnc-app-helm/templates/configmaps.yaml | 2 +- .../lighty-rnc-module/src/test/resources/config.json | 2 +- .../lighty-rnc-module/src/test/resources/http2Config.json | 2 +- .../lighty-rnc-module/src/test/resources/httpsConfig.json | 2 +- lighty-core/lighty-controller/README.md | 2 +- .../src/main/assembly/resources/sampleConfigSingleNode.json | 2 +- .../src/test/resources/testConfig.json | 2 +- .../src/main/assembly/resources/sampleConfigSingleNode.json | 2 +- .../src/main/assembly/resources/sampleConfigSingleNode.json | 2 +- .../lighty-gnmi-community-restconf-app/example_config.json | 4 ++-- .../simulator/simulator_config.json | 2 +- .../src/test/resources/json/app_init_config.json | 2 +- .../src/main/resources/sampleConfigCluster.json | 2 +- .../src/main/resources/sampleConfigSingleNode.json | 2 +- .../modules/southbound/netconf/tests/SampleConfigTest.java | 4 ++-- 19 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app-helm/helm/lighty-rcgnmi-app-helm/templates/configmaps.yaml b/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app-helm/helm/lighty-rcgnmi-app-helm/templates/configmaps.yaml index 4f2c0ba8c2..d75422d968 100644 --- a/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app-helm/helm/lighty-rcgnmi-app-helm/templates/configmaps.yaml +++ b/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app-helm/helm/lighty-rcgnmi-app-helm/templates/configmaps.yaml @@ -35,7 +35,7 @@ data: "topLevelModels":[ { "usedBy": "CONTROLLER", "name": "odl-general-entity", "revision": "2015-09-30", "nameSpace": "urn:opendaylight:params:xml:ns:yang:mdsal:core:general-entity"}, { "usedBy": "CONTROLLER", "name": "ietf-yang-types", "revision": "2013-07-15", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-types"}, - { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2021-06-21", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2023-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy": "CONTROLLER", "name": "odl-entity-owners" , "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:entity-owners"}, { "usedBy": "CONTROLLER", "name": "cluster-admin", "revision": "2015-10-13", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:md:sal:cluster:admin"}, { "usedBy": "CONTROLLER", "name": "opendaylight-l2-types", "revision": "2013-08-27", "nameSpace": "urn:opendaylight:l2:types"}, diff --git a/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app-module/src/test/resources/config.json b/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app-module/src/test/resources/config.json index 00e2f2d605..947408ea7e 100644 --- a/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app-module/src/test/resources/config.json +++ b/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app-module/src/test/resources/config.json @@ -24,7 +24,7 @@ "topLevelModels":[ { "usedBy": "CONTROLLER", "name": "odl-general-entity", "revision": "2015-09-30", "nameSpace": "urn:opendaylight:params:xml:ns:yang:mdsal:core:general-entity"}, { "usedBy": "CONTROLLER", "name": "ietf-yang-types", "revision": "2013-07-15", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-types"}, - { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2021-06-21", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2023-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy": "CONTROLLER", "name": "odl-entity-owners", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:entity-owners"}, { "usedBy": "CONTROLLER", "name": "opendaylight-l2-types", "revision": "2013-08-27", "nameSpace": "urn:opendaylight:l2:types"}, { "usedBy": "CONTROLLER", "name": "distributed-datastore-provider", "revision": "2014-06-12", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider"}, diff --git a/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app/src/main/resources/example-config/example_config.json b/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app/src/main/resources/example-config/example_config.json index c0c79e5324..3b52d98c6e 100644 --- a/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app/src/main/resources/example-config/example_config.json +++ b/lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app/src/main/resources/example-config/example_config.json @@ -30,7 +30,7 @@ { "usedBy": "CONTROLLER", "name": "opendaylight-l2-types", "revision": "2013-08-27", "nameSpace": "urn:opendaylight:l2:types"}, { "usedBy": "CONTROLLER", "name": "distributed-datastore-provider", "revision": "2014-06-12", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider"}, { "usedBy": "CONTROLLER", "name": "ietf-yang-types", "revision": "2013-07-15", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-types"}, - { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2021-06-21", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2023-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy": "CONTROLLER", "name": "odl-entity-owners" , "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:entity-owners"}, { "usedBy": "CONTROLLER", "name": "cluster-admin", "revision": "2015-10-13", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:md:sal:cluster:admin"}, { "usedBy": "CONTROLLER", "name": "ietf-interfaces", "revision":"2018-02-20", "nameSpace":"urn:ietf:params:xml:ns:yang:ietf-interfaces"}, diff --git a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-docker/example-config/configuration.json b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-docker/example-config/configuration.json index 0546615ee9..5b7a740450 100644 --- a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-docker/example-config/configuration.json +++ b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-docker/example-config/configuration.json @@ -30,7 +30,7 @@ { "usedBy": "CONTROLLER", "name": "opendaylight-l2-types", "revision": "2013-08-27", "nameSpace": "urn:opendaylight:l2:types"}, { "usedBy": "CONTROLLER", "name": "distributed-datastore-provider", "revision": "2014-06-12", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider"}, { "usedBy": "CONTROLLER", "name": "ietf-yang-types", "revision": "2013-07-15", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-types"}, - { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2021-06-21", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2023-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy": "CONTROLLER", "name": "odl-entity-owners", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:entity-owners"}, { "usedBy": "CONTROLLER", "name":"ietf-interfaces", "revision":"2018-02-20", "nameSpace":"urn:ietf:params:xml:ns:yang:ietf-interfaces"}, { "usedBy": "CONTROLLER", "name": "cluster-admin", "revision": "2015-10-13", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:md:sal:cluster:admin"}, diff --git a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/templates/configmaps.yaml b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/templates/configmaps.yaml index cc0564f242..5e113506ce 100644 --- a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/templates/configmaps.yaml +++ b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-app-helm/helm/lighty-rnc-app-helm/templates/configmaps.yaml @@ -35,7 +35,7 @@ data: "topLevelModels":[ { "usedBy": "CONTROLLER", "name": "odl-general-entity", "revision": "2015-09-30", "nameSpace": "urn:opendaylight:params:xml:ns:yang:mdsal:core:general-entity"}, { "usedBy": "CONTROLLER", "name": "ietf-yang-types", "revision": "2013-07-15", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-types"}, - { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2021-06-21", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2023-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy": "CONTROLLER", "name": "odl-entity-owners", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:entity-owners"}, { "usedBy": "CONTROLLER", "name": "opendaylight-l2-types", "revision": "2013-08-27", "nameSpace": "urn:opendaylight:l2:types"}, { "usedBy": "CONTROLLER", "name": "distributed-datastore-provider", "revision": "2014-06-12", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider"}, diff --git a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/config.json b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/config.json index d60cda2580..e883af0e58 100644 --- a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/config.json +++ b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/config.json @@ -24,7 +24,7 @@ "topLevelModels":[ { "usedBy": "CONTROLLER", "name": "odl-general-entity", "revision": "2015-09-30", "nameSpace": "urn:opendaylight:params:xml:ns:yang:mdsal:core:general-entity"}, { "usedBy": "CONTROLLER", "name": "ietf-yang-types", "revision": "2013-07-15", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-types"}, - { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2021-06-21", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2023-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy": "CONTROLLER", "name": "odl-entity-owners", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:entity-owners"}, { "usedBy": "CONTROLLER", "name": "opendaylight-l2-types", "revision": "2013-08-27", "nameSpace": "urn:opendaylight:l2:types"}, { "usedBy": "CONTROLLER", "name": "distributed-datastore-provider", "revision": "2014-06-12", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider"}, diff --git a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/http2Config.json b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/http2Config.json index a5345ccd7c..8cae0a0439 100644 --- a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/http2Config.json +++ b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/http2Config.json @@ -23,7 +23,7 @@ { "usedBy": "CONTROLLER", "name": "opendaylight-l2-types", "revision": "2013-08-27", "nameSpace": "urn:opendaylight:l2:types"}, { "usedBy": "CONTROLLER", "name": "distributed-datastore-provider", "revision": "2014-06-12", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider"}, { "usedBy": "CONTROLLER", "name": "ietf-yang-types", "revision": "2013-07-15", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-types"}, - { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2021-06-21", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2023-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy": "CONTROLLER", "name": "odl-entity-owners", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:entity-owners"}, { "usedBy": "CONTROLLER", "name":"ietf-interfaces", "revision":"2018-02-20", "nameSpace":"urn:ietf:params:xml:ns:yang:ietf-interfaces"}, { "usedBy": "CONTROLLER", "name": "cluster-admin", "revision": "2015-10-13", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:md:sal:cluster:admin"}, diff --git a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/httpsConfig.json b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/httpsConfig.json index d4605173e8..645a0f1c23 100644 --- a/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/httpsConfig.json +++ b/lighty-applications/lighty-rnc-app-aggregator/lighty-rnc-module/src/test/resources/httpsConfig.json @@ -23,7 +23,7 @@ { "usedBy": "CONTROLLER", "name": "opendaylight-l2-types", "revision": "2013-08-27", "nameSpace": "urn:opendaylight:l2:types"}, { "usedBy": "CONTROLLER", "name": "distributed-datastore-provider", "revision": "2014-06-12", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider"}, { "usedBy": "CONTROLLER", "name": "ietf-yang-types", "revision": "2013-07-15", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-types"}, - { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2021-06-21", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2023-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy": "CONTROLLER", "name": "odl-entity-owners", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:entity-owners"}, { "usedBy": "CONTROLLER", "name":"ietf-interfaces", "revision":"2018-02-20", "nameSpace":"urn:ietf:params:xml:ns:yang:ietf-interfaces"}, { "usedBy": "CONTROLLER", "name": "cluster-admin", "revision": "2015-10-13", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:md:sal:cluster:admin"}, diff --git a/lighty-core/lighty-controller/README.md b/lighty-core/lighty-controller/README.md index 3e6e84e383..791a12254e 100644 --- a/lighty-core/lighty-controller/README.md +++ b/lighty-core/lighty-controller/README.md @@ -115,7 +115,7 @@ or completely override it if required. { "usedBy": "CONTROLLER", "name": "odl-general-entity", "revision": "2015-09-30", "nameSpace": "urn:opendaylight:params:xml:ns:yang:mdsal:core:general-entity"}, { "usedBy": "CONTROLLER", "name": "yang-ext", "revision": "2013-07-09", "nameSpace": "urn:opendaylight:yang:extension:yang-ext"}, { "usedBy": "CONTROLLER", "name": "opendaylight-l2-types", "revision": "2013-08-27", "nameSpace": "urn:opendaylight:l2:types"}, - { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2021-06-21", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2023-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy": "CONTROLLER", "name": "ietf-interfaces", "revision": "2018-02-20", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-interfaces"}, { "usedBy": "CONTROLLER", "name": "network-topology", "revision": "2013-10-21", "nameSpace": "urn:TBD:params:xml:ns:yang:network-topology"}, { "usedBy": "CONTROLLER", "name": "ietf-inet-types", "revision": "2013-07-15", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-inet-types"} diff --git a/lighty-examples/lighty-community-aaa-restconf-app/src/main/assembly/resources/sampleConfigSingleNode.json b/lighty-examples/lighty-community-aaa-restconf-app/src/main/assembly/resources/sampleConfigSingleNode.json index 6f67dfae1a..c90e653672 100644 --- a/lighty-examples/lighty-community-aaa-restconf-app/src/main/assembly/resources/sampleConfigSingleNode.json +++ b/lighty-examples/lighty-community-aaa-restconf-app/src/main/assembly/resources/sampleConfigSingleNode.json @@ -26,7 +26,7 @@ { "usedBy":"CONTROLLER","name":"ietf-interfaces","revision":"2018-02-20","nameSpace":"urn:ietf:params:xml:ns:yang:ietf-interfaces"}, { "usedBy":"CONTROLLER","name":"yang-ext","revision":"2013-07-09","nameSpace":"urn:opendaylight:yang:extension:yang-ext"}, { "usedBy":"CONTROLLER","name":"opendaylight-l2-types","revision":"2013-08-27","nameSpace":"urn:opendaylight:l2:types"}, - { "usedBy":"CONTROLLER","name":"iana-if-type","revision":"2021-06-21","nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy":"CONTROLLER","name":"iana-if-type","revision":"2023-01-26","nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy":"CONTROLLER","name":"odl-entity-owners","nameSpace":"urn:opendaylight:params:xml:ns:yang:controller:entity-owners"}, { "usedBy":"CONTROLLER","name":"ietf-yang-types","revision":"2013-07-15","nameSpace":"urn:ietf:params:xml:ns:yang:ietf-yang-types"}, { "usedBy":"CONTROLLER","name":"distributed-datastore-provider","revision":"2014-06-12","nameSpace":"urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider"}, diff --git a/lighty-examples/lighty-community-aaa-restconf-app/src/test/resources/testConfig.json b/lighty-examples/lighty-community-aaa-restconf-app/src/test/resources/testConfig.json index 3397a274e2..b4e71a3112 100644 --- a/lighty-examples/lighty-community-aaa-restconf-app/src/test/resources/testConfig.json +++ b/lighty-examples/lighty-community-aaa-restconf-app/src/test/resources/testConfig.json @@ -23,7 +23,7 @@ { "usedBy":"CONTROLLER","name":"ietf-interfaces","revision":"2018-02-20","nameSpace":"urn:ietf:params:xml:ns:yang:ietf-interfaces"}, { "usedBy":"CONTROLLER","name":"yang-ext","revision":"2013-07-09","nameSpace":"urn:opendaylight:yang:extension:yang-ext"}, { "usedBy":"CONTROLLER","name":"opendaylight-l2-types","revision":"2013-08-27","nameSpace":"urn:opendaylight:l2:types"}, - { "usedBy":"CONTROLLER","name":"iana-if-type","revision":"2021-06-21","nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy":"CONTROLLER","name":"iana-if-type","revision":"2023-01-26","nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy":"CONTROLLER","name":"odl-entity-owners","nameSpace":"urn:opendaylight:params:xml:ns:yang:controller:entity-owners"}, { "usedBy":"CONTROLLER","name":"ietf-yang-types","revision":"2013-07-15","nameSpace":"urn:ietf:params:xml:ns:yang:ietf-yang-types"}, { "usedBy":"CONTROLLER","name":"distributed-datastore-provider","revision":"2014-06-12","nameSpace":"urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider"}, diff --git a/lighty-examples/lighty-community-restconf-actions-app/src/main/assembly/resources/sampleConfigSingleNode.json b/lighty-examples/lighty-community-restconf-actions-app/src/main/assembly/resources/sampleConfigSingleNode.json index f2b6ebf87d..fc5c68afbb 100644 --- a/lighty-examples/lighty-community-restconf-actions-app/src/main/assembly/resources/sampleConfigSingleNode.json +++ b/lighty-examples/lighty-community-restconf-actions-app/src/main/assembly/resources/sampleConfigSingleNode.json @@ -22,7 +22,7 @@ }, "schemaServiceConfig":{ "topLevelModels":[ - { "usedBy":"CONTROLLER","name":"iana-if-type","revision":"2021-06-21","nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy":"CONTROLLER","name":"iana-if-type","revision":"2023-01-26","nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy":"CONTROLLER","name":"ietf-interfaces","revision":"2018-02-20","nameSpace":"urn:ietf:params:xml:ns:yang:ietf-interfaces"}, { "usedBy":"CONTROLLER","name":"ietf-yang-types","revision":"2013-07-15","nameSpace":"urn:ietf:params:xml:ns:yang:ietf-yang-types"}, { "usedBy":"CONTROLLER","name":"opendaylight-l2-types","revision":"2013-08-27","nameSpace":"urn:opendaylight:l2:types"}, diff --git a/lighty-examples/lighty-community-restconf-netconf-app/src/main/assembly/resources/sampleConfigSingleNode.json b/lighty-examples/lighty-community-restconf-netconf-app/src/main/assembly/resources/sampleConfigSingleNode.json index 718b05808d..689bead364 100644 --- a/lighty-examples/lighty-community-restconf-netconf-app/src/main/assembly/resources/sampleConfigSingleNode.json +++ b/lighty-examples/lighty-community-restconf-netconf-app/src/main/assembly/resources/sampleConfigSingleNode.json @@ -22,7 +22,7 @@ }, "schemaServiceConfig":{ "topLevelModels":[ - { "usedBy":"CONTROLLER","name":"iana-if-type","revision":"2021-06-21","nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy":"CONTROLLER","name":"iana-if-type","revision":"2023-01-26","nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy":"CONTROLLER","name":"ietf-interfaces","revision":"2018-02-20","nameSpace":"urn:ietf:params:xml:ns:yang:ietf-interfaces"}, { "usedBy":"CONTROLLER","name":"ietf-yang-types","revision":"2013-07-15","nameSpace":"urn:ietf:params:xml:ns:yang:ietf-yang-types"}, { "usedBy":"CONTROLLER","name":"opendaylight-l2-types","revision":"2013-08-27","nameSpace":"urn:opendaylight:l2:types"}, diff --git a/lighty-examples/lighty-gnmi-community-restconf-app/example_config.json b/lighty-examples/lighty-gnmi-community-restconf-app/example_config.json index 364effe633..586df7168d 100644 --- a/lighty-examples/lighty-gnmi-community-restconf-app/example_config.json +++ b/lighty-examples/lighty-gnmi-community-restconf-app/example_config.json @@ -25,7 +25,7 @@ { "usedBy": "CONTROLLER", "name": "opendaylight-l2-types", "revision": "2013-08-27", "nameSpace": "urn:opendaylight:l2:types"}, { "usedBy": "CONTROLLER", "name": "distributed-datastore-provider", "revision": "2014-06-12", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:config:distributed-datastore-provider"}, { "usedBy": "CONTROLLER", "name": "ietf-interfaces", "revision": "2018-02-20", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-interfaces"}, - { "usedBy": "CONTROLLER", "name": "iana-if-type","revision": "2021-06-21", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy": "CONTROLLER", "name": "iana-if-type","revision": "2023-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy": "RESTCONF", "name": "ietf-yang-library", "revision": "2019-01-04", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-library"}, { "usedBy": "RESTCONF", "name": "ietf-restconf-monitoring", "revision": "2017-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-restconf-monitoring"}, { "usedBy": "RESTCONF", "name": "subscribe-to-notification", "revision": "2016-10-28", "nameSpace": "subscribe:to:notification"}, @@ -50,7 +50,7 @@ ], "initialYangModels" : [ {"name": "ietf-interfaces", "revision": "2018-02-20", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-interfaces"}, - {"name": "iana-if-type", "revision": "2021-06-21", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + {"name": "iana-if-type", "revision": "2023-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, {"name": "ietf-yang-types", "revision": "2013-07-15", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-types"} ] } diff --git a/lighty-examples/lighty-gnmi-community-restconf-app/simulator/simulator_config.json b/lighty-examples/lighty-gnmi-community-restconf-app/simulator/simulator_config.json index 36aecf33c9..7949f18a10 100644 --- a/lighty-examples/lighty-gnmi-community-restconf-app/simulator/simulator_config.json +++ b/lighty-examples/lighty-gnmi-community-restconf-app/simulator/simulator_config.json @@ -11,7 +11,7 @@ "password": "admin", "schemaServiceConfig": { "topLevelModels": [ - { "nameSpace":"urn:ietf:params:xml:ns:yang:iana-if-type","name":"iana-if-type","revision":"2021-06-21"} + { "nameSpace":"urn:ietf:params:xml:ns:yang:iana-if-type","name":"iana-if-type","revision":"2023-01-26"} ] } } diff --git a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/resources/json/app_init_config.json b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/resources/json/app_init_config.json index 53c30c39c7..40f9ad00e7 100644 --- a/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/resources/json/app_init_config.json +++ b/lighty-modules/lighty-gnmi/lighty-gnmi-test/src/test/resources/json/app_init_config.json @@ -21,7 +21,7 @@ "topLevelModels":[ { "usedBy": "CONTROLLER", "name": "odl-general-entity", "revision": "2015-09-30", "nameSpace": "urn:opendaylight:params:xml:ns:yang:mdsal:core:general-entity"}, { "usedBy": "CONTROLLER", "name": "ietf-yang-types", "revision": "2013-07-15", "nameSpace": "urn:ietf:params:xml:ns:yang:ietf-yang-types"}, - { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2021-06-21", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy": "CONTROLLER", "name": "iana-if-type", "revision": "2023-01-26", "nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy": "CONTROLLER", "name": "odl-entity-owners" , "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:entity-owners"}, { "usedBy": "CONTROLLER", "name": "cluster-admin", "revision": "2015-10-13", "nameSpace": "urn:opendaylight:params:xml:ns:yang:controller:md:sal:cluster:admin"}, { "usedBy": "CONTROLLER", "name": "opendaylight-l2-types", "revision": "2013-08-27", "nameSpace": "urn:opendaylight:l2:types"}, diff --git a/lighty-modules/lighty-netconf-sb/src/main/resources/sampleConfigCluster.json b/lighty-modules/lighty-netconf-sb/src/main/resources/sampleConfigCluster.json index 125ca53f02..6df6a85833 100644 --- a/lighty-modules/lighty-netconf-sb/src/main/resources/sampleConfigCluster.json +++ b/lighty-modules/lighty-netconf-sb/src/main/resources/sampleConfigCluster.json @@ -17,7 +17,7 @@ }, "schemaServiceConfig":{ "topLevelModels": [ - { "usedBy":"CONTROLLER","name":"iana-if-type","revision":"2021-06-21","nameSpace":"urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy":"CONTROLLER","name":"iana-if-type","revision":"2023-01-26","nameSpace":"urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy":"CONTROLLER","name":"ietf-interfaces","revision":"2018-02-20","nameSpace":"urn:ietf:params:xml:ns:yang:ietf-interfaces"}, { "usedBy":"CONTROLLER","name":"ietf-yang-types","revision":"2013-07-15","nameSpace":"urn:ietf:params:xml:ns:yang:ietf-yang-types"}, { "usedBy":"CONTROLLER","name":"opendaylight-l2-types","revision":"2013-08-27","nameSpace":"urn:opendaylight:l2:types"}, diff --git a/lighty-modules/lighty-netconf-sb/src/main/resources/sampleConfigSingleNode.json b/lighty-modules/lighty-netconf-sb/src/main/resources/sampleConfigSingleNode.json index 96579f7e11..68f8aa16b9 100644 --- a/lighty-modules/lighty-netconf-sb/src/main/resources/sampleConfigSingleNode.json +++ b/lighty-modules/lighty-netconf-sb/src/main/resources/sampleConfigSingleNode.json @@ -17,7 +17,7 @@ }, "schemaServiceConfig":{ "topLevelModels": [ - { "usedBy":"CONTROLLER","name":"iana-if-type","revision":"2021-06-21","nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, + { "usedBy":"CONTROLLER","name":"iana-if-type","revision":"2023-01-26","nameSpace": "urn:ietf:params:xml:ns:yang:iana-if-type"}, { "usedBy":"CONTROLLER","name":"ietf-interfaces","revision":"2018-02-20","nameSpace":"urn:ietf:params:xml:ns:yang:ietf-interfaces"}, { "usedBy":"CONTROLLER","name":"ietf-yang-types","revision":"2013-07-15","nameSpace":"urn:ietf:params:xml:ns:yang:ietf-yang-types"}, { "usedBy":"CONTROLLER","name":"opendaylight-l2-types","revision":"2013-08-27","nameSpace":"urn:opendaylight:l2:types"}, diff --git a/lighty-modules/lighty-netconf-sb/src/test/java/io/lighty/modules/southbound/netconf/tests/SampleConfigTest.java b/lighty-modules/lighty-netconf-sb/src/test/java/io/lighty/modules/southbound/netconf/tests/SampleConfigTest.java index 4cf27cb821..f32c60ac82 100644 --- a/lighty-modules/lighty-netconf-sb/src/test/java/io/lighty/modules/southbound/netconf/tests/SampleConfigTest.java +++ b/lighty-modules/lighty-netconf-sb/src/test/java/io/lighty/modules/southbound/netconf/tests/SampleConfigTest.java @@ -33,7 +33,7 @@ public void loadTopLevelSingleNodeModelsFromJsonConfig() throws Exception { .getEffectiveModelContext().getModules().size(); assertTrue(lightyController.shutdown(TIME_OUT, TimeUnit.SECONDS)); - assertEquals(loadedModulesSize, 16); + assertEquals(loadedModulesSize, 17); } @Test @@ -45,7 +45,7 @@ public void loadTopLevelClusterModelsFromJsonConfig() throws Exception { .getEffectiveModelContext().getModules().size(); assertTrue(lightyController.shutdown(TIME_OUT, TimeUnit.SECONDS)); - assertEquals(loadedModulesSize, 16); + assertEquals(loadedModulesSize, 17); } private LightyController getLightyController(final String resource) throws Exception {