From ba4b79f78d5cc7aa65660775b52f8a58eefc2472 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Thu, 7 Apr 2016 20:42:26 +0200 Subject: HONEYCOMB-34: Initializers. Initial version Change-Id: Id3e815773813c924e3e53dc3a92826d803848186 Signed-off-by: Marek Gradzki --- v3po/artifacts/pom.xml | 5 ++ v3po/data-api/pom.xml | 14 ++++ v3po/data-impl/pom.xml | 14 ++++ v3po/features/pom.xml | 5 ++ v3po/features/src/main/features/features.xml | 1 + v3po/impl/pom.xml | 5 ++ v3po/impl/src/main/config/default-config.xml | 19 +++++ v3po/pom.xml | 1 + v3po/vpp-cfg-init/pom.xml | 44 +++++++++++ .../v3po/vpp/data/init/InitializerRegistry.java | 24 ++++++ .../vpp/data/init/InitializerRegistryImpl.java | 90 ++++++++++++++++++++++ .../VppConfigurationInitializerModule.java | 32 ++++++++ .../VppConfigurationInitializerModuleFactory.java | 13 ++++ v3po/vpp-cfg-init/src/main/yang/vpp-cfg-init.yang | 43 +++++++++++ 14 files changed, 310 insertions(+) create mode 100644 v3po/vpp-cfg-init/pom.xml create mode 100644 v3po/vpp-cfg-init/src/main/java/io/fd/honeycomb/v3po/vpp/data/init/InitializerRegistry.java create mode 100644 v3po/vpp-cfg-init/src/main/java/io/fd/honeycomb/v3po/vpp/data/init/InitializerRegistryImpl.java create mode 100644 v3po/vpp-cfg-init/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/data/init/rev160407/VppConfigurationInitializerModule.java create mode 100644 v3po/vpp-cfg-init/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/data/init/rev160407/VppConfigurationInitializerModuleFactory.java create mode 100644 v3po/vpp-cfg-init/src/main/yang/vpp-cfg-init.yang diff --git a/v3po/artifacts/pom.xml b/v3po/artifacts/pom.xml index 909ca45ab..a915cb3b2 100644 --- a/v3po/artifacts/pom.xml +++ b/v3po/artifacts/pom.xml @@ -79,6 +79,11 @@ v3po2vpp ${project.version} + + ${project.groupId} + vpp-cfg-init + ${project.version} + ${project.groupId} v3po-impl diff --git a/v3po/data-api/pom.xml b/v3po/data-api/pom.xml index 60073734d..846498c28 100644 --- a/v3po/data-api/pom.xml +++ b/v3po/data-api/pom.xml @@ -1,4 +1,18 @@ + diff --git a/v3po/data-impl/pom.xml b/v3po/data-impl/pom.xml index 59a5834ac..0df4f4cf9 100644 --- a/v3po/data-impl/pom.xml +++ b/v3po/data-impl/pom.xml @@ -1,4 +1,18 @@ + diff --git a/v3po/features/pom.xml b/v3po/features/pom.xml index 0ff43204b..ab0384226 100644 --- a/v3po/features/pom.xml +++ b/v3po/features/pom.xml @@ -155,6 +155,11 @@ xml config + + ${project.groupId} + vpp-cfg-init + ${project.version} + ${project.groupId} translate-api diff --git a/v3po/features/src/main/features/features.xml b/v3po/features/src/main/features/features.xml index a10e9fe68..234e6fb5d 100644 --- a/v3po/features/src/main/features/features.xml +++ b/v3po/features/src/main/features/features.xml @@ -45,6 +45,7 @@ wrap:mvn:io.fd.vpp/vppjapi/1.0.0-SNAPSHOT mvn:io.fd.honeycomb.v3po/vpp-japi-cfg/${project.version} mvn:io.fd.honeycomb.v3po/v3po2vpp/${project.version} + mvn:io.fd.honeycomb.v3po/vpp-cfg-init/${project.version} mvn:io.fd.honeycomb.v3po/vpp-japi-cfg/${project.version}/xml/config mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/config mvn:io.fd.honeycomb.v3po/v3po-impl/${project.version}/xml/netconf diff --git a/v3po/impl/pom.xml b/v3po/impl/pom.xml index 63eb1f442..c00c98396 100644 --- a/v3po/impl/pom.xml +++ b/v3po/impl/pom.xml @@ -49,6 +49,11 @@ data-impl ${project.version} + + ${project.groupId} + vpp-cfg-init + ${project.version} + io.fd.vpp diff --git a/v3po/impl/src/main/config/default-config.xml b/v3po/impl/src/main/config/default-config.xml index f4b75efc7..5b8ef15da 100644 --- a/v3po/impl/src/main/config/default-config.xml +++ b/v3po/impl/src/main/config/default-config.xml @@ -19,6 +19,7 @@ urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&revision=2014-12-10 urn:honeycomb:params:xml:ns:yang:translate:utils?module=translate-utils&revision=2016-04-06 urn:honeycomb:params:xml:ns:yang:vpp:japi:cfg?module=vpp-japi-cfg&revision=2016-04-06 + urn:honeycomb:params:xml:ns:yang:vpp:data:init?module=vpp-cfg-init&revision=2016-04-07 urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 @@ -59,6 +60,16 @@ write-registry + + + prefix:vpp-cfg-initializer-impl + vpp-cfg-initializer + + prefix:honeycomb-reader-registry + read-registry + + + @@ -76,6 +87,14 @@ /modules/module[type='delegating-writer-registry'][name='write-registry'] + + prefix:vpp-cfg-initializer + + vpp-cfg-initializer + /modules/module[type='vpp-cfg-initializer-impl'][name='vpp-cfg-initializer'] + + + dom:dom-broker-osgi-registry diff --git a/v3po/pom.xml b/v3po/pom.xml index 050cf5b5a..6389fb29c 100644 --- a/v3po/pom.xml +++ b/v3po/pom.xml @@ -42,6 +42,7 @@ vpp-translate-utils vpp-japi-cfg v3po2vpp + vpp-cfg-init impl karaf features diff --git a/v3po/vpp-cfg-init/pom.xml b/v3po/vpp-cfg-init/pom.xml new file mode 100644 index 000000000..a0c2dcb89 --- /dev/null +++ b/v3po/vpp-cfg-init/pom.xml @@ -0,0 +1,44 @@ + + + + + io.fd.honeycomb.common + impl-parent + 1.0.0-SNAPSHOT + ../../common/impl-parent + + + 4.0.0 + io.fd.honeycomb.v3po + vpp-cfg-init + 1.0.0-SNAPSHOT + bundle + + + + ${project.groupId} + v3po-api + ${project.version} + + + ${project.groupId} + translate-impl + ${project.version} + + + + diff --git a/v3po/vpp-cfg-init/src/main/java/io/fd/honeycomb/v3po/vpp/data/init/InitializerRegistry.java b/v3po/vpp-cfg-init/src/main/java/io/fd/honeycomb/v3po/vpp/data/init/InitializerRegistry.java new file mode 100644 index 000000000..bdb633831 --- /dev/null +++ b/v3po/vpp-cfg-init/src/main/java/io/fd/honeycomb/v3po/vpp/data/init/InitializerRegistry.java @@ -0,0 +1,24 @@ +/* + * 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.honeycomb.v3po.vpp.data.init; + +public interface InitializerRegistry extends AutoCloseable { + + void initialize(); + + void clean(); +} diff --git a/v3po/vpp-cfg-init/src/main/java/io/fd/honeycomb/v3po/vpp/data/init/InitializerRegistryImpl.java b/v3po/vpp-cfg-init/src/main/java/io/fd/honeycomb/v3po/vpp/data/init/InitializerRegistryImpl.java new file mode 100644 index 000000000..0feada4cb --- /dev/null +++ b/v3po/vpp-cfg-init/src/main/java/io/fd/honeycomb/v3po/vpp/data/init/InitializerRegistryImpl.java @@ -0,0 +1,90 @@ +/* + * 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.honeycomb.v3po.vpp.data.init; + +import static com.google.common.base.Preconditions.checkNotNull; + +import com.google.common.base.Optional; +import io.fd.honeycomb.v3po.translate.Context; +import io.fd.honeycomb.v3po.translate.read.ReadContext; +import io.fd.honeycomb.v3po.translate.read.ReadFailedException; +import io.fd.honeycomb.v3po.translate.read.ReaderRegistry; +import javax.annotation.Nonnull; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppState; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.vpp.state.BridgeDomains; +import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class InitializerRegistryImpl implements InitializerRegistry, AutoCloseable { + private static final Logger LOG = LoggerFactory.getLogger(InitializerRegistryImpl.class); + private final ReaderRegistry readerRegistry; + + public InitializerRegistryImpl(@Nonnull final ReaderRegistry readerRegistry) { + this.readerRegistry = checkNotNull(readerRegistry, "readerRegistry should not be null"); + } + + + @Override + public void close() throws Exception { + LOG.debug("Initializer.close()"); + // TODO remove data + } + + public void initialize() { + try { + initializeBridgeDomains(); + } catch (Exception e) { + LOG.error("Initialization failed", e); + } + } + + @Override + public void clean() { + + } + + // TODO make configurable + private void initializeBridgeDomains() throws ReadFailedException { + + final InstanceIdentifier bdsID = + InstanceIdentifier.create(VppState.class).child(BridgeDomains.class); + final ReadContext ctx = new ReadContextImpl(); + final Optional data = readerRegistry.read(bdsID, ctx); + + LOG.info("BridgeDomains data: {}", data); + + } + + // TODO move to utility module + private static final class ReadContextImpl implements ReadContext { + public final Context ctx = new Context(); + + @Nonnull + @Override + public Context getContext() { + return ctx; + } + + @Override + public void close() { + // Make sure to clear the storage in case some customizer stored it to prevent memory leaks + ctx.close(); + } + } +} diff --git a/v3po/vpp-cfg-init/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/data/init/rev160407/VppConfigurationInitializerModule.java b/v3po/vpp-cfg-init/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/data/init/rev160407/VppConfigurationInitializerModule.java new file mode 100644 index 000000000..ecfbaa6d4 --- /dev/null +++ b/v3po/vpp-cfg-init/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/data/init/rev160407/VppConfigurationInitializerModule.java @@ -0,0 +1,32 @@ +package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.data.init.rev160407; + +import io.fd.honeycomb.v3po.translate.read.ReaderRegistry; +import io.fd.honeycomb.v3po.vpp.data.init.InitializerRegistry; +import io.fd.honeycomb.v3po.vpp.data.init.InitializerRegistryImpl; + +public class VppConfigurationInitializerModule extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.data.init.rev160407.AbstractVppConfigurationInitializerModule { + public VppConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { + super(identifier, dependencyResolver); + } + + public VppConfigurationInitializerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.data.init.rev160407.VppConfigurationInitializerModule oldModule, java.lang.AutoCloseable oldInstance) { + super(identifier, dependencyResolver, oldModule, oldInstance); + } + + @Override + public void customValidation() { + // add custom validation form module attributes here. + } + + @Override + public java.lang.AutoCloseable createInstance() { + final ReaderRegistry readerRegistry = getReaderRegistryDependency(); + + InitializerRegistry initializer = new InitializerRegistryImpl(readerRegistry); + + initializer.initialize(); + + return initializer; + } + +} diff --git a/v3po/vpp-cfg-init/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/data/init/rev160407/VppConfigurationInitializerModuleFactory.java b/v3po/vpp-cfg-init/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/data/init/rev160407/VppConfigurationInitializerModuleFactory.java new file mode 100644 index 000000000..1e4609703 --- /dev/null +++ b/v3po/vpp-cfg-init/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/vpp/data/init/rev160407/VppConfigurationInitializerModuleFactory.java @@ -0,0 +1,13 @@ +/* +* Generated file +* +* Generated from: yang module name: vpp-cfg-init yang module local name: vpp-cfg-initializer-impl +* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator +* Generated at: Fri Apr 08 07:44:53 CEST 2016 +* +* Do not modify this file unless it is present under src/main directory +*/ +package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.data.init.rev160407; +public class VppConfigurationInitializerModuleFactory extends org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.vpp.data.init.rev160407.AbstractVppConfigurationInitializerModuleFactory { + +} diff --git a/v3po/vpp-cfg-init/src/main/yang/vpp-cfg-init.yang b/v3po/vpp-cfg-init/src/main/yang/vpp-cfg-init.yang new file mode 100644 index 000000000..2f6822c6d --- /dev/null +++ b/v3po/vpp-cfg-init/src/main/yang/vpp-cfg-init.yang @@ -0,0 +1,43 @@ +module vpp-cfg-init { + yang-version 1; + namespace "urn:honeycomb:params:xml:ns:yang:vpp:data:init"; + prefix "init"; + + import config { prefix config; revision-date 2013-04-05; } + import translate-api { prefix tapi; revision-date 2016-04-06; } + + description + "This module contains initializers for VPP config data tree"; + + revision "2016-04-07" { + description + "Initial revision"; + } + + identity vpp-cfg-initializer { + base "config:service-type"; + config:java-class io.fd.honeycomb.v3po.vpp.data.init.InitializerRegistry; + } + + identity vpp-cfg-initializer-impl { + base config:module-type; + config:provided-service vpp-cfg-initializer; + config:java-name-prefix VppConfigurationInitializer; + } + + augment "/config:modules/config:module/config:configuration" { + case vpp-cfg-initializer-impl { + when "/config:modules/config:module/config:type = 'vpp-cfg-initializer-impl'"; + + container reader-registry { + uses config:service-ref { + refine type { + mandatory true; + config:required-identity tapi:honeycomb-reader-registry; + } + } + } + } + } + +} \ No newline at end of file -- cgit 1.2.3-korg