diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2016-05-04 10:17:39 +0200 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2016-05-05 08:41:23 +0200 |
| commit | f187ae2f6a363616442a8968db1450977ce69078 (patch) | |
| tree | 7e3c8799f931a47edbbf3a6ec40494a75a2a7d7f /v3po/impl | |
| parent | fd5c022142f871c78d29708c89afc941518acbd0 (diff) | |
HONEYCOMB-10: Porting v3po2vpp to the new Java API
Change-Id: Ic7166b0f578442165595aa44a587ebbc5db0e75c
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Diffstat (limited to 'v3po/impl')
| -rw-r--r-- | v3po/impl/pom.xml | 20 | ||||
| -rw-r--r-- | v3po/impl/src/main/config/default-config.xml | 2 | ||||
| -rw-r--r-- | v3po/impl/src/main/yang/v3po-impl.yang | 2 |
3 files changed, 2 insertions, 22 deletions
diff --git a/v3po/impl/pom.xml b/v3po/impl/pom.xml index 3678853f1..053e0ffc4 100644 --- a/v3po/impl/pom.xml +++ b/v3po/impl/pom.xml @@ -66,13 +66,6 @@ <version>1.0.0-Beryllium</version> </dependency> - - <dependency> - <groupId>io.fd.vpp</groupId> - <artifactId>vppjapi</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>ietf-topology</artifactId> @@ -90,19 +83,6 @@ <artifactId>mockito-all</artifactId> <scope>test</scope> </dependency> - <!--Needed due to final vppAPI, TODO remove once vppAPi refactored--> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.5.6</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.5.6</version> - <scope>test</scope> - </dependency> </dependencies> diff --git a/v3po/impl/src/main/config/default-config.xml b/v3po/impl/src/main/config/default-config.xml index 40478b7cc..f679521d1 100644 --- a/v3po/impl/src/main/config/default-config.xml +++ b/v3po/impl/src/main/config/default-config.xml @@ -18,7 +18,7 @@ <required-capabilities> <capability>urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&revision=2014-12-10</capability> <capability>urn:honeycomb:params:xml:ns:yang:translate:utils?module=translate-utils&revision=2016-04-06</capability> - <capability>urn:honeycomb:params:xml:ns:yang:vpp:japi:cfg?module=vpp-japi-cfg&revision=2016-04-06</capability> + <capability>urn:honeycomb:params:xml:ns:yang:vpp:jvpp:cfg?module=vpp-jvpp-cfg&revision=2016-04-06</capability> <capability>urn:honeycomb:params:xml:ns:yang:vpp:data:init?module=vpp-cfg-init&revision=2016-04-07</capability> <capability>urn:honeycomb:params:xml:ns:yang:data:impl?module=data-impl&revision=2016-04-11</capability> <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28</capability> diff --git a/v3po/impl/src/main/yang/v3po-impl.yang b/v3po/impl/src/main/yang/v3po-impl.yang index b4968576f..30b70f342 100644 --- a/v3po/impl/src/main/yang/v3po-impl.yang +++ b/v3po/impl/src/main/yang/v3po-impl.yang @@ -6,7 +6,7 @@ module v3po-impl { import config { prefix config; revision-date 2013-04-05; } import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;} import opendaylight-md-sal-dom {prefix dom;} - import vpp-japi-cfg { prefix vjc; revision-date 2016-04-06; } + import vpp-jvpp-cfg { prefix vjvppc; revision-date 2016-04-06; } import translate-api { prefix tapi; revision-date 2016-04-06; } import data-api { prefix dapi; revision-date 2016-04-11; } |