summaryrefslogtreecommitdiffstats
path: root/routing
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2018-07-17 07:06:27 +0200
committerMarek Gradzki <mgradzki@cisco.com>2018-07-17 07:30:45 +0200
commitdb71be30add5f4bc1c4324023b78c7a828cd28f5 (patch)
tree26d944137a8202c6b14d26be8fbd8ae337bdb549 /routing
parentba6e99e27e2a54bd448c491e22a4e3fc26f45df6 (diff)
Remove workarounds from routing and mpls models related to YANGTOOLS-841
YANGTOOLS-841 was fixed in Oxygen SR1 used by HC since 18.07. Change-Id: Ifa2627e284574a0bab84763dc2b6252a4b6be4a3 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'routing')
-rwxr-xr-xrouting/routing-api/src/main/yang/hc2vpp-ietf-ipv4-unicast-routing@2018-03-13.yang8
-rwxr-xr-xrouting/routing-api/src/main/yang/hc2vpp-ietf-ipv6-unicast-routing@2018-03-13.yang8
-rwxr-xr-xrouting/routing-api/src/main/yang/hc2vpp-ietf-routing@2018-03-13.yang11
3 files changed, 9 insertions, 18 deletions
diff --git a/routing/routing-api/src/main/yang/hc2vpp-ietf-ipv4-unicast-routing@2018-03-13.yang b/routing/routing-api/src/main/yang/hc2vpp-ietf-ipv4-unicast-routing@2018-03-13.yang
index 8d2f94848..37e47a8bc 100755
--- a/routing/routing-api/src/main/yang/hc2vpp-ietf-ipv4-unicast-routing@2018-03-13.yang
+++ b/routing/routing-api/src/main/yang/hc2vpp-ietf-ipv4-unicast-routing@2018-03-13.yang
@@ -126,8 +126,8 @@ module hc2vpp-ietf-ipv4-unicast-routing {
/*
TODO(HC2VPP-298):
- needed to comment out action which caused problems probapby simmilar to:
- https://jira.opendaylight.org/browse/YANGTOOLS-841
+ action augmentation does not work:
+ https://jira.opendaylight.org/browse/MDSAL-300
augment
"/rt:routing/rt:ribs/rt:rib/rt:active-route/rt:input" {
@@ -314,8 +314,8 @@ module hc2vpp-ietf-ipv4-unicast-routing {
}
/*
TODO(HC2VPP-298):
- needed to comment out action which caused problems probapby simmilar to:
- https://jira.opendaylight.org/browse/YANGTOOLS-841
+ action augmentation does not work:
+ https://jira.opendaylight.org/browse/MDSAL-300
augment "/rt:routing-state/rt:ribs/rt:rib/rt:active-route/"
+ "rt:input" {
diff --git a/routing/routing-api/src/main/yang/hc2vpp-ietf-ipv6-unicast-routing@2018-03-13.yang b/routing/routing-api/src/main/yang/hc2vpp-ietf-ipv6-unicast-routing@2018-03-13.yang
index 664bce29f..359e23362 100755
--- a/routing/routing-api/src/main/yang/hc2vpp-ietf-ipv6-unicast-routing@2018-03-13.yang
+++ b/routing/routing-api/src/main/yang/hc2vpp-ietf-ipv6-unicast-routing@2018-03-13.yang
@@ -149,8 +149,8 @@ module hc2vpp-ietf-ipv6-unicast-routing {
}
/*
TODO(HC2VPP-298):
- needed to comment out action which caused problems probapby simmilar to:
- https://jira.opendaylight.org/browse/YANGTOOLS-841
+ action augmentation does not work:
+ https://jira.opendaylight.org/browse/MDSAL-300
augment
"/rt:routing/rt:ribs/rt:rib/rt:active-route/rt:input" {
@@ -339,8 +339,8 @@ module hc2vpp-ietf-ipv6-unicast-routing {
}
/*
TODO(HC2VPP-298):
- needed to comment out action which caused problems probapby simmilar to:
- https://jira.opendaylight.org/browse/YANGTOOLS-841
+ action augmentation does not work:
+ https://jira.opendaylight.org/browse/MDSAL-300
augment "/rt:routing-state/rt:ribs/rt:rib/"
+ "rt:active-route/rt:input" {
diff --git a/routing/routing-api/src/main/yang/hc2vpp-ietf-routing@2018-03-13.yang b/routing/routing-api/src/main/yang/hc2vpp-ietf-routing@2018-03-13.yang
index 837ce7f67..bec64c871 100755
--- a/routing/routing-api/src/main/yang/hc2vpp-ietf-routing@2018-03-13.yang
+++ b/routing/routing-api/src/main/yang/hc2vpp-ietf-routing@2018-03-13.yang
@@ -509,10 +509,6 @@ module hc2vpp-ietf-routing {
uses route-metadata;
}
}
- /*
- TODO(HC2VPP-298):
- needed to comment out action which caused problems probapby simmilar to:
- https://jira.opendaylight.org/browse/YANGTOOLS-841
action active-route {
description
@@ -540,7 +536,7 @@ module hc2vpp-ietf-routing {
}
}
}
- */
+
leaf description {
type string;
description
@@ -690,10 +686,6 @@ module hc2vpp-ietf-routing {
}
}
}
- /*
- TODO(HC2VPP-298):
- needed to comment out action which caused problems probapby simmilar to:
- https://jira.opendaylight.org/browse/YANGTOOLS-841
action active-route {
status obsolete;
@@ -733,7 +725,6 @@ module hc2vpp-ietf-routing {
}
}
}
- */
}
}
}