diff options
author | Dan Timoney <dtimoney@att.com> | 2017-03-31 16:00:20 -0400 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2017-03-31 17:51:18 -0400 |
commit | bc0d823b9350d7ffe01c632583c4eaf8d31f5118 (patch) | |
tree | aeb22a966db6f58c0960ca3dfc930c0f76736e64 /vnfapi/model | |
parent | 7fa068c6a98fbe975b037abfcdc1050b9f120fda (diff) |
[SDNC-5] Rebase sdnc-northbound
Port to OpenDaylight Boron and sync updates since 16.10
Change-Id: I036c5d0bb600b305300e653023caffc83a262604
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'vnfapi/model')
-rw-r--r-- | vnfapi/model/pom.xml | 4 | ||||
-rwxr-xr-x | vnfapi/model/src/main/yang/VNF-API.yang | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/vnfapi/model/pom.xml b/vnfapi/model/pom.xml index 6ac17fe3..43bef39d 100644 --- a/vnfapi/model/pom.xml +++ b/vnfapi/model/pom.xml @@ -30,7 +30,7 @@ <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>maven-sal-api-gen-plugin</artifactId> - <version>${odl.yangtools.version}</version> + <version>${odl.sal.api.gen.plugin.version}</version> <type>jar</type> </dependency> </dependencies> @@ -103,7 +103,7 @@ <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>yang-binding</artifactId> - <version>${odl.yangtools.version}</version> + <version>${odl.mdsal.yang.binding.version}</version> </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> diff --git a/vnfapi/model/src/main/yang/VNF-API.yang b/vnfapi/model/src/main/yang/VNF-API.yang index a786757f..f61b3e78 100755 --- a/vnfapi/model/src/main/yang/VNF-API.yang +++ b/vnfapi/model/src/main/yang/VNF-API.yang @@ -411,7 +411,11 @@ module VNF-API { ordered-by user;
leaf interface-route-prefix {
type ietf:ip-address;
- description "route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes";
+ description "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes";
+ }
+ leaf interface-route-prefix-cidr {
+ type string;
+ description "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes";
}
}
}
|