From 041bef9d9bc3fdb5aa0c7ff42d2ae861114029f5 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 27 Nov 2013 11:18:35 +0100 Subject: [PATCH] Refresh topology models and make them build Change-Id: Id967846cc94e23b42b52df198fcb60a0704e27a7 Signed-off-by: Robert Varga --- model/ietf/ietf-ted/pom.xml | 2 - model/ietf/ietf-topology-isis/pom.xml | 4 +- .../main/yang/isis-topology@2013-07-12.yang | 3 ++ .../main/yang/isis-topology@2013-10-21.yang | 3 ++ .../ietf/ietf-topology-l3-unicast-igp/pom.xml | 3 +- .../l3-unicast-igp-topology@2013-07-12.yang | 1 + .../l3-unicast-igp-topology@2013-10-21.yang | 1 + model/ietf/ietf-topology-ospf/pom.xml | 8 ++- .../yang/ospf-topology.yang@2013-10-21.yang | 3 ++ .../main/yang/ospf-topology@2013-07-12.yang | 13 +++-- model/ietf/ietf-topology/pom.xml | 2 - model/ietf/pom.xml | 49 +++++++++++++++++-- 12 files changed, 69 insertions(+), 23 deletions(-) diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml index 975cb9c46e..daa067e45d 100644 --- a/model/ietf/ietf-ted/pom.xml +++ b/model/ietf/ietf-ted/pom.xml @@ -16,12 +16,10 @@ org.opendaylight.yangtools.model ietf-inet-types - 2010.09.24.2-SNAPSHOT org.opendaylight.yangtools.model ietf-yang-types - 2010.09.24.2-SNAPSHOT diff --git a/model/ietf/ietf-topology-isis/pom.xml b/model/ietf/ietf-topology-isis/pom.xml index 41d8655fd6..890b9199a5 100644 --- a/model/ietf/ietf-topology-isis/pom.xml +++ b/model/ietf/ietf-topology-isis/pom.xml @@ -4,7 +4,7 @@ model-ietf org.opendaylight.yangtools.model - 0.5.7-SNAPSHOT + 0.1.1-SNAPSHOT 4.0.0 @@ -17,12 +17,10 @@ org.opendaylight.yangtools.model ietf-topology-l3-unicast-igp - 2013.07.12-SNAPSHOT org.opendaylight.yangtools.model ietf-ted - 2013.07.12-SNAPSHOT diff --git a/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-07-12.yang b/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-07-12.yang index 9ccf06cc05..a24b67c5a9 100644 --- a/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-07-12.yang +++ b/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-07-12.yang @@ -5,12 +5,15 @@ module isis-topology { prefix "isis"; import network-topology { prefix nt; + revision-date 2013-07-12; } import l3-unicast-igp-topology { prefix igp; + revision-date 2013-07-12; } import ted { prefix ted; + revision-date 2013-07-12; } organization "TBD"; diff --git a/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-10-21.yang b/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-10-21.yang index 2e704bc50a..9b2dd181c3 100644 --- a/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-10-21.yang +++ b/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-10-21.yang @@ -5,12 +5,15 @@ module isis-topology { prefix "isis"; import network-topology { prefix nt; + revision-date 2013-10-21; } import l3-unicast-igp-topology { prefix igp; + revision-date 2013-10-21; } import ted { prefix ted; + revision-date 2013-10-21; } organization "TBD"; diff --git a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml index a081740321..9689de6c98 100644 --- a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml +++ b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml @@ -4,7 +4,7 @@ model-ietf org.opendaylight.yangtools.model - 0.5.7-SNAPSHOT + 0.1.1-SNAPSHOT 4.0.0 @@ -17,7 +17,6 @@ org.opendaylight.yangtools.model ietf-topology - 2013.07.12-SNAPSHOT diff --git a/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-07-12.yang b/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-07-12.yang index 2a10d690f0..99df396d1d 100644 --- a/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-07-12.yang +++ b/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-07-12.yang @@ -5,6 +5,7 @@ module l3-unicast-igp-topology { prefix "l3t"; import network-topology { prefix "nt"; + revision-date 2013-07-12; } import ietf-inet-types { diff --git a/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-10-21.yang b/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-10-21.yang index f01d43b0c7..894d9b81f8 100644 --- a/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-10-21.yang +++ b/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-10-21.yang @@ -5,6 +5,7 @@ module l3-unicast-igp-topology { prefix "l3t"; import network-topology { prefix "nt"; + revision-date 2013-10-21; } import ietf-inet-types { diff --git a/model/ietf/ietf-topology-ospf/pom.xml b/model/ietf/ietf-topology-ospf/pom.xml index 638a266434..858bf9d783 100644 --- a/model/ietf/ietf-topology-ospf/pom.xml +++ b/model/ietf/ietf-topology-ospf/pom.xml @@ -4,7 +4,7 @@ model-ietf org.opendaylight.yangtools.model - 0.5.7-SNAPSHOT + 0.1.1-SNAPSHOT 4.0.0 @@ -16,13 +16,11 @@ org.opendaylight.yangtools.model - model-l3-unicast-igp-topology - 2013.07.12-SNAPSHOT + ietf-topology-l3-unicast-igp org.opendaylight.yangtools.model - model-ted - 2013.07.12-SNAPSHOT + ietf-ted diff --git a/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology.yang@2013-10-21.yang b/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology.yang@2013-10-21.yang index 576cd8262b..166573c436 100644 --- a/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology.yang@2013-10-21.yang +++ b/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology.yang@2013-10-21.yang @@ -7,16 +7,19 @@ module ospf-topology { import network-topology { prefix "nt"; + revision-date 2013-10-21; } import l3-unicast-igp-topology { prefix "l3t"; + revision-date 2013-10-21; } import ietf-inet-types { prefix "inet"; } import ted { prefix "ted"; + revision-date 2013-10-21; } organization "TBD"; diff --git a/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology@2013-07-12.yang b/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology@2013-07-12.yang index 49df1fb870..6c85ce10d5 100644 --- a/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology@2013-07-12.yang +++ b/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology@2013-07-12.yang @@ -1,21 +1,24 @@ ňmodule ospf-topology { yang-version 1; namespace "urn:ietf:params:xml:ns:yang:ospf-topology"; - // replace with IANA namespace when assigned + // replace with IANA namespace when assigned prefix "ospf"; import network-topology { - prefix "nt"; + prefix "nt"; + revision-date 2013-07-12; } import l3-unicast-igp-topology { - prefix "igp"; + prefix "igp"; + revision-date 2013-07-12; } import ietf-inet-types { - prefix "inet"; + prefix "inet"; } import ted { - prefix "ted"; + prefix "ted"; + revision-date 2013-07-12; } organization "TBD"; diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml index 25411ce093..cde8889fd3 100644 --- a/model/ietf/ietf-topology/pom.xml +++ b/model/ietf/ietf-topology/pom.xml @@ -17,12 +17,10 @@ org.opendaylight.yangtools.model ietf-inet-types - 2010.09.24.2-SNAPSHOT org.opendaylight.yangtools.model ietf-yang-types - 2010.09.24.2-SNAPSHOT diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml index 0c6a1452c1..59accecda1 100644 --- a/model/ietf/pom.xml +++ b/model/ietf/pom.xml @@ -12,16 +12,57 @@ ${project.artifactId} ${project.artifactId} + + 2013.10.21.0-SNAPSHOT + ietf-inet-types ietf-yang-types ietf-ted ietf-topology - - + + + + + + org.opendaylight.yangtools.model + ietf-inet-types + 2010.09.24.2-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-yang-types + 2010.09.24.2-SNAPSHOT + + + ${project.groupId} + ietf-ted + ${ietf.topology.version} + + + ${project.groupId} + ietf-topology + ${ietf.topology.version} + + + ${project.groupId} + ietf-topology-isis + ${ietf.topology.version} + + + ${project.groupId} + ietf-topology-l3-unicast-igp + ${ietf.topology.version} + + + ${project.groupId} + ietf-topology-ospf + ${ietf.topology.version} + + + -- 2.36.6