ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VPP-378: rename jvpp package to the same as groupId of deployed jars

Browse Source 
Related changes:
- NSH: https://gerrit.fd.io/r/#/c/3181/
- Honeycomb: https://gerrit.fd.io/r/#/c/3182

Change-Id: Ifdd6b8b575916fdf99794618dbe604c2e17e8e82
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
This commit is contained in:
Marek Gradzki
2016-09-28 10:12:04 +02:00
committed by Damjan Marion
parent 85ecc810ca
commit e85581cd07
44 changed files with 219 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
vpp-api/java/jvpp-core/org/openvpp/jvpp/core/test/CallbackApiTest.java → vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackApiTest.java
View File

@ -14,22 +14,22 @@
* limitations under the License.
*/
package org.openvpp.jvpp.core.test;
package io.fd.vpp.jvpp.core.test;
import org.openvpp.jvpp.JVpp;
import org.openvpp.jvpp.JVppRegistry;
import org.openvpp.jvpp.JVppRegistryImpl;
import org.openvpp.jvpp.VppCallbackException;
import org.openvpp.jvpp.core.JVppCoreImpl;
import org.openvpp.jvpp.core.callback.GetNodeIndexCallback;
import org.openvpp.jvpp.core.callback.ShowVersionCallback;
import org.openvpp.jvpp.core.callback.SwInterfaceCallback;
import org.openvpp.jvpp.core.dto.GetNodeIndex;
import org.openvpp.jvpp.core.dto.GetNodeIndexReply;
import org.openvpp.jvpp.core.dto.ShowVersion;
import org.openvpp.jvpp.core.dto.ShowVersionReply;
import org.openvpp.jvpp.core.dto.SwInterfaceDetails;
import org.openvpp.jvpp.core.dto.SwInterfaceDump;
import io.fd.vpp.jvpp.JVpp;
import io.fd.vpp.jvpp.JVppRegistry;
import io.fd.vpp.jvpp.JVppRegistryImpl;
import io.fd.vpp.jvpp.VppCallbackException;
import io.fd.vpp.jvpp.core.JVppCoreImpl;
import io.fd.vpp.jvpp.core.callback.GetNodeIndexCallback;
import io.fd.vpp.jvpp.core.callback.ShowVersionCallback;
import io.fd.vpp.jvpp.core.callback.SwInterfaceCallback;
import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
import io.fd.vpp.jvpp.core.dto.ShowVersion;
import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
public class CallbackApiTest {

18
vpp-api/java/jvpp-core/org/openvpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java → vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeNotificationTest.java
View File

@ -14,16 +14,16 @@
* limitations under the License.
*/
package org.openvpp.jvpp.core.test;
package io.fd.vpp.jvpp.core.test;
import org.openvpp.jvpp.JVppRegistry;
import org.openvpp.jvpp.JVppRegistryImpl;
import org.openvpp.jvpp.VppCallbackException;
import org.openvpp.jvpp.core.JVppCore;
import org.openvpp.jvpp.core.JVppCoreImpl;
import org.openvpp.jvpp.core.callback.WantInterfaceEventsCallback;
import org.openvpp.jvpp.core.callfacade.CallbackJVppCoreFacade;
import org.openvpp.jvpp.core.dto.WantInterfaceEventsReply;
import io.fd.vpp.jvpp.JVppRegistry;
import io.fd.vpp.jvpp.JVppRegistryImpl;
import io.fd.vpp.jvpp.VppCallbackException;
import io.fd.vpp.jvpp.core.JVppCore;
import io.fd.vpp.jvpp.core.JVppCoreImpl;
import io.fd.vpp.jvpp.core.callback.WantInterfaceEventsCallback;
import io.fd.vpp.jvpp.core.callfacade.CallbackJVppCoreFacade;
import io.fd.vpp.jvpp.core.dto.WantInterfaceEventsReply;
public class CallbackJVppFacadeNotificationTest {

24
vpp-api/java/jvpp-core/org/openvpp/jvpp/core/test/CallbackJVppFacadeTest.java → vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackJVppFacadeTest.java
View File

@ -14,19 +14,19 @@
* limitations under the License.
*/
package org.openvpp.jvpp.core.test;
package io.fd.vpp.jvpp.core.test;
import org.openvpp.jvpp.JVppRegistry;
import org.openvpp.jvpp.JVppRegistryImpl;
import org.openvpp.jvpp.VppCallbackException;
import org.openvpp.jvpp.core.JVppCore;
import org.openvpp.jvpp.core.JVppCoreImpl;
import org.openvpp.jvpp.core.callback.GetNodeIndexCallback;
import org.openvpp.jvpp.core.callback.ShowVersionCallback;
import org.openvpp.jvpp.core.callfacade.CallbackJVppCoreFacade;
import org.openvpp.jvpp.core.dto.GetNodeIndex;
import org.openvpp.jvpp.core.dto.GetNodeIndexReply;
import org.openvpp.jvpp.core.dto.ShowVersionReply;
import io.fd.vpp.jvpp.JVppRegistry;
import io.fd.vpp.jvpp.JVppRegistryImpl;
import io.fd.vpp.jvpp.VppCallbackException;
import io.fd.vpp.jvpp.core.JVppCore;
import io.fd.vpp.jvpp.core.JVppCoreImpl;
import io.fd.vpp.jvpp.core.callback.GetNodeIndexCallback;
import io.fd.vpp.jvpp.core.callback.ShowVersionCallback;
import io.fd.vpp.jvpp.core.callfacade.CallbackJVppCoreFacade;
import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
/**
* CallbackJVppFacade together with CallbackJVppFacadeCallback allow for setting different callback for each request.

32
vpp-api/java/jvpp-core/org/openvpp/jvpp/core/test/CallbackNotificationApiTest.java → vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CallbackNotificationApiTest.java
View File

@ -14,24 +14,24 @@
* limitations under the License.
*/
package org.openvpp.jvpp.core.test;
package io.fd.vpp.jvpp.core.test;
import static org.openvpp.jvpp.core.test.NotificationUtils.getChangeInterfaceState;
import static org.openvpp.jvpp.core.test.NotificationUtils.getDisableInterfaceNotificationsReq;
import static org.openvpp.jvpp.core.test.NotificationUtils.getEnableInterfaceNotificationsReq;
import static org.openvpp.jvpp.core.test.NotificationUtils.printNotification;
import static io.fd.vpp.jvpp.core.test.NotificationUtils.getChangeInterfaceState;
import static io.fd.vpp.jvpp.core.test.NotificationUtils.getDisableInterfaceNotificationsReq;
import static io.fd.vpp.jvpp.core.test.NotificationUtils.getEnableInterfaceNotificationsReq;
import static io.fd.vpp.jvpp.core.test.NotificationUtils.printNotification;
import org.openvpp.jvpp.JVpp;
import org.openvpp.jvpp.JVppRegistry;
import org.openvpp.jvpp.JVppRegistryImpl;
import org.openvpp.jvpp.VppCallbackException;
import org.openvpp.jvpp.core.JVppCoreImpl;
import org.openvpp.jvpp.core.callback.SwInterfaceSetFlagsCallback;
import org.openvpp.jvpp.core.callback.SwInterfaceSetFlagsNotificationCallback;
import org.openvpp.jvpp.core.callback.WantInterfaceEventsCallback;
import org.openvpp.jvpp.core.dto.SwInterfaceSetFlagsNotification;
import org.openvpp.jvpp.core.dto.SwInterfaceSetFlagsReply;
import org.openvpp.jvpp.core.dto.WantInterfaceEventsReply;
import io.fd.vpp.jvpp.JVpp;
import io.fd.vpp.jvpp.JVppRegistry;
import io.fd.vpp.jvpp.JVppRegistryImpl;
import io.fd.vpp.jvpp.VppCallbackException;
import io.fd.vpp.jvpp.core.JVppCoreImpl;
import io.fd.vpp.jvpp.core.callback.SwInterfaceSetFlagsCallback;
import io.fd.vpp.jvpp.core.callback.SwInterfaceSetFlagsNotificationCallback;
import io.fd.vpp.jvpp.core.callback.WantInterfaceEventsCallback;
import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsNotification;
import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsReply;
import io.fd.vpp.jvpp.core.dto.WantInterfaceEventsReply;
public class CallbackNotificationApiTest {

18
vpp-api/java/jvpp-core/org/openvpp/jvpp/core/test/ControlPingTest.java → vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/ControlPingTest.java
View File

@ -14,16 +14,16 @@
* limitations under the License.
*/
package org.openvpp.jvpp.core.test;
package io.fd.vpp.jvpp.core.test;
import org.openvpp.jvpp.JVpp;
import org.openvpp.jvpp.JVppRegistry;
import org.openvpp.jvpp.JVppRegistryImpl;
import org.openvpp.jvpp.VppCallbackException;
import org.openvpp.jvpp.core.JVppCoreImpl;
import org.openvpp.jvpp.callback.ControlPingCallback;
import org.openvpp.jvpp.dto.ControlPing;
import org.openvpp.jvpp.dto.ControlPingReply;
import io.fd.vpp.jvpp.JVpp;
import io.fd.vpp.jvpp.JVppRegistry;
import io.fd.vpp.jvpp.JVppRegistryImpl;
import io.fd.vpp.jvpp.VppCallbackException;
import io.fd.vpp.jvpp.core.JVppCoreImpl;
import io.fd.vpp.jvpp.callback.ControlPingCallback;
import io.fd.vpp.jvpp.dto.ControlPing;
import io.fd.vpp.jvpp.dto.ControlPingReply;
public class ControlPingTest {

20
vpp-api/java/jvpp-core/org/openvpp/jvpp/core/test/CreateSubInterfaceTest.java → vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/CreateSubInterfaceTest.java
View File

@ -14,19 +14,19 @@
* limitations under the License.
*/
package org.openvpp.jvpp.core.test;
package io.fd.vpp.jvpp.core.test;
import static java.util.Objects.requireNonNull;
import org.openvpp.jvpp.JVpp;
import org.openvpp.jvpp.JVppRegistry;
import org.openvpp.jvpp.JVppRegistryImpl;
import org.openvpp.jvpp.core.JVppCoreImpl;
import org.openvpp.jvpp.core.dto.CreateSubif;
import org.openvpp.jvpp.core.dto.CreateSubifReply;
import org.openvpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
import org.openvpp.jvpp.core.dto.SwInterfaceDump;
import org.openvpp.jvpp.core.future.FutureJVppCoreFacade;
import io.fd.vpp.jvpp.JVpp;
import io.fd.vpp.jvpp.JVppRegistry;
import io.fd.vpp.jvpp.JVppRegistryImpl;
import io.fd.vpp.jvpp.core.JVppCoreImpl;
import io.fd.vpp.jvpp.core.dto.CreateSubif;
import io.fd.vpp.jvpp.core.dto.CreateSubifReply;
import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
/**
* <p>Tests sub-interface creation.<br> Equivalent to:<br>

18
vpp-api/java/jvpp-core/org/openvpp/jvpp/core/test/FutureApiNotificationTest.java → vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiNotificationTest.java
View File

@ -14,17 +14,17 @@
* limitations under the License.
*/
package org.openvpp.jvpp.core.test;
package io.fd.vpp.jvpp.core.test;
import static org.openvpp.jvpp.core.test.NotificationUtils.getChangeInterfaceState;
import static org.openvpp.jvpp.core.test.NotificationUtils.getDisableInterfaceNotificationsReq;
import static org.openvpp.jvpp.core.test.NotificationUtils.getEnableInterfaceNotificationsReq;
import static io.fd.vpp.jvpp.core.test.NotificationUtils.getChangeInterfaceState;
import static io.fd.vpp.jvpp.core.test.NotificationUtils.getDisableInterfaceNotificationsReq;
import static io.fd.vpp.jvpp.core.test.NotificationUtils.getEnableInterfaceNotificationsReq;
import org.openvpp.jvpp.JVpp;
import org.openvpp.jvpp.JVppRegistry;
import org.openvpp.jvpp.JVppRegistryImpl;
import org.openvpp.jvpp.core.JVppCoreImpl;
import org.openvpp.jvpp.core.future.FutureJVppCoreFacade;
import io.fd.vpp.jvpp.JVpp;
import io.fd.vpp.jvpp.JVppRegistry;
import io.fd.vpp.jvpp.JVppRegistryImpl;
import io.fd.vpp.jvpp.core.JVppCoreImpl;
import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
public class FutureApiNotificationTest {

30
vpp-api/java/jvpp-core/org/openvpp/jvpp/core/test/FutureApiTest.java → vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/FutureApiTest.java
View File

@ -14,27 +14,27 @@
* limitations under the License.
*/
package org.openvpp.jvpp.core.test;
package io.fd.vpp.jvpp.core.test;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.openvpp.jvpp.JVpp;
import org.openvpp.jvpp.JVppRegistry;
import org.openvpp.jvpp.JVppRegistryImpl;
import org.openvpp.jvpp.core.JVppCoreImpl;
import org.openvpp.jvpp.core.dto.BridgeDomainDetailsReplyDump;
import org.openvpp.jvpp.core.dto.BridgeDomainDump;
import org.openvpp.jvpp.core.dto.GetNodeIndex;
import org.openvpp.jvpp.core.dto.GetNodeIndexReply;
import org.openvpp.jvpp.core.dto.ShowVersion;
import org.openvpp.jvpp.core.dto.ShowVersionReply;
import org.openvpp.jvpp.core.dto.SwInterfaceDetails;
import org.openvpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
import org.openvpp.jvpp.core.dto.SwInterfaceDump;
import org.openvpp.jvpp.core.future.FutureJVppCoreFacade;
import io.fd.vpp.jvpp.JVpp;
import io.fd.vpp.jvpp.JVppRegistry;
import io.fd.vpp.jvpp.JVppRegistryImpl;
import io.fd.vpp.jvpp.core.JVppCoreImpl;
import io.fd.vpp.jvpp.core.dto.BridgeDomainDetailsReplyDump;
import io.fd.vpp.jvpp.core.dto.BridgeDomainDump;
import io.fd.vpp.jvpp.core.dto.GetNodeIndex;
import io.fd.vpp.jvpp.core.dto.GetNodeIndexReply;
import io.fd.vpp.jvpp.core.dto.ShowVersion;
import io.fd.vpp.jvpp.core.dto.ShowVersionReply;
import io.fd.vpp.jvpp.core.dto.SwInterfaceDetails;
import io.fd.vpp.jvpp.core.dto.SwInterfaceDetailsReplyDump;
import io.fd.vpp.jvpp.core.dto.SwInterfaceDump;
import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
public class FutureApiTest {

40
vpp-api/java/jvpp-core/org/openvpp/jvpp/core/test/L2AclTest.java → vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/L2AclTest.java
View File

@ -14,28 +14,28 @@
* limitations under the License.
*/
package org.openvpp.jvpp.core.test;
package io.fd.vpp.jvpp.core.test;
import javax.xml.bind.DatatypeConverter;
import org.openvpp.jvpp.JVpp;
import org.openvpp.jvpp.JVppRegistry;
import org.openvpp.jvpp.JVppRegistryImpl;
import org.openvpp.jvpp.core.JVppCoreImpl;
import org.openvpp.jvpp.core.dto.ClassifyAddDelSession;
import org.openvpp.jvpp.core.dto.ClassifyAddDelSessionReply;
import org.openvpp.jvpp.core.dto.ClassifyAddDelTable;
import org.openvpp.jvpp.core.dto.ClassifyAddDelTableReply;
import org.openvpp.jvpp.core.dto.ClassifySessionDetailsReplyDump;
import org.openvpp.jvpp.core.dto.ClassifySessionDump;
import org.openvpp.jvpp.core.dto.ClassifyTableByInterface;
import org.openvpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
import org.openvpp.jvpp.core.dto.ClassifyTableIds;
import org.openvpp.jvpp.core.dto.ClassifyTableIdsReply;
import org.openvpp.jvpp.core.dto.ClassifyTableInfo;
import org.openvpp.jvpp.core.dto.ClassifyTableInfoReply;
import org.openvpp.jvpp.core.dto.InputAclSetInterface;
import org.openvpp.jvpp.core.dto.InputAclSetInterfaceReply;
import org.openvpp.jvpp.core.future.FutureJVppCoreFacade;
import io.fd.vpp.jvpp.JVpp;
import io.fd.vpp.jvpp.JVppRegistry;
import io.fd.vpp.jvpp.JVppRegistryImpl;
import io.fd.vpp.jvpp.core.JVppCoreImpl;
import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSession;
import io.fd.vpp.jvpp.core.dto.ClassifyAddDelSessionReply;
import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTable;
import io.fd.vpp.jvpp.core.dto.ClassifyAddDelTableReply;
import io.fd.vpp.jvpp.core.dto.ClassifySessionDetailsReplyDump;
import io.fd.vpp.jvpp.core.dto.ClassifySessionDump;
import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterface;
import io.fd.vpp.jvpp.core.dto.ClassifyTableByInterfaceReply;
import io.fd.vpp.jvpp.core.dto.ClassifyTableIds;
import io.fd.vpp.jvpp.core.dto.ClassifyTableIdsReply;
import io.fd.vpp.jvpp.core.dto.ClassifyTableInfo;
import io.fd.vpp.jvpp.core.dto.ClassifyTableInfoReply;
import io.fd.vpp.jvpp.core.dto.InputAclSetInterface;
import io.fd.vpp.jvpp.core.dto.InputAclSetInterfaceReply;
import io.fd.vpp.jvpp.core.future.FutureJVppCoreFacade;
/**
* <p>Tests L2 ACL creation and read.<br> Equivalent to the following vppctl commands:<br>

8
vpp-api/java/jvpp-core/org/openvpp/jvpp/core/test/NotificationUtils.java → vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/NotificationUtils.java
View File

@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.openvpp.jvpp.core.test;
package io.fd.vpp.jvpp.core.test;
import java.io.PrintStream;
import org.openvpp.jvpp.core.dto.SwInterfaceSetFlags;
import org.openvpp.jvpp.core.dto.SwInterfaceSetFlagsNotification;
import org.openvpp.jvpp.core.dto.WantInterfaceEvents;
import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlags;
import io.fd.vpp.jvpp.core.dto.SwInterfaceSetFlagsNotification;
import io.fd.vpp.jvpp.core.dto.WantInterfaceEvents;
final class NotificationUtils {

2
vpp-api/java/jvpp-core/org/openvpp/jvpp/core/test/Readme.txt → vpp-api/java/jvpp-core/io/fd/vpp/jvpp/core/test/Readme.txt
View File

@ -2,7 +2,7 @@ This package contains basic tests for jvpp. To run the tests:
- Make sure VPP is running
- From VPP's build-root/ folder execute:
- sudo java -cp build-vpp_debug-native/vpp-api/java/jvpp-registry-16.12.jar:build-vpp_debug-native/vpp-api/java/jvpp-core-16.12.jar org.openvpp.jvpp.core.test.[test name]
- sudo java -cp build-vpp_debug-native/vpp-api/java/jvpp-registry-16.12.jar:build-vpp_debug-native/vpp-api/java/jvpp-core-16.12.jar io.fd.vpp.jvpp.core.test.[test name]
Available tests:
CallbackApiTest - Similar to ControlPingTest, invokes more complex calls (e.g. interface dump) using low level JVpp APIs

6
vpp-api/java/jvpp-core/jvpp_core.c
View File

@ -55,10 +55,10 @@ typedef struct {
core_main_t core_main __attribute__((aligned (64)));
#include "org_openvpp_jvpp_core_JVppCoreImpl.h"
#include "io_fd_vpp_jvpp_core_JVppCoreImpl.h"
#include "jvpp_core_gen.h"
JNIEXPORT void JNICALL Java_org_openvpp_jvpp_core_JVppCoreImpl_init0
JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_core_JVppCoreImpl_init0
(JNIEnv * env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
core_main_t * plugin_main = &core_main;
plugin_main->my_client_index = my_client_index;
@ -78,7 +78,7 @@ JNIEXPORT void JNICALL Java_org_openvpp_jvpp_core_JVppCoreImpl_init0
#undef _
}
JNIEXPORT void JNICALL Java_org_openvpp_jvpp_core_JVppCoreImpl_close0
JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_core_JVppCoreImpl_close0
(JNIEnv *env, jclass clazz) {
core_main_t * plugin_main = &core_main;