diff options
-rwxr-xr-x | ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java | 14 | ||||
-rw-r--r-- | ioam/ioam_postman_collection.json (renamed from ioam/ioam_trace_postman_collection.json) | 29 |
2 files changed, 37 insertions, 6 deletions
diff --git a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java index f4b2cea19..9d812467f 100755 --- a/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java +++ b/ioam/impl/src/main/java/io/fd/hc2vpp/vppioam/impl/config/VppIoamWriterFactory.java @@ -16,20 +16,22 @@ package io.fd.hc2vpp.vppioam.impl.config; +import com.google.common.collect.Sets; import com.google.inject.Inject; import io.fd.honeycomb.translate.impl.write.GenericListWriter; import io.fd.honeycomb.translate.write.WriterFactory; import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; import io.fd.vpp.jvpp.ioampot.future.FutureJVppIoampot; import io.fd.vpp.jvpp.ioamtrace.future.FutureJVppIoamtrace; +import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.IoamTraceConfig; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.TraceConfig; +import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.trace.rev160512.ioam.trace.config.trace.config.NodeInterfaces; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.ioam.sb.pot.rev160615.PotProfiles; +import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.ioam.sb.pot.rev160615.pot.profile.PotProfileList; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.ioam.sb.pot.rev160615.pot.profiles.PotProfileSet; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import javax.annotation.Nonnull; - public class VppIoamWriterFactory implements WriterFactory { @Nonnull @@ -49,11 +51,15 @@ public class VppIoamWriterFactory implements WriterFactory { // Trace Config final InstanceIdentifier<TraceConfig> trId = InstanceIdentifier.create(IoamTraceConfig.class).child(TraceConfig.class); - registry.add(new GenericListWriter<>(trId, new IoamTraceWriterCustomizer(jVppIoamtrace))); + registry.subtreeAdd(Sets.newHashSet(InstanceIdentifier.create(TraceConfig.class) + .child(NodeInterfaces.class)), + new GenericListWriter<>(trId, new IoamTraceWriterCustomizer(jVppIoamtrace))); // POT Config final InstanceIdentifier<PotProfileSet> potId = InstanceIdentifier.create(PotProfiles.class).child(PotProfileSet.class); - registry.add(new GenericListWriter<>(potId, new IoamPotWriterCustomizer(jVppIoampot))); + registry.subtreeAdd(Sets.newHashSet(InstanceIdentifier.create(PotProfileSet.class) + .child(PotProfileList.class)), + new GenericListWriter<>(potId, new IoamPotWriterCustomizer(jVppIoampot))); } } diff --git a/ioam/ioam_trace_postman_collection.json b/ioam/ioam_postman_collection.json index 61505ac89..e79eab88b 100644 --- a/ioam/ioam_trace_postman_collection.json +++ b/ioam/ioam_postman_collection.json @@ -2,7 +2,7 @@ "variables": [], "info": { "name": "Honeycomb RESTCONF calls for iOAM Trace", - "_postman_id": "4117bd46-e112-6cfc-9d18-e566b66ba610", + "_postman_id": "014389fd-d55b-9b35-ad71-81eda31779bc", "description": "To enable iOAM trace on VPP management nodes.", "schema": "https://schema.getpostman.com/json/collection/v2.0.0/collection.json" }, @@ -10,7 +10,7 @@ { "name": "iaom trace - config", "request": { - "url": "http://localhost:8183/restconf/config/ioam-sb-trace:ioam-trace-config/", + "url": "http://localhost:8183/restconf/config/ioam-sb-trace:ioam-trace-config/trace-config/trace", "method": "PUT", "header": [ { @@ -56,6 +56,31 @@ "description": "Read ioam trace config from VPP" }, "response": [] + }, + { + "name": "iaom pot - config", + "request": { + "url": "http://localhost:8183/restconf/config/sfc-ioam-sb-pot:pot-profiles/pot-profile-set/potprofile", + "method": "PUT", + "header": [ + { + "key": "Authorization", + "value": "Basic YWRtaW46YWRtaW4=", + "description": "" + }, + { + "key": "Content-Type", + "value": "application/json", + "description": "" + } + ], + "body": { + "mode": "raw", + "raw": "{\n\"pot-profile-set\":[\n\t\t{\n\t \"name\":\"potprofile\",\n\t \"path-identifier\":\"ACL\",\n\t \"active-profile-index\":1,\n\t \"pot-profile-list\":[{\n\t \t\"index\":1,\n\t \t\"prime-number\":7,\n\t \t\"secret-share\":1234,\n\t \t\"public-polynomial\":1234,\n\t \t\"lpc\":1234,\n\t \t\"validator\":\"true\",\n\t \t\"validator-key\":1234,\n\t \t\"bitmask\":1111111111\n\t }]\n\t }\n ]\n}\n" + }, + "description": "Configure ioam pot config on VPP" + }, + "response": [] } ] }
\ No newline at end of file |