Use newer revision of iana-if-type

Update config files to match: opendaylight/mdsal@659d92d JIRA: LIGHTY-265 Signed-off-by: tobias.pobocik <[email protected]>
Tobianas · Nov 2, 2023 · 418034b · 418034b
1 parent 8614a06
commit 418034b
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 18 deletions.
diff --git a/...ions/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app-module/src/test/resources/config.json b/...ions/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/...mi-app-aggregator/lighty-rcgnmi-app/src/main/resources/example-config/example_config.json b/...mi-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/...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
@@ -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/...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
@@ -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/...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
@@ -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/...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
@@ -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-community-aaa-restconf-app/src/main/assembly/resources/sampleConfigSingleNode.json b/...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
@@ -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/...ty-community-restconf-actions-app/src/main/assembly/resources/sampleConfigSingleNode.json b/...ty-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/...ty-community-restconf-netconf-app/src/main/assembly/resources/sampleConfigSingleNode.json b/...ty-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...netconf-sb/src/test/java/io/lighty/modules/southbound/netconf/tests/SampleConfigTest.java b/...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 {