diff options
author | 2019-04-18 18:02:47 -0400 | |
---|---|---|
committer | 2019-04-18 18:02:47 -0400 | |
commit | 149a1664fcb40e1ad83f48878a13d2aff0f65b75 (patch) | |
tree | e4d788a6da45d66f7d5afa0f39feafa4e7fa5ae2 /vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/write | |
parent | 0443998090eb195b1e2de897201843b8a90ae037 (diff) |
Update Honeycomb to Rel1810 for vFW
- Update Honeycomb version to 1810 to support ODL Fluorine
- Migrate existing stream-count plugin to 1810
- Update POM structure
- Update vPacketGen install file (including ARM64)
Change-Id: I2866c80876550cb149cdb5fee3193d453643639c
Issue-ID: INT-1035
Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/write')
2 files changed, 0 insertions, 157 deletions
diff --git a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/write/ElementCustomizer.java b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/write/ElementCustomizer.java deleted file mode 100644 index 740ffdf7..00000000 --- a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/write/ElementCustomizer.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * 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. - */ - -/* - * Modifications copyright (c) 2019 AT&T Intellectual Property - */ - -package io.fd.honeycomb.lcmapi.write; - -import io.fd.honeycomb.lcmapi.CrudService; -import io.fd.honeycomb.translate.spi.write.WriterCustomizer; -import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; - -import java.io.IOException; - -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.stream.count.rev190118.stream.count.params.Streams; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Writer for {@link Element} list node from our YANG model. - */ - -public final class ElementCustomizer implements WriterCustomizer<Streams> { - - private static final Logger LOG = LoggerFactory.getLogger(ElementCustomizer.class); - - private final CrudService<Streams> crudService; - - public ElementCustomizer(@Nonnull final CrudService<Streams> crudService) { - this.crudService = crudService; - } - - @Override - public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Streams> id, @Nonnull final Streams dataAfter, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - //perform write of data,or throw exception - //invoked by PUT operation,if provided data doesn't exist in Config data - crudService.writeData(id, dataAfter); - try { - runScript(dataAfter.getActiveStreams().getValue()); - } - catch (IOException e) { - String message = "Write operation failed " + e; - LOG.error(message); - } - } - - @Override - public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<Streams> id, - @Nonnull final Streams dataBefore, - @Nonnull final Streams dataAfter, @Nonnull final WriteContext writeContext) - throws WriteFailedException { - //invoked by PUT operation,if provided data does exist in Config data - crudService.updateData(id, dataBefore, dataAfter); - try { - runScript(dataAfter.getActiveStreams().getValue()); - } - catch (IOException e) { - String message = "Write operation failed " + e; - LOG.error(message); - } - } - - @Override - public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Streams> id, - @Nonnull final Streams dataBefore, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - //perform delete of data,or throw exception - // Not supported, throw exception - throw new WriteFailedException.DeleteFailedException(id, - new UnsupportedOperationException("Delete operation not supported")); - } - - //Update the number of running streams running a custom script that uses the old vPacketGen REST APIs - private void runScript(long streams) throws IOException { - - String script = new String("bash /opt/update_running_streams.sh " + streams); - Runtime.getRuntime().exec(script); - String message = "Number of running streams updated to " + streams; - LOG.info(message); - } -} diff --git a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/write/ModuleWriterFactory.java b/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/write/ModuleWriterFactory.java deleted file mode 100644 index 1de39761..00000000 --- a/vnfs/honeycomb_plugin/stream-count/stream-count-impl/src/main/java/io/fd/honeycomb/lcmapi/write/ModuleWriterFactory.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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. - */ - -/* - * Modifications copyright (c) 2019 AT&T Intellectual Property - */ - -package io.fd.honeycomb.lcmapi.write; - -import static io.fd.honeycomb.lcmapi.ModuleConfiguration.ELEMENT_SERVICE_NAME; - -import com.google.inject.Inject; -import com.google.inject.name.Named; -import io.fd.honeycomb.lcmapi.CrudService; -import io.fd.honeycomb.translate.impl.write.GenericWriter; -import io.fd.honeycomb.translate.write.WriterFactory; -import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.stream.count.rev190118.StreamCount; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.stream.count.rev190118.stream.count.params.Streams; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -/** - * Factory producing writers for stream-count plugin's data. - */ -public final class ModuleWriterFactory implements WriterFactory { - - private static final InstanceIdentifier<StreamCount> ROOT_CONTAINER_ID = InstanceIdentifier.create(StreamCount.class); - - /** - * Injected crud service to be passed to customizers instantiated in this factory. - */ - @Inject - @Named(ELEMENT_SERVICE_NAME) - private CrudService<Streams> crudService; - - @Override - public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) { - - //adds writer for child node - //no need to add writers for empty nodes - registry.add(new GenericWriter<>(ROOT_CONTAINER_ID.child(Streams.class), new ElementCustomizer(crudService))); - } -} |