summaryrefslogtreecommitdiffstats
path: root/v3po/v3po2vpp/src/main
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2016-12-12 09:13:50 +0100
committerMarek Gradzki <mgradzki@cisco.com>2016-12-13 13:28:36 +0100
commit218e4d0f49e6cec18a9aabd77d2291d134754c1f (patch)
treeb0650cac08f4a26cee5c32fc74513e807b523a99 /v3po/v3po2vpp/src/main
parenta0053ac0bfadabafca3d80e3b3500f82913f3235 (diff)
HONEYCOMB-151: add support for cli_inband
Depends on https://gerrit.fd.io/r/#/c/4256/ Change-Id: I5b7a218751ee680de076e5c4ae0d6cbe31b3ec06 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'v3po/v3po2vpp/src/main')
-rw-r--r--v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java7
-rw-r--r--v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/rpc/CliInbandService.java62
2 files changed, 69 insertions, 0 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java
index e04a421e2..fce96b7f5 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java
@@ -34,9 +34,11 @@ import io.fd.hc2vpp.v3po.factory.VppStateHoneycombReaderFactory;
import io.fd.hc2vpp.v3po.interfaces.acl.egress.EgressIetfAclWriter;
import io.fd.hc2vpp.v3po.interfaces.acl.ingress.IngressIetfAclWriter;
import io.fd.hc2vpp.v3po.notification.InterfaceChangeNotificationProducer;
+import io.fd.hc2vpp.v3po.rpc.CliInbandService;
import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManager;
import io.fd.hc2vpp.v3po.vppclassifier.VppClassifierContextManagerImpl;
import io.fd.honeycomb.notification.ManagedNotificationProducer;
+import io.fd.honeycomb.rpc.RpcService;
import io.fd.honeycomb.translate.read.ReaderFactory;
import io.fd.honeycomb.translate.write.WriterFactory;
import java.util.concurrent.Executors;
@@ -98,6 +100,11 @@ public class V3poModule extends AbstractModule {
final Multibinder<ManagedNotificationProducer> notifiersBinder =
Multibinder.newSetBinder(binder(), ManagedNotificationProducer.class);
notifiersBinder.addBinding().to(InterfaceChangeNotificationProducer.class);
+
+ // RPCs
+ final Multibinder<RpcService> rpcsBinder = Multibinder.newSetBinder(binder(), RpcService.class);
+ rpcsBinder.addBinding().to(CliInbandService.class);
+
LOG.info("Module V3PO successfully configured");
}
}
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/rpc/CliInbandService.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/rpc/CliInbandService.java
new file mode 100644
index 000000000..7128d06bc
--- /dev/null
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/rpc/CliInbandService.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2016 Cisco and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.hc2vpp.v3po.rpc;
+
+import com.google.inject.Inject;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.honeycomb.rpc.RpcService;
+import io.fd.vpp.jvpp.core.dto.CliInband;
+import io.fd.vpp.jvpp.core.future.FutureJVppCore;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.CompletionStage;
+import javax.annotation.Nonnull;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.CliInbandInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.CliInbandOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.CliInbandOutputBuilder;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+
+public class CliInbandService implements RpcService<CliInbandInput, CliInbandOutput>, JvppReplyConsumer {
+
+ private final FutureJVppCore jvpp;
+ private static final String localName = "cli-inband";
+ private static final QName name = QName.create(CliInbandInput.QNAME, localName);
+ private static final SchemaPath schemaPath = SchemaPath.ROOT.createChild(name);
+
+ @Inject
+ public CliInbandService(@Nonnull final FutureJVppCore jvpp) {
+ this.jvpp = jvpp;
+ }
+
+ @Override
+ @Nonnull
+ public CompletionStage<CliInbandOutput> invoke(@Nonnull final CliInbandInput input) {
+ final CliInband request = new CliInband();
+ request.cmd = input.getCmd().getBytes(StandardCharsets.UTF_8);
+ request.length = request.cmd.length;
+ return jvpp.cliInband(request)
+ .thenApply(
+ reply -> new CliInbandOutputBuilder().setReply(new String(reply.reply)).build()
+ );
+ }
+
+ @Nonnull
+ @Override
+ public SchemaPath getManagedNode() {
+ return schemaPath;
+ }
+}