summaryrefslogtreecommitdiffstats
path: root/routing/routing-api
diff options
context:
space:
mode:
Diffstat (limited to 'routing/routing-api')
-rw-r--r--routing/routing-api/pom.xml6
-rw-r--r--routing/routing-api/src/main/yang/vpp-routing-types@2018-04-06.yang14
-rw-r--r--routing/routing-api/src/main/yang/vpp-routing@2018-03-19.yang12
3 files changed, 22 insertions, 10 deletions
diff --git a/routing/routing-api/pom.xml b/routing/routing-api/pom.xml
index 799c968ca..e408fb841 100644
--- a/routing/routing-api/pom.xml
+++ b/routing/routing-api/pom.xml
@@ -65,6 +65,12 @@
</dependency>
<dependency>
+ <groupId>io.fd.hc2vpp.fib.management</groupId>
+ <artifactId>fib-management-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
diff --git a/routing/routing-api/src/main/yang/vpp-routing-types@2018-04-06.yang b/routing/routing-api/src/main/yang/vpp-routing-types@2018-04-06.yang
index cf26a1b2c..016084366 100644
--- a/routing/routing-api/src/main/yang/vpp-routing-types@2018-04-06.yang
+++ b/routing/routing-api/src/main/yang/vpp-routing-types@2018-04-06.yang
@@ -33,11 +33,9 @@ module vpp-routing-types {
description "Initial revision.";
}
- /*** Collection of types related to VPP routing ***/
-
- typedef vni-reference {
- type uint32;
- description "Vrf index reference";
+ import vpp-fib-table-management {
+ prefix fib-management;
+ revision-date 2018-05-21;
}
/*** Groupings ***/
@@ -51,10 +49,14 @@ module vpp-routing-types {
grouping table-lookup-case-params {
leaf secondary-vrf {
- type vni-reference;
+ type fib-management:fib-table-list-ref;
mandatory true;
description "Secondary vrf used to lookup in";
}
+ leaf address-family {
+ type fib-management:address-family-type;
+ description "Address family reference for secondary vrf.";
+ }
// uses special deaggregation address every time : 0.0.0.0
}
}
diff --git a/routing/routing-api/src/main/yang/vpp-routing@2018-03-19.yang b/routing/routing-api/src/main/yang/vpp-routing@2018-03-19.yang
index aad069bdf..5bb939182 100644
--- a/routing/routing-api/src/main/yang/vpp-routing@2018-03-19.yang
+++ b/routing/routing-api/src/main/yang/vpp-routing@2018-03-19.yang
@@ -16,9 +16,9 @@ module vpp-routing {
revision-date 2018-03-13;
}
- import vpp-routing-types {
- prefix vpp-routing-types;
- revision-date 2018-04-06;
+ import vpp-fib-table-management {
+ prefix fib-management;
+ revision-date 2018-05-21;
}
organization
@@ -70,10 +70,14 @@ module vpp-routing {
grouping vpp-routing-protocol-attributes{
//vrf_id
leaf primary-vrf{
- type vpp-routing-types:vni-reference;
+ type fib-management:fib-table-list-ref;
mandatory true;
description "Main vrf associated to route";
}
+ leaf address-family {
+ type fib-management:address-family-type;
+ description "Address family reference for primary vrf.";
+ }
}
augment /ietf-r:routing/ietf-r:control-plane-protocols/ietf-r:control-plane-protocol{