From 83efb0ff929801a5a2ab89f6b66c07ed940a309d Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Thu, 11 Aug 2016 13:04:56 +0200 Subject: HONEYCOMB-19 Minimal distro ans wiring for hc infra Change-Id: I8f0e577ac91106e6025f7f2f27811f850e1c5253 Signed-off-by: Maros Marsalek --- .../initializer/InitializerPipelineModule.groovy | 57 +++++++++++++++++ .../initializer/InitializerRegistryProvider.groovy | 73 ++++++++++++++++++++++ .../PersistedFileInitializerProvider.groovy | 67 ++++++++++++++++++++ 3 files changed, 197 insertions(+) create mode 100644 infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.groovy create mode 100644 infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryProvider.groovy create mode 100644 infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/PersistedFileInitializerProvider.groovy (limited to 'infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer') diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.groovy b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.groovy new file mode 100644 index 000000000..80b52f2b8 --- /dev/null +++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.groovy @@ -0,0 +1,57 @@ +/* + * 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.infra.distro.initializer + +import com.google.inject.PrivateModule +import com.google.inject.Singleton +import com.google.inject.name.Names +import groovy.util.logging.Slf4j +import io.fd.honeycomb.data.ModifiableDataManager +import io.fd.honeycomb.data.init.InitializerRegistry +import io.fd.honeycomb.infra.distro.data.BindingDataBrokerProvider +import io.fd.honeycomb.infra.distro.data.HoneycombDOMDataBrokerProvider +import io.fd.honeycomb.infra.distro.data.ModifiableDTDelegProvider +import io.fd.honeycomb.translate.util.write.NoopWriterRegistry +import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder +import org.opendaylight.controller.md.sal.binding.api.DataBroker +import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker + +@Slf4j +class InitializerPipelineModule extends PrivateModule { + + protected void configure() { + // Initializer hierarchy uses fake writer registry to not send restored configuration from plugins back to plugins + def registry = new NoopWriterRegistry() + bind(ModifiableWriterRegistryBuilder) + .annotatedWith(Names.named("honeycomb-initializer")) + .toInstance([build: { registry }]) + + // Then just build data tree delegator and DataBrokers on top of it + bind(ModifiableDataManager).toProvider(ModifiableDTDelegProvider).in(Singleton) + bind(DOMDataBroker).toProvider(HoneycombDOMDataBrokerProvider).in(Singleton) + bind(DataBroker).annotatedWith(Names.named("honeycomb-initializer")).toProvider(BindingDataBrokerProvider).in(Singleton) + expose(DataBroker).annotatedWith(Names.named("honeycomb-initializer")) + + // NOW do initializer registry + bind(InitializerRegistry) + .annotatedWith(Names.named("honeycomb-initializer")) + .toProvider(InitializerRegistryProvider) + .in(Singleton) + expose(InitializerRegistry) + .annotatedWith(Names.named("honeycomb-initializer")) + } +} diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryProvider.groovy b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryProvider.groovy new file mode 100644 index 000000000..5f75fc026 --- /dev/null +++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryProvider.groovy @@ -0,0 +1,73 @@ +/* + * 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.infra.distro.initializer + +import com.google.inject.Inject +import com.google.inject.name.Named +import groovy.transform.ToString +import groovy.util.logging.Slf4j +import io.fd.honeycomb.data.init.DataTreeInitializer +import io.fd.honeycomb.data.init.InitializerRegistry +import io.fd.honeycomb.data.init.InitializerRegistryImpl +import io.fd.honeycomb.infra.distro.ProviderTrait + +@Slf4j +@ToString +class InitializerRegistryProvider extends ProviderTrait { + + @Inject + @Named("honeycomb-context") + DataTreeInitializer contextInitializer + @Inject + @Named("honeycomb-config") + DataTreeInitializer configInitializer + @Inject(optional = true) + Set pluginInitializers = [] + + @Override + def create() { + return new InitializerRegistry() { + + @Override + void initialize() throws DataTreeInitializer.InitializeException { + log.info("Config initialization started"); + + final InitializerRegistry initializer = new InitializerRegistryImpl(new ArrayList<>(pluginInitializers)) + + try { + // Initialize contexts first so that other initializers can find any relevant mapping before initializing + // configuration to what is already in VPP + contextInitializer.initialize(); + log.info("Persisted context restored successfully"); + // Initialize all registered initializers + initializer.initialize(); + log.info("Configuration initialized successfully"); + // Initialize stored configuration on top + configInitializer.initialize(); + log.info("Persisted configuration restored successfully"); + } catch (Exception e) { + log.warn("Failed to initialize config", e); + } + + log.info("Honeycomb initialized"); + } + + @Override + void close() throws Exception {} + } + } +} diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/PersistedFileInitializerProvider.groovy b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/PersistedFileInitializerProvider.groovy new file mode 100644 index 000000000..c2448d234 --- /dev/null +++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/initializer/PersistedFileInitializerProvider.groovy @@ -0,0 +1,67 @@ +/* + * 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.infra.distro.initializer + +import com.google.inject.Inject +import groovy.transform.ToString +import groovy.util.logging.Slf4j +import io.fd.honeycomb.data.init.RestoringInitializer +import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration +import io.fd.honeycomb.infra.distro.ProviderTrait +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType +import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker +import org.opendaylight.controller.sal.core.api.model.SchemaService +import org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.data.init.rev160407.RestorationType + +import java.nio.file.Paths +/** + * Mirror of org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.data.initializer.rev160407.PersistedFileInitializerModule + */ +@Slf4j +@ToString +abstract class PersistedFileInitializerProvider extends ProviderTrait { + + @Inject + SchemaService schemaService + @Inject + HoneycombConfiguration cfgAttributes + + @Inject + DOMDataBroker domDataBroker + + @Override + def create() { + new RestoringInitializer(schemaService, Paths.get(getPersistPath()), + domDataBroker, RestorationType.valueOf(restorationType), getDataStoreType()) + } + + abstract String getPersistPath() + abstract LogicalDatastoreType getDataStoreType() + abstract String getRestorationType() + + static class PersistedContextInitializerProvider extends PersistedFileInitializerProvider { + String getPersistPath() { cfgAttributes.peristContextPath } + LogicalDatastoreType getDataStoreType() { LogicalDatastoreType.OPERATIONAL } + String getRestorationType() { cfgAttributes.persistedContextRestorationType } + } + + static class PersistedConfigInitializerProvider extends PersistedFileInitializerProvider { + String getPersistPath() { cfgAttributes.peristConfigPath } + LogicalDatastoreType getDataStoreType() { LogicalDatastoreType.CONFIGURATION } + String getRestorationType() { cfgAttributes.persistedConfigRestorationType } + } +} -- cgit 1.2.3-korg