From f5199ed366896729160b9f1cafc597be81b5226e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 12 Jul 2022 17:31:27 +0200 Subject: [PATCH 1/1] Refactor standard model placement Rather than having standards models scattered throughout the repository, dedicate a namespace, org.opendaylight.netconf.model, and a top-level directory to hold them. JIRA: NETCONF-890 Change-Id: I4bc667a3b4977bc00b929e6c03472952f6d3dcad Signed-off-by: Robert Varga --- artifacts/pom.xml | 68 +++++++++++-------- features/netconf/odl-netconf-api/pom.xml | 12 ++-- features/restconf/odl-restconf-common/pom.xml | 4 +- model/pom.xml | 42 ++++++++++++ .../rfc5277}/pom.xml | 14 ++-- .../yang/nc-notifications@2008-07-14.yang | 0 .../main/yang/notifications@2008-07-14.yang | 0 .../rfc6022}/pom.xml | 6 +- .../state/schemas/LocationBuilder.java | 0 .../state/schemas/SchemaLocationBuilder.java | 0 .../main/yang/ietf-netconf-monitoring.yang | 0 .../ietf-netconf => model/rfc6241}/pom.xml | 6 +- .../main/yang/ietf-netconf@2011-06-01.yang | 0 .../rfc6243}/pom.xml | 10 +-- ...ietf-netconf-with-defaults@2011-06-01.yang | 0 model/rfc6470/pom.xml | 39 +++++++++++ ...ietf-netconf-notifications@2012-02-06.yang | 0 .../rfc8040-ietf-restconf-monitoring}/pom.xml | 6 +- .../ietf-restconf-monitoring@2017-01-26.yang | 0 .../rfc8341}/pom.xml | 6 +- .../rev180214/nacm/RuleListGroupBuilder.java | 0 .../list/RuleAccessOperationsBuilder.java | 0 .../nacm/rule/list/RuleModuleNameBuilder.java | 0 .../NotificationNotificationNameBuilder.java | 0 .../type/ProtocolOperationRpcNameBuilder.java | 0 .../yang/ietf-netconf-acm@2018-02-14.yang | 0 .../rfc8526}/pom.xml | 10 +-- .../GetDataInputMaxDepthBuilder.java | 0 .../yang/ietf-netconf-nmda@2019-01-07.yang | 0 .../rfc8639}/pom.xml | 10 +-- ...f-subscribed-notifications@2019-09-09.yang | 0 netconf/mdsal-netconf-connector/pom.xml | 4 +- netconf/mdsal-netconf-notification/pom.xml | 4 +- .../ietf-netconf-monitoring-extension/pom.xml | 4 +- netconf/models/pom.xml | 8 --- netconf/netconf-api/pom.xml | 10 +-- netconf/netconf-impl/pom.xml | 4 +- netconf/netconf-notifications-api/pom.xml | 12 ++-- .../{models => }/netconf-test-models/pom.xml | 2 +- ...work-topology-augment-test@2016-08-08.yang | 0 netconf/pom.xml | 2 + netconf/sal-netconf-connector/pom.xml | 16 ++--- netconf/tools/netconf-test-perf/pom.xml | 4 +- netconf/tools/netconf-testtool/pom.xml | 4 +- pom.xml | 1 + restconf/pom.xml | 1 - restconf/restconf-models/pom.xml | 29 -------- restconf/restconf-nb-rfc8040/pom.xml | 4 +- 48 files changed, 209 insertions(+), 133 deletions(-) create mode 100644 model/pom.xml rename {netconf/models/ietf-netconf-notifications => model/rfc5277}/pom.xml (72%) rename {netconf/models/ietf-netconf-notifications => model/rfc5277}/src/main/yang/nc-notifications@2008-07-14.yang (100%) rename {netconf/models/ietf-netconf-notifications => model/rfc5277}/src/main/yang/notifications@2008-07-14.yang (100%) rename {netconf/models/ietf-netconf-monitoring => model/rfc6022}/pom.xml (85%) rename {netconf/models/ietf-netconf-monitoring => model/rfc6022}/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/LocationBuilder.java (100%) rename {netconf/models/ietf-netconf-monitoring => model/rfc6022}/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java (100%) rename {netconf/models/ietf-netconf-monitoring => model/rfc6022}/src/main/yang/ietf-netconf-monitoring.yang (100%) rename {netconf/models/ietf-netconf => model/rfc6241}/pom.xml (82%) rename {netconf/models/ietf-netconf => model/rfc6241}/src/main/yang/ietf-netconf@2011-06-01.yang (100%) rename {netconf/models/ietf-netconf-with-defaults => model/rfc6243}/pom.xml (74%) rename {netconf/models/ietf-netconf-with-defaults => model/rfc6243}/src/main/yang/ietf-netconf-with-defaults@2011-06-01.yang (100%) create mode 100644 model/rfc6470/pom.xml rename {netconf/models/ietf-netconf-notifications => model/rfc6470}/src/main/yang/ietf-netconf-notifications@2012-02-06.yang (100%) rename {restconf/restconf-models/ietf-restconf-monitoring => model/rfc8040-ietf-restconf-monitoring}/pom.xml (84%) rename {restconf/restconf-models/ietf-restconf-monitoring => model/rfc8040-ietf-restconf-monitoring}/src/main/yang/ietf-restconf-monitoring@2017-01-26.yang (100%) rename {netconf/models/ietf-netconf-acm => model/rfc8341}/pom.xml (82%) rename {netconf/models/ietf-netconf-acm => model/rfc8341}/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/RuleListGroupBuilder.java (100%) rename {netconf/models/ietf-netconf-acm => model/rfc8341}/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleAccessOperationsBuilder.java (100%) rename {netconf/models/ietf-netconf-acm => model/rfc8341}/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleModuleNameBuilder.java (100%) rename {netconf/models/ietf-netconf-acm => model/rfc8341}/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/NotificationNotificationNameBuilder.java (100%) rename {netconf/models/ietf-netconf-acm => model/rfc8341}/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/ProtocolOperationRpcNameBuilder.java (100%) rename {netconf/models/ietf-netconf-acm => model/rfc8341}/src/main/yang/ietf-netconf-acm@2018-02-14.yang (100%) rename {netconf/models/ietf-netconf-nmda => model/rfc8526}/pom.xml (83%) rename {netconf/models/ietf-netconf-nmda => model/rfc8526}/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/nmda/rev190107/GetDataInputMaxDepthBuilder.java (100%) rename {netconf/models/ietf-netconf-nmda => model/rfc8526}/src/main/yang/ietf-netconf-nmda@2019-01-07.yang (100%) rename {restconf/restconf-models/ietf-subscribed-notifications => model/rfc8639}/pom.xml (81%) rename {restconf/restconf-models/ietf-subscribed-notifications => model/rfc8639}/src/main/yang/ietf-subscribed-notifications@2019-09-09.yang (100%) rename netconf/{models => }/netconf-test-models/pom.xml (95%) rename netconf/{models => }/netconf-test-models/src/main/yang/network-topology-augment-test@2016-08-08.yang (100%) delete mode 100644 restconf/restconf-models/pom.xml diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 063baf2586..7de87264be 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -123,47 +123,71 @@ ${project.version} + + - ${project.groupId} - ietf-netconf + org.opendaylight.netconf.model + rfc5277 ${project.version} - + - ${project.groupId} - ietf-netconf-acm + org.opendaylight.netconf.model + rfc6022 ${project.version} - + - ${project.groupId} - ietf-netconf-monitoring + org.opendaylight.netconf.model + rfc6241 ${project.version} + - ${project.groupId} - ietf-netconf-monitoring-extension + org.opendaylight.netconf.model + rfc6243 ${project.version} - + - ${project.groupId} - ietf-netconf-nmda + org.opendaylight.netconf.model + rfc6470 ${project.version} - + - ${project.groupId} - ietf-netconf-notifications + org.opendaylight.netconf.model + rfc8040-ietf-restconf-monitoring + ${project.version} + + + + org.opendaylight.netconf.model + rfc8341 + ${project.version} + + + + org.opendaylight.netconf.model + rfc8526 + ${project.version} + + + + org.opendaylight.netconf.model + rfc8639 ${project.version} + ${project.groupId} - ietf-netconf-with-defaults + ietf-netconf-monitoring-extension ${project.version} + ${project.groupId} netconf-test-models @@ -464,16 +488,6 @@ - - ${project.groupId} - ietf-restconf-monitoring - ${project.version} - - - ${project.groupId} - ietf-subscribed-notifications - ${project.version} - ${project.groupId} restconf-common-models diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml index e549e3522d..0db7ea92e0 100644 --- a/features/netconf/odl-netconf-api/pom.xml +++ b/features/netconf/odl-netconf-api/pom.xml @@ -59,12 +59,16 @@ ietf-netconf-monitoring-extension - org.opendaylight.netconf - ietf-netconf-notifications + org.opendaylight.netconf.model + rfc5277 - org.opendaylight.netconf - ietf-netconf-nmda + org.opendaylight.netconf.model + rfc6470 + + + org.opendaylight.netconf.model + rfc8526 diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml index 5a62998796..3747f8c81e 100644 --- a/features/restconf/odl-restconf-common/pom.xml +++ b/features/restconf/odl-restconf-common/pom.xml @@ -59,8 +59,8 @@ - org.opendaylight.netconf - ietf-restconf-monitoring + org.opendaylight.netconf.model + rfc8040-ietf-restconf-monitoring org.opendaylight.netconf diff --git a/model/pom.xml b/model/pom.xml new file mode 100644 index 0000000000..8bcb8037a8 --- /dev/null +++ b/model/pom.xml @@ -0,0 +1,42 @@ + + + + + 4.0.0 + + + org.opendaylight.odlparent + odlparent-lite + 11.0.0 + + + + org.opendaylight.netconf + model-aggregator + 4.0.0-SNAPSHOT + pom + ${project.artifactId} + + + true + true + + + + rfc5277 + rfc6022 + rfc6241 + rfc6243 + rfc6470 + rfc8040-ietf-restconf-monitoring + rfc8341 + rfc8526 + rfc8639 + + diff --git a/netconf/models/ietf-netconf-notifications/pom.xml b/model/rfc5277/pom.xml similarity index 72% rename from netconf/models/ietf-netconf-notifications/pom.xml rename to model/rfc5277/pom.xml index 9164b6d370..cb0b6026be 100644 --- a/netconf/models/ietf-netconf-notifications/pom.xml +++ b/model/rfc5277/pom.xml @@ -13,22 +13,16 @@ org.opendaylight.netconf netconf-parent 4.0.0-SNAPSHOT - ../../../parent + ../../parent - ietf-netconf-notifications + org.opendaylight.netconf.model + rfc5277 ${project.artifactId} bundle + RFC5277 NETCONF Event Notifications - - ${project.groupId} - ietf-netconf - - - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-inet-types - org.opendaylight.mdsal.binding.model.ietf rfc6991-ietf-yang-types diff --git a/netconf/models/ietf-netconf-notifications/src/main/yang/nc-notifications@2008-07-14.yang b/model/rfc5277/src/main/yang/nc-notifications@2008-07-14.yang similarity index 100% rename from netconf/models/ietf-netconf-notifications/src/main/yang/nc-notifications@2008-07-14.yang rename to model/rfc5277/src/main/yang/nc-notifications@2008-07-14.yang diff --git a/netconf/models/ietf-netconf-notifications/src/main/yang/notifications@2008-07-14.yang b/model/rfc5277/src/main/yang/notifications@2008-07-14.yang similarity index 100% rename from netconf/models/ietf-netconf-notifications/src/main/yang/notifications@2008-07-14.yang rename to model/rfc5277/src/main/yang/notifications@2008-07-14.yang diff --git a/netconf/models/ietf-netconf-monitoring/pom.xml b/model/rfc6022/pom.xml similarity index 85% rename from netconf/models/ietf-netconf-monitoring/pom.xml rename to model/rfc6022/pom.xml index e379876951..121b33bc6e 100644 --- a/netconf/models/ietf-netconf-monitoring/pom.xml +++ b/model/rfc6022/pom.xml @@ -13,12 +13,14 @@ org.opendaylight.netconf netconf-parent 4.0.0-SNAPSHOT - ../../../parent + ../../parent - ietf-netconf-monitoring + org.opendaylight.netconf.model + rfc6022 ${project.artifactId} bundle + RFC6020 YANG Module for NETCONF Monitoring diff --git a/netconf/models/ietf-netconf-monitoring/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/LocationBuilder.java b/model/rfc6022/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/LocationBuilder.java similarity index 100% rename from netconf/models/ietf-netconf-monitoring/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/LocationBuilder.java rename to model/rfc6022/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/LocationBuilder.java diff --git a/netconf/models/ietf-netconf-monitoring/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java b/model/rfc6022/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java similarity index 100% rename from netconf/models/ietf-netconf-monitoring/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java rename to model/rfc6022/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java diff --git a/netconf/models/ietf-netconf-monitoring/src/main/yang/ietf-netconf-monitoring.yang b/model/rfc6022/src/main/yang/ietf-netconf-monitoring.yang similarity index 100% rename from netconf/models/ietf-netconf-monitoring/src/main/yang/ietf-netconf-monitoring.yang rename to model/rfc6022/src/main/yang/ietf-netconf-monitoring.yang diff --git a/netconf/models/ietf-netconf/pom.xml b/model/rfc6241/pom.xml similarity index 82% rename from netconf/models/ietf-netconf/pom.xml rename to model/rfc6241/pom.xml index 4172b980fc..afea66f077 100644 --- a/netconf/models/ietf-netconf/pom.xml +++ b/model/rfc6241/pom.xml @@ -13,12 +13,14 @@ org.opendaylight.netconf netconf-parent 4.0.0-SNAPSHOT - ../../../parent + ../../parent - ietf-netconf + org.opendaylight.netconf.model + rfc6241 bundle ${project.artifactId} + RFC6241 Network Configuration Protocol (NETCONF) diff --git a/netconf/models/ietf-netconf/src/main/yang/ietf-netconf@2011-06-01.yang b/model/rfc6241/src/main/yang/ietf-netconf@2011-06-01.yang similarity index 100% rename from netconf/models/ietf-netconf/src/main/yang/ietf-netconf@2011-06-01.yang rename to model/rfc6241/src/main/yang/ietf-netconf@2011-06-01.yang diff --git a/netconf/models/ietf-netconf-with-defaults/pom.xml b/model/rfc6243/pom.xml similarity index 74% rename from netconf/models/ietf-netconf-with-defaults/pom.xml rename to model/rfc6243/pom.xml index 48ac2a8201..5e28f16b02 100644 --- a/netconf/models/ietf-netconf-with-defaults/pom.xml +++ b/model/rfc6243/pom.xml @@ -13,17 +13,19 @@ org.opendaylight.netconf netconf-parent 4.0.0-SNAPSHOT - ../../../parent + ../../parent - ietf-netconf-with-defaults + org.opendaylight.netconf.model + rfc6243 bundle ${project.artifactId} + RFC6243 With-defaults Capability for NETCONF - org.opendaylight.netconf - ietf-netconf + org.opendaylight.netconf.model + rfc6241 diff --git a/netconf/models/ietf-netconf-with-defaults/src/main/yang/ietf-netconf-with-defaults@2011-06-01.yang b/model/rfc6243/src/main/yang/ietf-netconf-with-defaults@2011-06-01.yang similarity index 100% rename from netconf/models/ietf-netconf-with-defaults/src/main/yang/ietf-netconf-with-defaults@2011-06-01.yang rename to model/rfc6243/src/main/yang/ietf-netconf-with-defaults@2011-06-01.yang diff --git a/model/rfc6470/pom.xml b/model/rfc6470/pom.xml new file mode 100644 index 0000000000..422e8d3c09 --- /dev/null +++ b/model/rfc6470/pom.xml @@ -0,0 +1,39 @@ + + + + 4.0.0 + + + org.opendaylight.netconf + netconf-parent + 4.0.0-SNAPSHOT + ../../parent + + + org.opendaylight.netconf.model + rfc6470 + bundle + ${project.artifactId} + RFC6470: NETCONF Base Notifications + + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-inet-types + + + org.opendaylight.mdsal.binding.model.ietf + rfc6991-ietf-yang-types + + + org.opendaylight.netconf.model + rfc6241 + + + diff --git a/netconf/models/ietf-netconf-notifications/src/main/yang/ietf-netconf-notifications@2012-02-06.yang b/model/rfc6470/src/main/yang/ietf-netconf-notifications@2012-02-06.yang similarity index 100% rename from netconf/models/ietf-netconf-notifications/src/main/yang/ietf-netconf-notifications@2012-02-06.yang rename to model/rfc6470/src/main/yang/ietf-netconf-notifications@2012-02-06.yang diff --git a/restconf/restconf-models/ietf-restconf-monitoring/pom.xml b/model/rfc8040-ietf-restconf-monitoring/pom.xml similarity index 84% rename from restconf/restconf-models/ietf-restconf-monitoring/pom.xml rename to model/rfc8040-ietf-restconf-monitoring/pom.xml index b287881a87..81d26d4b55 100644 --- a/restconf/restconf-models/ietf-restconf-monitoring/pom.xml +++ b/model/rfc8040-ietf-restconf-monitoring/pom.xml @@ -14,12 +14,14 @@ org.opendaylight.netconf netconf-parent 4.0.0-SNAPSHOT - ../../../parent + ../../parent - ietf-restconf-monitoring + org.opendaylight.netconf.model + rfc8040-ietf-restconf-monitoring bundle ${project.artifactId} + RFC8040 RESTCONF Protocol monitoring diff --git a/restconf/restconf-models/ietf-restconf-monitoring/src/main/yang/ietf-restconf-monitoring@2017-01-26.yang b/model/rfc8040-ietf-restconf-monitoring/src/main/yang/ietf-restconf-monitoring@2017-01-26.yang similarity index 100% rename from restconf/restconf-models/ietf-restconf-monitoring/src/main/yang/ietf-restconf-monitoring@2017-01-26.yang rename to model/rfc8040-ietf-restconf-monitoring/src/main/yang/ietf-restconf-monitoring@2017-01-26.yang diff --git a/netconf/models/ietf-netconf-acm/pom.xml b/model/rfc8341/pom.xml similarity index 82% rename from netconf/models/ietf-netconf-acm/pom.xml rename to model/rfc8341/pom.xml index d68a952944..128d9b142b 100644 --- a/netconf/models/ietf-netconf-acm/pom.xml +++ b/model/rfc8341/pom.xml @@ -13,12 +13,14 @@ org.opendaylight.netconf netconf-parent 4.0.0-SNAPSHOT - ../../../parent + ../../parent - ietf-netconf-acm + org.opendaylight.netconf.model + rfc8341 bundle ${project.artifactId} + RFC8341 Network Configuration Access Control Model diff --git a/netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/RuleListGroupBuilder.java b/model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/RuleListGroupBuilder.java similarity index 100% rename from netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/RuleListGroupBuilder.java rename to model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/RuleListGroupBuilder.java diff --git a/netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleAccessOperationsBuilder.java b/model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleAccessOperationsBuilder.java similarity index 100% rename from netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleAccessOperationsBuilder.java rename to model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleAccessOperationsBuilder.java diff --git a/netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleModuleNameBuilder.java b/model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleModuleNameBuilder.java similarity index 100% rename from netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleModuleNameBuilder.java rename to model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/RuleModuleNameBuilder.java diff --git a/netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/NotificationNotificationNameBuilder.java b/model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/NotificationNotificationNameBuilder.java similarity index 100% rename from netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/NotificationNotificationNameBuilder.java rename to model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/NotificationNotificationNameBuilder.java diff --git a/netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/ProtocolOperationRpcNameBuilder.java b/model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/ProtocolOperationRpcNameBuilder.java similarity index 100% rename from netconf/models/ietf-netconf-acm/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/ProtocolOperationRpcNameBuilder.java rename to model/rfc8341/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/acm/rev180214/nacm/rule/list/rule/rule/type/ProtocolOperationRpcNameBuilder.java diff --git a/netconf/models/ietf-netconf-acm/src/main/yang/ietf-netconf-acm@2018-02-14.yang b/model/rfc8341/src/main/yang/ietf-netconf-acm@2018-02-14.yang similarity index 100% rename from netconf/models/ietf-netconf-acm/src/main/yang/ietf-netconf-acm@2018-02-14.yang rename to model/rfc8341/src/main/yang/ietf-netconf-acm@2018-02-14.yang diff --git a/netconf/models/ietf-netconf-nmda/pom.xml b/model/rfc8526/pom.xml similarity index 83% rename from netconf/models/ietf-netconf-nmda/pom.xml rename to model/rfc8526/pom.xml index d2475fbdcc..bd9f0e94b2 100644 --- a/netconf/models/ietf-netconf-nmda/pom.xml +++ b/model/rfc8526/pom.xml @@ -13,12 +13,14 @@ org.opendaylight.netconf netconf-parent 4.0.0-SNAPSHOT - ../../../parent + ../../parent - ietf-netconf-nmda + org.opendaylight.netconf.model + rfc8526 bundle ${project.artifactId} + RFC8526 NETCONF Extensions to Support NMDA @@ -38,8 +40,8 @@ rfc8342-ietf-origin - org.opendaylight.netconf - ietf-netconf-with-defaults + org.opendaylight.netconf.model + rfc6243 diff --git a/netconf/models/ietf-netconf-nmda/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/nmda/rev190107/GetDataInputMaxDepthBuilder.java b/model/rfc8526/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/nmda/rev190107/GetDataInputMaxDepthBuilder.java similarity index 100% rename from netconf/models/ietf-netconf-nmda/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/nmda/rev190107/GetDataInputMaxDepthBuilder.java rename to model/rfc8526/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/nmda/rev190107/GetDataInputMaxDepthBuilder.java diff --git a/netconf/models/ietf-netconf-nmda/src/main/yang/ietf-netconf-nmda@2019-01-07.yang b/model/rfc8526/src/main/yang/ietf-netconf-nmda@2019-01-07.yang similarity index 100% rename from netconf/models/ietf-netconf-nmda/src/main/yang/ietf-netconf-nmda@2019-01-07.yang rename to model/rfc8526/src/main/yang/ietf-netconf-nmda@2019-01-07.yang diff --git a/restconf/restconf-models/ietf-subscribed-notifications/pom.xml b/model/rfc8639/pom.xml similarity index 81% rename from restconf/restconf-models/ietf-subscribed-notifications/pom.xml rename to model/rfc8639/pom.xml index 0bfb2dc70b..5e40640c40 100644 --- a/restconf/restconf-models/ietf-subscribed-notifications/pom.xml +++ b/model/rfc8639/pom.xml @@ -14,12 +14,14 @@ org.opendaylight.netconf netconf-parent 4.0.0-SNAPSHOT - ../../../parent + ../../parent - ietf-subscribed-notifications + org.opendaylight.netconf.model + rfc8639 bundle ${project.artifactId} + RFC8639 Subscription to YANG Notifications @@ -35,8 +37,8 @@ rfc8529 - org.opendaylight.netconf - ietf-netconf-acm + org.opendaylight.netconf.model + rfc8341 diff --git a/restconf/restconf-models/ietf-subscribed-notifications/src/main/yang/ietf-subscribed-notifications@2019-09-09.yang b/model/rfc8639/src/main/yang/ietf-subscribed-notifications@2019-09-09.yang similarity index 100% rename from restconf/restconf-models/ietf-subscribed-notifications/src/main/yang/ietf-subscribed-notifications@2019-09-09.yang rename to model/rfc8639/src/main/yang/ietf-subscribed-notifications@2019-09-09.yang diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml index 6eca647e46..87e44637a8 100644 --- a/netconf/mdsal-netconf-connector/pom.xml +++ b/netconf/mdsal-netconf-connector/pom.xml @@ -56,8 +56,8 @@ mockito-configuration - org.opendaylight.netconf - ietf-netconf + org.opendaylight.netconf.model + rfc6241 org.opendaylight.mdsal diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml index 1f493ac3d4..5a8a6faecb 100644 --- a/netconf/mdsal-netconf-notification/pom.xml +++ b/netconf/mdsal-netconf-notification/pom.xml @@ -37,8 +37,8 @@ mdsal-binding-runtime-spi - ${project.groupId} - ietf-netconf-notifications + org.opendaylight.netconf.model + rfc5277 ${project.groupId} diff --git a/netconf/models/ietf-netconf-monitoring-extension/pom.xml b/netconf/models/ietf-netconf-monitoring-extension/pom.xml index 54112ca976..30749d29fc 100644 --- a/netconf/models/ietf-netconf-monitoring-extension/pom.xml +++ b/netconf/models/ietf-netconf-monitoring-extension/pom.xml @@ -22,8 +22,8 @@ - ${project.groupId} - ietf-netconf-monitoring + org.opendaylight.netconf.model + rfc6022 diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml index f181b27a36..c64ac8f735 100644 --- a/netconf/models/pom.xml +++ b/netconf/models/pom.xml @@ -28,14 +28,6 @@ - ietf-netconf - ietf-netconf-acm - ietf-netconf-monitoring ietf-netconf-monitoring-extension - ietf-netconf-nmda - ietf-netconf-notifications - ietf-netconf-with-defaults - - netconf-test-models diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml index 1e339949f0..0dc1865640 100644 --- a/netconf/netconf-api/pom.xml +++ b/netconf/netconf-api/pom.xml @@ -25,15 +25,15 @@ io.netty netty-transport - - - ${project.groupId} - ietf-netconf-monitoring - org.opendaylight.yangtools yang-model-api + + org.opendaylight.netconf.model + rfc6022 + + org.opendaylight.yangtools mockito-configuration diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml index c350de3ac2..861258dc86 100644 --- a/netconf/netconf-impl/pom.xml +++ b/netconf/netconf-impl/pom.xml @@ -22,8 +22,8 @@ - ${project.groupId} - ietf-netconf-monitoring + org.opendaylight.netconf.model + rfc6022 ${project.groupId} diff --git a/netconf/netconf-notifications-api/pom.xml b/netconf/netconf-notifications-api/pom.xml index d2ff1ffcb9..18c1b6b45a 100644 --- a/netconf/netconf-notifications-api/pom.xml +++ b/netconf/netconf-notifications-api/pom.xml @@ -27,13 +27,17 @@ ${project.groupId} netconf-api - - ${project.groupId} - ietf-netconf-notifications - org.opendaylight.mdsal.binding.model.ietf rfc8525 + + org.opendaylight.netconf.model + rfc5277 + + + org.opendaylight.netconf.model + rfc6470 + diff --git a/netconf/models/netconf-test-models/pom.xml b/netconf/netconf-test-models/pom.xml similarity index 95% rename from netconf/models/netconf-test-models/pom.xml rename to netconf/netconf-test-models/pom.xml index 0af95673a5..e4b019e7d3 100644 --- a/netconf/models/netconf-test-models/pom.xml +++ b/netconf/netconf-test-models/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.netconf netconf-parent 4.0.0-SNAPSHOT - ../../../parent + ../../parent netconf-test-models diff --git a/netconf/models/netconf-test-models/src/main/yang/network-topology-augment-test@2016-08-08.yang b/netconf/netconf-test-models/src/main/yang/network-topology-augment-test@2016-08-08.yang similarity index 100% rename from netconf/models/netconf-test-models/src/main/yang/network-topology-augment-test@2016-08-08.yang rename to netconf/netconf-test-models/src/main/yang/network-topology-augment-test@2016-08-08.yang diff --git a/netconf/pom.xml b/netconf/pom.xml index 04b2635af5..cc524d8042 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -60,6 +60,8 @@ callhome-protocol callhome-provider + netconf-test-models + shaded-exificient-jar shaded-exificient shaded-sshd-jar diff --git a/netconf/sal-netconf-connector/pom.xml b/netconf/sal-netconf-connector/pom.xml index b395b64daf..dcc6bb7920 100644 --- a/netconf/sal-netconf-connector/pom.xml +++ b/netconf/sal-netconf-connector/pom.xml @@ -20,20 +20,20 @@ - ${project.groupId} - ietf-netconf-monitoring + org.opendaylight.mdsal.binding.model.ietf + rfc8525 - ${project.groupId} - ietf-netconf-monitoring-extension + org.opendaylight.netconf.model + rfc5277 - ${project.groupId} - ietf-netconf-notifications + org.opendaylight.netconf.model + rfc6022 - org.opendaylight.mdsal.binding.model.ietf - rfc8525 + ${project.groupId} + ietf-netconf-monitoring-extension ${project.groupId} diff --git a/netconf/tools/netconf-test-perf/pom.xml b/netconf/tools/netconf-test-perf/pom.xml index ca0609235f..0d8e644222 100644 --- a/netconf/tools/netconf-test-perf/pom.xml +++ b/netconf/tools/netconf-test-perf/pom.xml @@ -32,8 +32,8 @@ ietf-topology - org.opendaylight.netconf - ietf-netconf-notifications + org.opendaylight.netconf.model + rfc5277 org.opendaylight.netconf diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml index 97b71ba044..46872f9ddd 100644 --- a/netconf/tools/netconf-testtool/pom.xml +++ b/netconf/tools/netconf-testtool/pom.xml @@ -78,8 +78,8 @@ netconf-api - ${project.groupId} - ietf-netconf-monitoring + org.opendaylight.netconf.model + rfc6022 ${project.groupId} diff --git a/pom.xml b/pom.xml index e6b8ca8087..4e798a9cc0 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,7 @@ features karaf karaf-static + model netconf restconf diff --git a/restconf/pom.xml b/restconf/pom.xml index 14366430ec..6d0ac8afb9 100644 --- a/restconf/pom.xml +++ b/restconf/pom.xml @@ -28,7 +28,6 @@ - restconf-models restconf-common-models restconf-common restconf-nb-rfc8040 diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml deleted file mode 100644 index 1693896615..0000000000 --- a/restconf/restconf-models/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.odlparent - odlparent-lite - 11.0.0 - - - - org.opendaylight.netconf - restconf-models - 4.0.0-SNAPSHOT - pom - ${project.artifactId} - - - ietf-restconf-monitoring - ietf-subscribed-notifications - - diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml index 39c4147116..7e18595554 100644 --- a/restconf/restconf-nb-rfc8040/pom.xml +++ b/restconf/restconf-nb-rfc8040/pom.xml @@ -163,8 +163,8 @@ rfc8525 - org.opendaylight.netconf - ietf-restconf-monitoring + org.opendaylight.netconf.model + rfc8040-ietf-restconf-monitoring -- 2.36.6