Recheck.
This is to support multiple VPP instances on same host.
Change-Id: Ibe511b1f790fc8771900085577423f7e71dc45df
Signed-off-by: Ole Troan <ot@cisco.com>
-pneum_connect (char *name)
+pneum_connect (char * name, char * chroot_prefix)
{
int rv = 0;
pneum_main_t *pm = &pneum_main;
{
int rv = 0;
pneum_main_t *pm = &pneum_main;
+ if (chroot_prefix != NULL)
+ vl_set_memory_root_path (chroot_prefix);
+
if ((rv = vl_client_api_map("/vpe-api"))) {
clib_warning ("vl_client_api map rv %d", rv);
return rv;
if ((rv = vl_client_api_map("/vpe-api"))) {
clib_warning ("vl_client_api map rv %d", rv);
return rv;
#ifndef included_pneum_h
#define included_pneum_h
#ifndef included_pneum_h
#define included_pneum_h
-int pneum_connect(char *name);
+int pneum_connect(char * name, char * chroot_prefix);
int pneum_disconnect(void);
int pneum_read(char **data, int *l);
int pneum_write(char *data, int len);
int pneum_disconnect(void);
int pneum_read(char **data, int *l);
int pneum_write(char *data, int len);
vl_api_show_version_t message;
vl_api_show_version_t *mp;
int async = 1;
vl_api_show_version_t message;
vl_api_show_version_t *mp;
int async = 1;
- int rv = pneum_connect("pneum_client");
+ int rv = pneum_connect("pneum_client", NULL);
if (rv != 0) {
printf("Connect failed: %d\n", rv);
if (rv != 0) {
printf("Connect failed: %d\n", rv);
static PyObject *
wrap_connect (PyObject *self, PyObject *args)
{
static PyObject *
wrap_connect (PyObject *self, PyObject *args)
{
+ char * name, * chroot_prefix = NULL;
- if (!PyArg_ParseTuple(args, "sO:set_callback", &name, &temp))
+ if (!PyArg_ParseTuple(args, "sO|s:wrap_connect", &name, &temp, &chroot_prefix))
return (NULL);
if (!PyCallable_Check(temp)) {
return (NULL);
if (!PyCallable_Check(temp)) {
pneum_callback = temp; /* Remember new callback */
Py_BEGIN_ALLOW_THREADS
pneum_callback = temp; /* Remember new callback */
Py_BEGIN_ALLOW_THREADS
- rv = pneum_connect(name);
+ rv = pneum_connect(name, chroot_prefix);
Py_END_ALLOW_THREADS
return PyLong_FromLong(rv);
}
Py_END_ALLOW_THREADS
return PyLong_FromLong(rv);
}
print('Signal handler called with signal', signum)
raise IOError("Couldn't connect to VPP!")
print('Signal handler called with signal', signum)
raise IOError("Couldn't connect to VPP!")
+def connect(name, chroot_prefix = None):
# Set the signal handler
signal.signal(signal.SIGALRM, handler)
signal.alarm(3) # 3 second
# Set the signal handler
signal.signal(signal.SIGALRM, handler)
signal.alarm(3) # 3 second
- rv = vpp_api.connect(name, msg_handler)
+ if not chroot_prefix:
+ rv = vpp_api.connect(name, msg_handler)
+ else:
+ rv = vpp_api.connect(name, msg_handler, chroot_prefix)
+