From 9e9c49d82a984e2185bc9d80bb1672c1faa91845 Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Tue, 8 Aug 2017 16:58:50 +0200 Subject: [PATCH] cleanup of Deprecated classes for config subsystem Patch cleans up config subsystem deprecated classes. This will complete the migration to blueprint. Change-Id: I44fa39ab53fafa9dc75b0e74d8b03e40805b4df6 Signed-off-by: Michal Cmarada --- artifacts/pom.xml | 7 -- .../l2-l3/src/main/config/default-config.xml | 29 ----- .../l2_l3/impl/L2L3DomainExtensionModule.java | 37 ------ .../L2L3DomainExtensionModuleFactory.java | 13 -- .../main/yang/l2-l3-domain-extension-cfg.yang | 39 ------ .../src/main/feature/features.xml | 3 +- features/odl-groupbasedpolicy-ios-xe/pom.xml | 6 - .../src/main/feature/features.xml | 3 +- features/odl-groupbasedpolicy-iovisor/pom.xml | 6 - .../src/main/feature/features.xml | 3 +- .../pom.xml | 6 - .../src/main/feature/features.xml | 3 +- .../pom.xml | 12 -- .../src/main/feature/features.xml | 4 +- .../pom.xml | 6 - .../src/main/feature/features.xml | 3 +- .../pom.xml | 6 - .../pom.xml | 6 - .../src/main/feature/features.xml | 1 - .../odl-groupbasedpolicy-ofoverlay/pom.xml | 1 - .../src/main/feature/features.xml | 3 +- .../pom.xml | 6 - .../src/main/feature/features.xml | 3 +- .../pom.xml | 6 - .../src/main/feature/features.xml | 3 +- features/odl-groupbasedpolicy-vpp/pom.xml | 12 -- .../src/main/feature/features.xml | 1 - .../src/main/config/default-config.xml | 96 -------------- .../DomainSpecificRegistryModule.java | 67 ---------- .../DomainSpecificRegistryModuleFactory.java | 33 ----- ...endererAugmentationRegistryImplModule.java | 66 ---------- ...AugmentationRegistryImplModuleFactory.java | 42 ------- .../GroupbasedpolicyModule.java | 42 ------- .../GroupbasedpolicyModuleFactory.java | 22 ---- .../PolicyValidatorRegistryModule.java | 82 ------------ .../PolicyValidatorRegistryModuleFactory.java | 42 ------- .../StatisticsManagerImplModule.java | 73 ----------- .../StatisticsManagerImplModuleFactory.java | 42 ------- .../src/main/yang/groupbasedpolicy-cfg.yang | 118 ------------------ .../src/main/config/default-config.xml | 29 ----- .../cfg/NeLocationProviderModule.java | 32 ----- .../cfg/NeLocationProviderModuleFactory.java | 13 -- .../main/yang/ne-location-provider-cfg.yang | 38 ------ .../src/main/config/default-config.xml | 28 ----- .../impl/NeutronMapperModule.java | 41 ------ .../impl/NeutronMapperModuleFactory.java | 47 ------- .../rule/NeutronSecurityRuleAware.java | 87 +++++-------- .../src/main/yang/neutron-mapper-impl.yang | 33 ----- .../src/main/config/default-config.xml | 28 ----- .../impl/NeutronOvsdbModule.java | 43 ------- .../impl/NeutronOvsdbModuleFactory.java | 49 -------- .../src/main/yang/module-settings.yang | 3 +- .../src/main/yang/neutron-ovsdb-impl.yang | 33 ----- .../src/main/config/default-config.xml | 25 ---- .../impl/NeutronVppMapperModule.java | 32 ----- .../impl/NeutronVppMapperModuleFactory.java | 21 ---- .../main/yang/neutron-vpp-mapper-impl.yang | 41 ------ .../faas/src/main/config/default-config.xml | 29 ----- .../impl/FaasProviderModule.java | 38 ------ .../impl/FaasProviderModuleFactory.java | 23 ---- .../src/main/yang/faas-provider-impl.yang | 40 ------ .../faas/src/main/yang/faas-provider.yang | 29 ----- renderers/ios-xe/pom.xml | 37 ------ .../ios-xe/src/main/config/default-config.xml | 31 ----- .../api/IosXeRendererProvider.java | 18 --- .../impl/IosXeRendererProviderImpl.java | 3 +- .../impl/config/IosXeProviderModule.java | 33 ----- .../config/IosXeProviderModuleFactory.java | 13 -- .../src/main/yang/ios-xe-provider-impl.yang | 39 ------ .../ios-xe/src/main/yang/ios-xe-provider.yang | 29 ----- .../src/main/config/default-config.xml | 29 ----- .../impl/IovisorProviderModule.java | 37 ------ .../impl/IovisorProviderModuleFactory.java | 22 ---- .../src/main/yang/iovisor-provider-impl.yang | 40 ------ .../src/main/config/default-config.xml | 29 ----- .../impl/OFOverlayProviderModule.java | 38 ------ .../impl/OFOverlayProviderModuleFactory.java | 22 ---- .../main/yang/ofoverlay-provider-impl.yang | 42 ------- .../src/main/yang/ofoverlay-provider.yang | 29 ----- renderers/pom.xml | 111 ++++++++-------- renderers/vpp/pom.xml | 7 -- .../vpp/src/main/config/default-config.xml | 26 ---- .../impl/GbpVppProviderInstance.java | 2 +- .../impl/GbpVppProviderModule.java | 37 ------ .../impl/GbpVppProviderModuleFactory.java | 21 ---- .../vpp/src/main/yang/vpp-provider-impl.yang | 41 ------ .../src/main/config/default-config.xml | 29 ----- .../cfg/IpSgtDistributionServiceModule.java | 32 ----- ...IpSgtDistributionServiceModuleFactory.java | 12 -- .../yang/ip-sgt-distribution-service-cfg.yang | 39 ------ .../src/main/config/default-config.xml | 30 ----- .../SxpEpProviderProviderInstance.java | 2 +- .../SxpEpProviderProviderModule.java | 36 ------ .../SxpEpProviderProviderModuleFactory.java | 21 ---- .../ep/provider/impl/SgtGeneratorImpl.java | 2 +- .../impl/SxpEpProviderProviderImpl.java | 2 +- .../org/opendaylight/blueprint/sxp-mapper.xml | 6 +- .../src/main/yang/sxp-ep-provider-cfg.yang | 65 ---------- .../src/main/yang/sxp-ep-provider-model.yang | 14 +++ .../SxpEpProviderProviderInstanceTest.java | 4 +- .../provider/impl/SgtGeneratorImplTest.java | 6 +- .../impl/SxpEpProviderProviderImplTest.java | 4 +- .../src/main/config/default-config.xml | 31 ----- .../SxpIseAdapterProviderModule.java | 36 ------ .../SxpIseAdapterProviderModuleFactory.java | 23 ---- .../src/main/yang/sxp-ise-adapter-cfg.yang | 41 ------ 106 files changed, 129 insertions(+), 2777 deletions(-) delete mode 100644 domain-extensions/l2-l3/src/main/config/default-config.xml delete mode 100644 domain-extensions/l2-l3/src/main/java/org/opendaylight/controller/config/yang/config/domain_extension/l2_l3/impl/L2L3DomainExtensionModule.java delete mode 100644 domain-extensions/l2-l3/src/main/java/org/opendaylight/controller/config/yang/config/domain_extension/l2_l3/impl/L2L3DomainExtensionModuleFactory.java delete mode 100644 domain-extensions/l2-l3/src/main/yang/l2-l3-domain-extension-cfg.yang delete mode 100755 groupbasedpolicy/src/main/config/default-config.xml delete mode 100644 groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/DomainSpecificRegistryModule.java delete mode 100644 groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/DomainSpecificRegistryModuleFactory.java delete mode 100644 groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/EpRendererAugmentationRegistryImplModule.java delete mode 100644 groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/EpRendererAugmentationRegistryImplModuleFactory.java delete mode 100644 groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/GroupbasedpolicyModule.java delete mode 100644 groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/GroupbasedpolicyModuleFactory.java delete mode 100644 groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/PolicyValidatorRegistryModule.java delete mode 100644 groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/PolicyValidatorRegistryModuleFactory.java delete mode 100644 groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModule.java delete mode 100644 groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModuleFactory.java delete mode 100644 groupbasedpolicy/src/main/yang/groupbasedpolicy-cfg.yang delete mode 100644 location-providers/ne-location-provider/src/main/config/default-config.xml delete mode 100644 location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModule.java delete mode 100644 location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModuleFactory.java delete mode 100644 location-providers/ne-location-provider/src/main/yang/ne-location-provider-cfg.yang delete mode 100644 neutron-mapper/src/main/config/default-config.xml delete mode 100644 neutron-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_mapper/impl/NeutronMapperModule.java delete mode 100644 neutron-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_mapper/impl/NeutronMapperModuleFactory.java delete mode 100644 neutron-mapper/src/main/yang/neutron-mapper-impl.yang delete mode 100644 neutron-ovsdb/src/main/config/default-config.xml delete mode 100644 neutron-ovsdb/src/main/java/org/opendaylight/controller/config/yang/config/neutron_ovsdb/impl/NeutronOvsdbModule.java delete mode 100644 neutron-ovsdb/src/main/java/org/opendaylight/controller/config/yang/config/neutron_ovsdb/impl/NeutronOvsdbModuleFactory.java delete mode 100644 neutron-ovsdb/src/main/yang/neutron-ovsdb-impl.yang delete mode 100644 neutron-vpp-mapper/src/main/config/default-config.xml delete mode 100644 neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperModule.java delete mode 100644 neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperModuleFactory.java delete mode 100644 neutron-vpp-mapper/src/main/yang/neutron-vpp-mapper-impl.yang delete mode 100644 renderers/faas/src/main/config/default-config.xml delete mode 100644 renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModule.java delete mode 100644 renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModuleFactory.java delete mode 100644 renderers/faas/src/main/yang/faas-provider-impl.yang delete mode 100644 renderers/faas/src/main/yang/faas-provider.yang delete mode 100755 renderers/ios-xe/src/main/config/default-config.xml delete mode 100644 renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/api/IosXeRendererProvider.java delete mode 100644 renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModule.java delete mode 100644 renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModuleFactory.java delete mode 100755 renderers/ios-xe/src/main/yang/ios-xe-provider-impl.yang delete mode 100644 renderers/ios-xe/src/main/yang/ios-xe-provider.yang delete mode 100644 renderers/iovisor/src/main/config/default-config.xml delete mode 100644 renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java delete mode 100644 renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModuleFactory.java delete mode 100644 renderers/iovisor/src/main/yang/iovisor-provider-impl.yang delete mode 100755 renderers/ofoverlay/src/main/config/default-config.xml delete mode 100755 renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModule.java delete mode 100644 renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModuleFactory.java delete mode 100755 renderers/ofoverlay/src/main/yang/ofoverlay-provider-impl.yang delete mode 100644 renderers/ofoverlay/src/main/yang/ofoverlay-provider.yang delete mode 100644 renderers/vpp/src/main/config/default-config.xml delete mode 100644 renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderModule.java delete mode 100644 renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderModuleFactory.java delete mode 100644 renderers/vpp/src/main/yang/vpp-provider-impl.yang delete mode 100644 sxp-integration/ip-sgt-distribution-service/src/main/config/default-config.xml delete mode 100644 sxp-integration/ip-sgt-distribution-service/src/main/java/org/opendaylight/controller/config/yang/config/ip/sgt/distribution/service/cfg/IpSgtDistributionServiceModule.java delete mode 100644 sxp-integration/ip-sgt-distribution-service/src/main/java/org/opendaylight/controller/config/yang/config/ip/sgt/distribution/service/cfg/IpSgtDistributionServiceModuleFactory.java delete mode 100644 sxp-integration/ip-sgt-distribution-service/src/main/yang/ip-sgt-distribution-service-cfg.yang delete mode 100755 sxp-integration/sxp-ep-provider/src/main/config/default-config.xml delete mode 100644 sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderModule.java delete mode 100644 sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderModuleFactory.java delete mode 100644 sxp-integration/sxp-ep-provider/src/main/yang/sxp-ep-provider-cfg.yang delete mode 100755 sxp-integration/sxp-ise-adapter/src/main/config/default-config.xml delete mode 100644 sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderModule.java delete mode 100644 sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderModuleFactory.java delete mode 100644 sxp-integration/sxp-ise-adapter/src/main/yang/sxp-ise-adapter-cfg.yang diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 6b512b040..89dd6f209 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -101,13 +101,6 @@ - - org.opendaylight.groupbasedpolicy - l2-l3-domain-extension - ${project.version} - xml - config - ${project.groupId} faas-renderer diff --git a/domain-extensions/l2-l3/src/main/config/default-config.xml b/domain-extensions/l2-l3/src/main/config/default-config.xml deleted file mode 100644 index b8b6b85d4..000000000 --- a/domain-extensions/l2-l3/src/main/config/default-config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - l2l3:l2-l3-domain-extension-impl - - l2-l3-domain-extension-impl - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:domain_extension:l2_l3:impl?module=l2-l3-domain-extension-cfg&revision=2016-05-25 - - - diff --git a/domain-extensions/l2-l3/src/main/java/org/opendaylight/controller/config/yang/config/domain_extension/l2_l3/impl/L2L3DomainExtensionModule.java b/domain-extensions/l2-l3/src/main/java/org/opendaylight/controller/config/yang/config/domain_extension/l2_l3/impl/L2L3DomainExtensionModule.java deleted file mode 100644 index 484f9d825..000000000 --- a/domain-extensions/l2-l3/src/main/java/org/opendaylight/controller/config/yang/config/domain_extension/l2_l3/impl/L2L3DomainExtensionModule.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.domain_extension.l2_l3.impl; - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -@Deprecated -public class L2L3DomainExtensionModule extends org.opendaylight.controller.config.yang.config.domain_extension.l2_l3.impl.AbstractL2L3DomainExtensionModule { - - private static final Logger LOG = LoggerFactory.getLogger(L2L3DomainExtensionModule.class); - - public L2L3DomainExtensionModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public L2L3DomainExtensionModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.domain_extension.l2_l3.impl.L2L3DomainExtensionModule 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() { - return NoopAutoCloseable.INSTANCE; - } - -} diff --git a/domain-extensions/l2-l3/src/main/java/org/opendaylight/controller/config/yang/config/domain_extension/l2_l3/impl/L2L3DomainExtensionModuleFactory.java b/domain-extensions/l2-l3/src/main/java/org/opendaylight/controller/config/yang/config/domain_extension/l2_l3/impl/L2L3DomainExtensionModuleFactory.java deleted file mode 100644 index 644a3bf86..000000000 --- a/domain-extensions/l2-l3/src/main/java/org/opendaylight/controller/config/yang/config/domain_extension/l2_l3/impl/L2L3DomainExtensionModuleFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.domain_extension.l2_l3.impl; -@Deprecated -public class L2L3DomainExtensionModuleFactory extends org.opendaylight.controller.config.yang.config.domain_extension.l2_l3.impl.AbstractL2L3DomainExtensionModuleFactory { - -} diff --git a/domain-extensions/l2-l3/src/main/yang/l2-l3-domain-extension-cfg.yang b/domain-extensions/l2-l3/src/main/yang/l2-l3-domain-extension-cfg.yang deleted file mode 100644 index b72f366b8..000000000 --- a/domain-extensions/l2-l3/src/main/yang/l2-l3-domain-extension-cfg.yang +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module l2-l3-domain-extension-cfg { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:domain_extension:l2_l3:impl"; - prefix "gbpcfg"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - import groupbasedpolicy-cfg { prefix gbpcfg; revision-date 2015-11-06; } - - description - "This module contains the base YANG definitions for - l2-l3 domain exstension implementation."; - - revision "2016-05-25" { - description - "Initial revision."; - } - - identity l2-l3-domain-extension-impl { - base "config:module-type"; - - config:java-name-prefix L2L3DomainExtension; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case l2-l3-domain-extension-impl { - when "/config:modules/config:module/config:type = 'l2-l3-domain-extension-impl'"; - } - } -} diff --git a/features/odl-groupbasedpolicy-base/src/main/feature/features.xml b/features/odl-groupbasedpolicy-base/src/main/feature/features.xml index a5c82a7bf..ca39d6b8d 100644 --- a/features/odl-groupbasedpolicy-base/src/main/feature/features.xml +++ b/features/odl-groupbasedpolicy-base/src/main/feature/features.xml @@ -11,6 +11,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy/{{VERSION}}/xml/config - \ No newline at end of file + diff --git a/features/odl-groupbasedpolicy-ios-xe/pom.xml b/features/odl-groupbasedpolicy-ios-xe/pom.xml index f32137bba..65a8c2bcb 100644 --- a/features/odl-groupbasedpolicy-ios-xe/pom.xml +++ b/features/odl-groupbasedpolicy-ios-xe/pom.xml @@ -95,11 +95,5 @@ xml features - - ${project.groupId} - ios-xe-renderer - xml - config - diff --git a/features/odl-groupbasedpolicy-ios-xe/src/main/feature/features.xml b/features/odl-groupbasedpolicy-ios-xe/src/main/feature/features.xml index 8cd9dc201..b2498a4da 100644 --- a/features/odl-groupbasedpolicy-ios-xe/src/main/feature/features.xml +++ b/features/odl-groupbasedpolicy-ios-xe/src/main/feature/features.xml @@ -11,6 +11,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.opendaylight.groupbasedpolicy/faas-renderer/{{VERSION}}/xml/config - \ No newline at end of file + diff --git a/features/odl-groupbasedpolicy-iovisor/pom.xml b/features/odl-groupbasedpolicy-iovisor/pom.xml index ab93c8627..50494649d 100644 --- a/features/odl-groupbasedpolicy-iovisor/pom.xml +++ b/features/odl-groupbasedpolicy-iovisor/pom.xml @@ -93,11 +93,5 @@ xml features - - ${project.groupId} - iovisor-renderer - xml - config - diff --git a/features/odl-groupbasedpolicy-iovisor/src/main/feature/features.xml b/features/odl-groupbasedpolicy-iovisor/src/main/feature/features.xml index b84ea794b..9c3df4b13 100644 --- a/features/odl-groupbasedpolicy-iovisor/src/main/feature/features.xml +++ b/features/odl-groupbasedpolicy-iovisor/src/main/feature/features.xml @@ -11,6 +11,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.opendaylight.groupbasedpolicy/iovisor-renderer/{{VERSION}}/xml/config - \ No newline at end of file + diff --git a/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml b/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml index 955f4ba0b..dbb996008 100644 --- a/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml +++ b/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml @@ -63,11 +63,5 @@ xml features - - ${project.groupId} - ip-sgt-distribution-service - xml - config - diff --git a/features/odl-groupbasedpolicy-ip-sgt-distribution-service/src/main/feature/features.xml b/features/odl-groupbasedpolicy-ip-sgt-distribution-service/src/main/feature/features.xml index 48f8a170f..f421db346 100644 --- a/features/odl-groupbasedpolicy-ip-sgt-distribution-service/src/main/feature/features.xml +++ b/features/odl-groupbasedpolicy-ip-sgt-distribution-service/src/main/feature/features.xml @@ -11,6 +11,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.opendaylight.groupbasedpolicy/ip-sgt-distribution-service/{{VERSION}}/xml/config - \ No newline at end of file + diff --git a/features/odl-groupbasedpolicy-ne-location-provider/pom.xml b/features/odl-groupbasedpolicy-ne-location-provider/pom.xml index dc9700fad..a6329fdcb 100644 --- a/features/odl-groupbasedpolicy-ne-location-provider/pom.xml +++ b/features/odl-groupbasedpolicy-ne-location-provider/pom.xml @@ -49,17 +49,5 @@ xml features - - ${project.groupId} - l2-l3-domain-extension - xml - config - - - ${project.groupId} - ne-location-provider - xml - config - diff --git a/features/odl-groupbasedpolicy-ne-location-provider/src/main/feature/features.xml b/features/odl-groupbasedpolicy-ne-location-provider/src/main/feature/features.xml index 16992e60c..b54a22cf1 100644 --- a/features/odl-groupbasedpolicy-ne-location-provider/src/main/feature/features.xml +++ b/features/odl-groupbasedpolicy-ne-location-provider/src/main/feature/features.xml @@ -11,7 +11,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}/xml/config - mvn:org.opendaylight.groupbasedpolicy/ne-location-provider/{{VERSION}}/xml/config - \ No newline at end of file + diff --git a/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml b/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml index 91f619bef..86b3caeaf 100644 --- a/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml +++ b/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml @@ -50,11 +50,5 @@ xml features - - ${project.groupId} - neutron-ovsdb - xml - config - diff --git a/features/odl-groupbasedpolicy-neutron-and-ofoverlay/src/main/feature/features.xml b/features/odl-groupbasedpolicy-neutron-and-ofoverlay/src/main/feature/features.xml index 2d599f6bd..57c0b7594 100644 --- a/features/odl-groupbasedpolicy-neutron-and-ofoverlay/src/main/feature/features.xml +++ b/features/odl-groupbasedpolicy-neutron-and-ofoverlay/src/main/feature/features.xml @@ -11,6 +11,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.opendaylight.groupbasedpolicy/neutron-ovsdb/{{VERSION}}/xml/config - \ No newline at end of file + diff --git a/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml b/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml index 14c6b8d37..56980aedd 100644 --- a/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml +++ b/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml @@ -51,11 +51,5 @@ xml features - - ${project.groupId} - neutron-vpp-mapper - cfg - config - diff --git a/features/odl-groupbasedpolicy-neutronmapper/pom.xml b/features/odl-groupbasedpolicy-neutronmapper/pom.xml index 297146567..ae14a4625 100644 --- a/features/odl-groupbasedpolicy-neutronmapper/pom.xml +++ b/features/odl-groupbasedpolicy-neutronmapper/pom.xml @@ -67,11 +67,5 @@ xml features - - ${project.groupId} - l2-l3-domain-extension - xml - config - diff --git a/features/odl-groupbasedpolicy-neutronmapper/src/main/feature/features.xml b/features/odl-groupbasedpolicy-neutronmapper/src/main/feature/features.xml index 2de85b412..072eb849b 100644 --- a/features/odl-groupbasedpolicy-neutronmapper/src/main/feature/features.xml +++ b/features/odl-groupbasedpolicy-neutronmapper/src/main/feature/features.xml @@ -11,6 +11,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}/xml/config diff --git a/features/odl-groupbasedpolicy-ofoverlay/pom.xml b/features/odl-groupbasedpolicy-ofoverlay/pom.xml index a91f73f9d..fbb6e5fcf 100644 --- a/features/odl-groupbasedpolicy-ofoverlay/pom.xml +++ b/features/odl-groupbasedpolicy-ofoverlay/pom.xml @@ -27,7 +27,6 @@ 0.5.0-SNAPSHOT 1.5.0-SNAPSHOT - etc/opendaylight/karaf 0.6.0-SNAPSHOT diff --git a/features/odl-groupbasedpolicy-ofoverlay/src/main/feature/features.xml b/features/odl-groupbasedpolicy-ofoverlay/src/main/feature/features.xml index 551a04b93..cd8aa7f1c 100644 --- a/features/odl-groupbasedpolicy-ofoverlay/src/main/feature/features.xml +++ b/features/odl-groupbasedpolicy-ofoverlay/src/main/feature/features.xml @@ -11,6 +11,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.opendaylight.groupbasedpolicy/ofoverlay-renderer/{{VERSION}}/xml/config - \ No newline at end of file + diff --git a/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml b/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml index 2e5f543ad..3fa2b8565 100644 --- a/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml +++ b/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml @@ -60,11 +60,5 @@ xml features - - ${project.groupId} - sxp-ep-provider - xml - config - diff --git a/features/odl-groupbasedpolicy-sxp-ep-provider/src/main/feature/features.xml b/features/odl-groupbasedpolicy-sxp-ep-provider/src/main/feature/features.xml index ed849d78c..4b3aa65f9 100644 --- a/features/odl-groupbasedpolicy-sxp-ep-provider/src/main/feature/features.xml +++ b/features/odl-groupbasedpolicy-sxp-ep-provider/src/main/feature/features.xml @@ -11,6 +11,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.opendaylight.groupbasedpolicy/sxp-ep-provider/{{VERSION}}/xml/config - \ No newline at end of file + diff --git a/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml b/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml index 5c6daae21..18188f942 100644 --- a/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml +++ b/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml @@ -53,11 +53,5 @@ xml features - - ${project.groupId} - sxp-ise-adapter - xml - config - diff --git a/features/odl-groupbasedpolicy-sxp-ise-adapter/src/main/feature/features.xml b/features/odl-groupbasedpolicy-sxp-ise-adapter/src/main/feature/features.xml index 2f218ec31..14559f627 100644 --- a/features/odl-groupbasedpolicy-sxp-ise-adapter/src/main/feature/features.xml +++ b/features/odl-groupbasedpolicy-sxp-ise-adapter/src/main/feature/features.xml @@ -11,6 +11,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.opendaylight.groupbasedpolicy/sxp-ise-adapter/{{VERSION}}/xml/config - \ No newline at end of file + diff --git a/features/odl-groupbasedpolicy-vpp/pom.xml b/features/odl-groupbasedpolicy-vpp/pom.xml index af06827a6..91697d3e6 100644 --- a/features/odl-groupbasedpolicy-vpp/pom.xml +++ b/features/odl-groupbasedpolicy-vpp/pom.xml @@ -103,18 +103,6 @@ xml features - - ${project.groupId} - l2-l3-domain-extension - xml - config - - - ${project.groupId} - vpp-renderer - cfg - config - org.opendaylight.lispflowmapping odl-lispflowmapping-msmr diff --git a/features/odl-groupbasedpolicy-vpp/src/main/feature/features.xml b/features/odl-groupbasedpolicy-vpp/src/main/feature/features.xml index ca452c426..05c6a72e9 100644 --- a/features/odl-groupbasedpolicy-vpp/src/main/feature/features.xml +++ b/features/odl-groupbasedpolicy-vpp/src/main/feature/features.xml @@ -11,6 +11,5 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - mvn:org.opendaylight.groupbasedpolicy/l2-l3-domain-extension/{{VERSION}}/xml/config diff --git a/groupbasedpolicy/src/main/config/default-config.xml b/groupbasedpolicy/src/main/config/default-config.xml deleted file mode 100755 index 53c0184df..000000000 --- a/groupbasedpolicy/src/main/config/default-config.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - groupbasedpolicy:groupbasedpolicy-impl - - groupbasedpolicy-impl - - - - groupbasedpolicy:policy-validator-registry-impl - - policy-validator-registry - - - - groupbasedpolicy:ep-renderer-augmentation-registry-impl - - ep-renderer-augmentation-registry - - - - groupbasedpolicy:domain-specific-registry-impl - - domain-specific-registry - - - - groupbasedpolicy:statistics-manager-impl - - statistics-manager-impl - - - - - - - groupbasedpolicy:policy-validator-registry - - - - policy-validator-registry - /modules/module[type='policy-validator-registry-impl'][name='policy-validator-registry'] - - - - - groupbasedpolicy:ep-renderer-augmentation-registry - - - - ep-renderer-augmentation-registry - /modules/module[type='ep-renderer-augmentation-registry-impl'][name='ep-renderer-augmentation-registry'] - - - - - groupbasedpolicy:domain-specific-registry - - - - domain-specific-registry - /modules/module[type='domain-specific-registry-impl'][name='domain-specific-registry'] - - - - - groupbasedpolicy:statistics-manager - - - - statistics-manager - /modules/module[type='statistics-manager-impl'][name='statistics-manager-impl'] - - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy?module=groupbasedpolicy-cfg&revision=2015-11-06 - - - diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/DomainSpecificRegistryModule.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/DomainSpecificRegistryModule.java deleted file mode 100644 index 0ebc418c5..000000000 --- a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/DomainSpecificRegistryModule.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.groupbasedpolicy; - -import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; -import org.opendaylight.groupbasedpolicy.api.DomainSpecificRegistry; -import org.opendaylight.groupbasedpolicy.api.EndpointAugmentorRegistry; -import org.opendaylight.groupbasedpolicy.api.NetworkDomainAugmentorRegistry; -import org.osgi.framework.BundleContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@Deprecated -public class DomainSpecificRegistryModule extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.AbstractDomainSpecificRegistryModule { - - private static final Logger LOG = LoggerFactory.getLogger(DomainSpecificRegistryModule.class); - private BundleContext bundleContext; - - public DomainSpecificRegistryModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public DomainSpecificRegistryModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.groupbasedpolicy.DomainSpecificRegistryModule 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 WaitingServiceTracker tracker = WaitingServiceTracker.create( - DomainSpecificRegistry.class, bundleContext); - final DomainSpecificRegistry service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); - - final class Instance implements DomainSpecificRegistry, AutoCloseable { - @Override - public void close() { - tracker.close(); - } - - @Override - public EndpointAugmentorRegistry getEndpointAugmentorRegistry() { - return service.getEndpointAugmentorRegistry(); - } - - @Override - public NetworkDomainAugmentorRegistry getNetworkDomainAugmentorRegistry() { - return service.getNetworkDomainAugmentorRegistry(); - } - } - - return new Instance(); - } - - void setBundleContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; - } -} diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/DomainSpecificRegistryModuleFactory.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/DomainSpecificRegistryModuleFactory.java deleted file mode 100644 index b69dc308d..000000000 --- a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/DomainSpecificRegistryModuleFactory.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.groupbasedpolicy; - -import org.opendaylight.controller.config.api.DependencyResolver; -import org.osgi.framework.BundleContext; - -@Deprecated -public class DomainSpecificRegistryModuleFactory extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.AbstractDomainSpecificRegistryModuleFactory { - - @Override - public DomainSpecificRegistryModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, - DomainSpecificRegistryModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) { - DomainSpecificRegistryModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, - oldInstance, bundleContext); - module.setBundleContext(bundleContext); - return module; - } - - @Override - public DomainSpecificRegistryModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, - BundleContext bundleContext) { - DomainSpecificRegistryModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext); - module.setBundleContext(bundleContext); - return module; - } -} diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/EpRendererAugmentationRegistryImplModule.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/EpRendererAugmentationRegistryImplModule.java deleted file mode 100644 index 004537d35..000000000 --- a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/EpRendererAugmentationRegistryImplModule.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.groupbasedpolicy; - -import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; -import org.opendaylight.groupbasedpolicy.api.EpRendererAugmentation; -import org.opendaylight.groupbasedpolicy.api.EpRendererAugmentationRegistry; -import org.osgi.framework.BundleContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@Deprecated -public class EpRendererAugmentationRegistryImplModule extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.AbstractEpRendererAugmentationRegistryImplModule { - - private static final Logger LOG = LoggerFactory.getLogger(EpRendererAugmentationRegistryImplModule.class); - private BundleContext bundleContext; - - public EpRendererAugmentationRegistryImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public EpRendererAugmentationRegistryImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.groupbasedpolicy.EpRendererAugmentationRegistryImplModule 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 WaitingServiceTracker tracker = WaitingServiceTracker.create( - EpRendererAugmentationRegistry.class, bundleContext); - final EpRendererAugmentationRegistry service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); - - final class Instance implements EpRendererAugmentationRegistry, AutoCloseable { - @Override - public void close() { - tracker.close(); - } - - @Override - public void register(EpRendererAugmentation epRendererAugmentation) { - service.register(epRendererAugmentation); - } - - @Override - public void unregister(EpRendererAugmentation epRendererAugmentation) { - service.unregister(epRendererAugmentation); - } - } - - return new Instance(); - } - - void setBundleContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; - } -} diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/EpRendererAugmentationRegistryImplModuleFactory.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/EpRendererAugmentationRegistryImplModuleFactory.java deleted file mode 100644 index 3bad7f558..000000000 --- a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/EpRendererAugmentationRegistryImplModuleFactory.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -/* -* Generated file -* -* Generated from: yang module name: groupbasedpolicy-cfg yang module local name: ep-renderer-augmentation-registry-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Thu Dec 10 17:52:04 CET 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.groupbasedpolicy; - -import org.opendaylight.controller.config.api.DependencyResolver; -import org.osgi.framework.BundleContext; - -@Deprecated -public class EpRendererAugmentationRegistryImplModuleFactory extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.AbstractEpRendererAugmentationRegistryImplModuleFactory { - - @Override - public EpRendererAugmentationRegistryImplModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, - EpRendererAugmentationRegistryImplModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) { - EpRendererAugmentationRegistryImplModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, - oldInstance, bundleContext); - module.setBundleContext(bundleContext); - return module; - } - - @Override - public EpRendererAugmentationRegistryImplModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, - BundleContext bundleContext) { - EpRendererAugmentationRegistryImplModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext); - module.setBundleContext(bundleContext); - return module; - } -} diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/GroupbasedpolicyModule.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/GroupbasedpolicyModule.java deleted file mode 100644 index 6b5a2ece0..000000000 --- a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/GroupbasedpolicyModule.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.groupbasedpolicy; - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@Deprecated -public class GroupbasedpolicyModule extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.AbstractGroupbasedpolicyModule { - - private static final Logger LOG = LoggerFactory.getLogger(GroupbasedpolicyModule.class); - - public GroupbasedpolicyModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public GroupbasedpolicyModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.groupbasedpolicy.GroupbasedpolicyModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - /** - * On module start, creates SubjectFeatureDefinitionProvider instance, in order to put known Subject Feature Definitions to operational Datastore - * - * @return SubjectFeatureDefinitionProvider - */ - @Override - public java.lang.AutoCloseable createInstance() { - return NoopAutoCloseable.INSTANCE; - } -} diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/GroupbasedpolicyModuleFactory.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/GroupbasedpolicyModuleFactory.java deleted file mode 100644 index 2e6fcd29a..000000000 --- a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/GroupbasedpolicyModuleFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -/* -* Generated file -* -* Generated from: yang module name: groupbasedpolicy-cfg yang module local name: groupbasedpolicy-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Thu Dec 10 17:52:04 CET 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.groupbasedpolicy; -@Deprecated -public class GroupbasedpolicyModuleFactory extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.AbstractGroupbasedpolicyModuleFactory { - -} diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/PolicyValidatorRegistryModule.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/PolicyValidatorRegistryModule.java deleted file mode 100644 index a0951f295..000000000 --- a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/PolicyValidatorRegistryModule.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.groupbasedpolicy; - -import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; -import org.opendaylight.groupbasedpolicy.api.PolicyValidatorRegistry; -import org.opendaylight.groupbasedpolicy.api.Validator; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.ActionDefinitionId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.ClassifierDefinitionId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.subject.feature.instances.ActionInstance; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.subject.feature.instances.ClassifierInstance; -import org.osgi.framework.BundleContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@Deprecated -public class PolicyValidatorRegistryModule extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.AbstractPolicyValidatorRegistryModule { - - private static final Logger LOG = LoggerFactory.getLogger(PolicyValidatorRegistryModule.class); - private BundleContext bundleContext; - - public PolicyValidatorRegistryModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public PolicyValidatorRegistryModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.groupbasedpolicy.PolicyValidatorRegistryModule 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 WaitingServiceTracker tracker = WaitingServiceTracker.create( - PolicyValidatorRegistry.class, bundleContext); - final PolicyValidatorRegistry service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); - - final class Instance implements PolicyValidatorRegistry, AutoCloseable { - @Override - public void close() { - tracker.close(); - } - - @Override - public void register(ActionDefinitionId actionDefinitionId, Validator validator) { - service.register(actionDefinitionId, validator); - } - - @Override - public void unregister(ActionDefinitionId actionDefinitionId, Validator validator) { - service.unregister(actionDefinitionId, validator); - } - - @Override - public void register(ClassifierDefinitionId classifierDefinitionId, - Validator validator) { - service.register(classifierDefinitionId, validator); - } - - @Override - public void unregister(ClassifierDefinitionId classifierDefinitionId, - Validator validator) { - service.unregister(classifierDefinitionId, validator); - } - } - - return new Instance(); - } - - void setBundleContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; - } -} diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/PolicyValidatorRegistryModuleFactory.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/PolicyValidatorRegistryModuleFactory.java deleted file mode 100644 index 1a4dd488c..000000000 --- a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/PolicyValidatorRegistryModuleFactory.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -/* -* Generated file -* -* Generated from: yang module name: groupbasedpolicy-cfg yang module local name: policy-validator-registry-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Thu Dec 10 17:52:04 CET 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.groupbasedpolicy; - -import org.opendaylight.controller.config.api.DependencyResolver; -import org.osgi.framework.BundleContext; - -@Deprecated -public class PolicyValidatorRegistryModuleFactory extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.AbstractPolicyValidatorRegistryModuleFactory { - - @Override - public PolicyValidatorRegistryModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, - PolicyValidatorRegistryModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) { - PolicyValidatorRegistryModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, - oldInstance, bundleContext); - module.setBundleContext(bundleContext); - return module; - } - - @Override - public PolicyValidatorRegistryModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, - BundleContext bundleContext) { - PolicyValidatorRegistryModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext); - module.setBundleContext(bundleContext); - return module; - } -} diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModule.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModule.java deleted file mode 100644 index 90ede36bf..000000000 --- a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModule.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -/* -* Generated file -* -* Generated from: yang module name: groupbasedpolicy-cfg yang module local name: policy-validator-registry-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Thu Dec 10 17:52:04 CET 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.groupbasedpolicy; - -import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; -import org.opendaylight.groupbasedpolicy.api.StatisticsManager; -import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.statistics.rev151215.statistic.records.StatRecords; -import org.osgi.framework.BundleContext; - -@Deprecated -public class StatisticsManagerImplModule extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.AbstractStatisticsManagerImplModule { - - private BundleContext bundleContext; - - public StatisticsManagerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public StatisticsManagerImplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.groupbasedpolicy.StatisticsManagerImplModule 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 WaitingServiceTracker tracker = WaitingServiceTracker.create( - StatisticsManager.class, bundleContext); - final StatisticsManager service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); - - final class Instance implements StatisticsManager, AutoCloseable { - @Override - public void close() { - tracker.close(); - } - - @Override - public boolean writeStat(StatRecords record) { - return service.writeStat(record); - } - - @Override - public StatRecords readStats() { - return service.readStats(); - } - } - - return new Instance(); - } - - void setBundleContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; - } - -} diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModuleFactory.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModuleFactory.java deleted file mode 100644 index fa3a8f0ea..000000000 --- a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/StatisticsManagerImplModuleFactory.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -/* -* Generated file -* -* Generated from: yang module name: groupbasedpolicy-cfg yang module local name: policy-validator-registry-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Thu Dec 10 17:52:04 CET 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.groupbasedpolicy; - -import org.opendaylight.controller.config.api.DependencyResolver; -import org.osgi.framework.BundleContext; - -@Deprecated -public class StatisticsManagerImplModuleFactory extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.AbstractStatisticsManagerImplModuleFactory { - - @Override - public StatisticsManagerImplModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, - StatisticsManagerImplModule oldModule, AutoCloseable oldInstance, BundleContext bundleContext) { - StatisticsManagerImplModule module = super.instantiateModule(instanceName, dependencyResolver, oldModule, - oldInstance, bundleContext); - module.setBundleContext(bundleContext); - return module; - } - - @Override - public StatisticsManagerImplModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, - BundleContext bundleContext) { - StatisticsManagerImplModule module = super.instantiateModule(instanceName, dependencyResolver, bundleContext); - module.setBundleContext(bundleContext); - return module; - } -} diff --git a/groupbasedpolicy/src/main/yang/groupbasedpolicy-cfg.yang b/groupbasedpolicy/src/main/yang/groupbasedpolicy-cfg.yang deleted file mode 100644 index d00e207da..000000000 --- a/groupbasedpolicy/src/main/yang/groupbasedpolicy-cfg.yang +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module groupbasedpolicy-cfg { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy"; - prefix "gbpcfg"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - - description - "This module contains the base YANG definitions for - groupbasedpolicy impl implementation."; - - revision "2015-11-06" { - description - "Initial revision."; - } - - identity ep-renderer-augmentation-registry { - status deprecated; - description - "ep-renderer-augmentation-registry service definition"; - - base "config:service-type"; - config:java-class "org.opendaylight.groupbasedpolicy.api.EpRendererAugmentationRegistry"; - config:disable-osgi-service-registration; - } - - identity domain-specific-registry { - status deprecated; - description - "domain-specific-registry service definition"; - - base "config:service-type"; - config:java-class "org.opendaylight.groupbasedpolicy.api.DomainSpecificRegistry"; - config:disable-osgi-service-registration; - } - - identity policy-validator-registry { - status deprecated; - description - "policy-validator-registry service definition"; - - base "config:service-type"; - config:java-class "org.opendaylight.groupbasedpolicy.api.PolicyValidatorRegistry"; - config:disable-osgi-service-registration; - } - - identity statistics-manager { - status deprecated; - description - "statistics-manager service definition"; - - base "config:service-type"; - config:java-class "org.opendaylight.groupbasedpolicy.api.StatisticsManager"; - config:disable-osgi-service-registration; - } - - identity policy-validator-registry-impl { - base "config:module-type"; - - config:provided-service policy-validator-registry; - config:java-name-prefix PolicyValidatorRegistry; - } - - identity ep-renderer-augmentation-registry-impl { - base "config:module-type"; - - config:provided-service ep-renderer-augmentation-registry; - config:java-name-prefix EpRendererAugmentationRegistryImpl; - } - - identity domain-specific-registry-impl { - base "config:module-type"; - - config:provided-service domain-specific-registry; - config:java-name-prefix DomainSpecificRegistry; - } - - identity statistics-manager-impl { - base "config:module-type"; - - config:provided-service statistics-manager; - config:java-name-prefix StatisticsManagerImpl; - } - - identity groupbasedpolicy-impl { - base "config:module-type"; - - config:java-name-prefix Groupbasedpolicy; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case groupbasedpolicy-impl { - when "/config:modules/config:module/config:type = 'groupbasedpolicy-impl'"; - } - case policy-validator-registry-impl { - when "/config:modules/config:module/config:type = 'policy-validator-registry-impl'"; - } - case ep-renderer-augmentation-registry-impl { - when "/config:modules/config:module/config:type = 'ep-renderer-augmentation-registry-impl'"; - } - case domain-specific-registry-impl { - when "/config:modules/config:module/config:type = 'domain-specific-registry-impl'"; - } - case statistics-manager-impl { - when "/config:modules/config:module/config:type = 'statistics-manager-impl'"; - } - } -} diff --git a/location-providers/ne-location-provider/src/main/config/default-config.xml b/location-providers/ne-location-provider/src/main/config/default-config.xml deleted file mode 100644 index 115cf5199..000000000 --- a/location-providers/ne-location-provider/src/main/config/default-config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - ne-location:ne-location-provider - - ne-location-provider - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:ne:location:provider:cfg?module=ne-location-provider-cfg&revision=2016-04-21 - - - diff --git a/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModule.java b/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModule.java deleted file mode 100644 index 108a3a6d0..000000000 --- a/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModule.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.ne.location.provider.cfg; - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; -@Deprecated -public class NeLocationProviderModule extends org.opendaylight.controller.config.yang.config.ne.location.provider.cfg.AbstractNeLocationProviderModule { - public NeLocationProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public NeLocationProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.ne.location.provider.cfg.NeLocationProviderModule 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() { - return NoopAutoCloseable.INSTANCE; - } - -} diff --git a/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModuleFactory.java b/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModuleFactory.java deleted file mode 100644 index 9abd3b8b8..000000000 --- a/location-providers/ne-location-provider/src/main/java/org/opendaylight/controller/config/yang/config/ne/location/provider/cfg/NeLocationProviderModuleFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.ne.location.provider.cfg; -@Deprecated -public class NeLocationProviderModuleFactory extends org.opendaylight.controller.config.yang.config.ne.location.provider.cfg.AbstractNeLocationProviderModuleFactory { - -} diff --git a/location-providers/ne-location-provider/src/main/yang/ne-location-provider-cfg.yang b/location-providers/ne-location-provider/src/main/yang/ne-location-provider-cfg.yang deleted file mode 100644 index 16034dbd0..000000000 --- a/location-providers/ne-location-provider/src/main/yang/ne-location-provider-cfg.yang +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module ne-location-provider-cfg { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:ne:location:provider:cfg"; - prefix "ne-location-provider-cfg"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - - description - "This module contains the base YANG definitions for - ne location provider implementation."; - - revision "2016-04-21" { - description - "Initial revision."; - } - - identity ne-location-provider { - base "config:module-type"; - - config:java-name-prefix NeLocationProvider; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case ne-location-provider { - when "/config:modules/config:module/config:type = 'ne-location-provider'"; - } - } -} diff --git a/neutron-mapper/src/main/config/default-config.xml b/neutron-mapper/src/main/config/default-config.xml deleted file mode 100644 index 725473dd8..000000000 --- a/neutron-mapper/src/main/config/default-config.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - neutron-mapper:neutron-mapper-impl - - neutron-mapper-impl - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:neutron-mapper:impl?module=neutron-mapper-impl&revision=2015-02-19 - - - diff --git a/neutron-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_mapper/impl/NeutronMapperModule.java b/neutron-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_mapper/impl/NeutronMapperModule.java deleted file mode 100644 index 2a3f90a45..000000000 --- a/neutron-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_mapper/impl/NeutronMapperModule.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.neutron_mapper.impl; - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -@Deprecated -public class NeutronMapperModule extends org.opendaylight.controller.config.yang.config.neutron_mapper.impl.AbstractNeutronMapperModule { - - private final Logger LOG = LoggerFactory.getLogger(NeutronMapperModule.class); - - public NeutronMapperModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public NeutronMapperModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.neutron_mapper.impl.NeutronMapperModule 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() { - return NoopAutoCloseable.INSTANCE; - } - - public static boolean isDebugEnabled() { - return true; // TODO add to config-subsystem - } - -} diff --git a/neutron-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_mapper/impl/NeutronMapperModuleFactory.java b/neutron-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_mapper/impl/NeutronMapperModuleFactory.java deleted file mode 100644 index 194f75024..000000000 --- a/neutron-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_mapper/impl/NeutronMapperModuleFactory.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -/* -* Generated file -* -* Generated from: yang module name: neutron-mapper-impl yang module local name: neutron-mapper-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Thu Feb 19 12:58:22 CET 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ - -package org.opendaylight.controller.config.yang.config.neutron_mapper.impl; - -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.DynamicMBeanWithInstance; -import org.opendaylight.controller.config.spi.Module; -import org.osgi.framework.BundleContext; -@Deprecated -public class NeutronMapperModuleFactory extends org.opendaylight.controller.config.yang.config.neutron_mapper.impl.AbstractNeutronMapperModuleFactory { - - /** - * @see org.opendaylight.controller.config.yang.config.neutron_mapper.impl.AbstractNeutronMapperModuleFactory#createModule(java.lang.String, org.opendaylight.controller.config.api.DependencyResolver, org.osgi.framework.BundleContext) - */ - @Override - public Module createModule(String instanceName, DependencyResolver dependencyResolver, BundleContext bundleContext) { - NeutronMapperModule module = (NeutronMapperModule) super.createModule(instanceName, dependencyResolver, bundleContext); - return module; - } - - /** - * @see org.opendaylight.controller.config.yang.config.neutron_mapper.impl.AbstractNeutronMapperModuleFactory#createModule(java.lang.String, org.opendaylight.controller.config.api.DependencyResolver, org.opendaylight.controller.config.api.DynamicMBeanWithInstance, org.osgi.framework.BundleContext) - */ - @Override - public Module createModule(String instanceName, DependencyResolver dependencyResolver, DynamicMBeanWithInstance old, - BundleContext bundleContext) throws Exception { - NeutronMapperModule module = (NeutronMapperModule) super.createModule(instanceName, dependencyResolver, old, bundleContext); - return module; - } - -} diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/NeutronSecurityRuleAware.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/NeutronSecurityRuleAware.java index 9eb52294a..3e493ddc2 100644 --- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/NeutronSecurityRuleAware.java +++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/NeutronSecurityRuleAware.java @@ -18,7 +18,6 @@ import java.util.stream.Collectors; import javax.annotation.Nonnull; -import org.opendaylight.controller.config.yang.config.neutron_mapper.impl.NeutronMapperModule; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; @@ -97,8 +96,7 @@ public class NeutronSecurityRuleAware implements NeutronAware { private final EndpointRegistrator epRegistrator; public NeutronSecurityRuleAware(DataBroker dataProvider, EndpointRegistrator epRegistrator) { - this(dataProvider, HashMultiset.>create(), - HashMultiset.>create(), epRegistrator); + this(dataProvider, HashMultiset.create(), HashMultiset.create(), epRegistrator); } @VisibleForTesting @@ -117,12 +115,10 @@ public class NeutronSecurityRuleAware implements NeutronAware { public void onCreated(SecurityRule secRule, Neutron neutron) { LOG.trace("created securityRule - {}", secRule); if (neutron.getSecurityGroups() == null || neutron.getSecurityGroups().getSecurityGroup() == null - || !neutron.getSecurityGroups() + || neutron.getSecurityGroups() .getSecurityGroup() .stream() - .filter(sg -> sg.getKey().getUuid().equals(secRule.getSecurityGroupId())) - .findFirst() - .isPresent()) { + .noneMatch(sg -> sg.getKey().getUuid().equals(secRule.getSecurityGroupId()))) { pendingCreatedRules.put(secRule.getKey(), secRule); LOG.warn("Security group of security rule {} does not exist yet. The rule will be processed" + "when the missing security group is created.", secRule.getKey()); @@ -191,19 +187,15 @@ public class NeutronSecurityRuleAware implements NeutronAware { @VisibleForTesting static Description createContractDescription(SecurityRule secRule, Neutron neutron) { - if (NeutronMapperModule.isDebugEnabled()) { - Optional providerSecGroup = - SecurityGroupUtils.findSecurityGroup(secRule.getSecurityGroupId(), neutron.getSecurityGroups()); - if (!providerSecGroup.isPresent()) { - LOG.error("Neutron Security Group with UUID {} does not exist but it is in {}", secRule.getSecurityGroupId().getValue(), - secRule); - throw new IllegalStateException( - "Neutron Security Group with UUID " + secRule.getSecurityGroupId().getValue() + " does not exist."); - } - return new Description(CONTRACT_PROVIDER + SecurityGroupUtils.getNameOrUuid(providerSecGroup.get())); + Optional providerSecGroup = + SecurityGroupUtils.findSecurityGroup(secRule.getSecurityGroupId(), neutron.getSecurityGroups()); + if (!providerSecGroup.isPresent()) { + LOG.error("Neutron Security Group with UUID {} does not exist but it is in {}", + secRule.getSecurityGroupId().getValue(), secRule); + throw new IllegalStateException( + "Neutron Security Group with UUID " + secRule.getSecurityGroupId().getValue() + " does not exist."); } - - return new Description(CONTRACT_PROVIDER + secRule.getSecurityGroupId()); + return new Description(CONTRACT_PROVIDER + SecurityGroupUtils.getNameOrUuid(providerSecGroup.get())); } @VisibleForTesting @@ -371,12 +363,10 @@ public class NeutronSecurityRuleAware implements NeutronAware { DataStoreHelper.submitToDs(rwTx); if (newNeutron == null || newNeutron.getSecurityRules() == null || newNeutron.getSecurityRules().getSecurityRule() == null - || !newNeutron.getSecurityRules() + || newNeutron.getSecurityRules() .getSecurityRule() .stream() - .filter(rule -> rule.getSecurityGroupId().equals(deletedSecRule.getSecurityGroupId())) - .findAny() - .isPresent()) { + .noneMatch(rule -> rule.getSecurityGroupId().equals(deletedSecRule.getSecurityGroupId()))) { SecurityGroupKey secGroupKey = new SecurityGroupKey(deletedSecRule.getSecurityGroupId()); SecurityGroup pendingSg = pendingDeletedGroups.get(secGroupKey); if (pendingSg != null) { @@ -501,25 +491,18 @@ public class NeutronSecurityRuleAware implements NeutronAware { // we cannot use name of security group in selector, because name can be changed // therefore name is used only in debug mode - if (NeutronMapperModule.isDebugEnabled()) { - Optional potentialConsumerSecGroup = - SecurityGroupUtils.findSecurityGroup(secRule.getRemoteGroupId(), neutron.getSecurityGroups()); - if (!potentialConsumerSecGroup.isPresent()) { - LOG.error("Neutron Security Group with UUID {} does not exist but it is in {}", - consumerSecGroupId.getValue(), secRule); - throw new IllegalStateException( - "Neutron Security Group with UUID " + consumerSecGroupId.getValue() + " does not exist."); - } - - selectorNameBuilder.append(MappingUtils.NAME_DOUBLE_DELIMETER) - .append(POSSIBLE_CONSUMER) - .append(SecurityGroupUtils.getNameOrUuid(potentialConsumerSecGroup.get())); - return new SelectorName(selectorNameBuilder.toString()); + Optional potentialConsumerSecGroup = + SecurityGroupUtils.findSecurityGroup(secRule.getRemoteGroupId(), neutron.getSecurityGroups()); + if (!potentialConsumerSecGroup.isPresent()) { + LOG.error("Neutron Security Group with UUID {} does not exist but it is in {}", + consumerSecGroupId.getValue(), secRule); + throw new IllegalStateException( + "Neutron Security Group with UUID " + consumerSecGroupId.getValue() + " does not exist."); } selectorNameBuilder.append(MappingUtils.NAME_DOUBLE_DELIMETER) .append(POSSIBLE_CONSUMER) - .append(consumerSecGroupId.getValue()); + .append(SecurityGroupUtils.getNameOrUuid(potentialConsumerSecGroup.get())); return new SelectorName(selectorNameBuilder.toString()); } @@ -529,28 +512,20 @@ public class NeutronSecurityRuleAware implements NeutronAware { // we cannot use name of security group in selector, because name can be changed // therefore name is used only in debug mode - if (NeutronMapperModule.isDebugEnabled()) { - Optional potentialProviderSecGroup = - SecurityGroupUtils.findSecurityGroup(secRule.getSecurityGroupId(), neutron.getSecurityGroups()); - if (!potentialProviderSecGroup.isPresent()) { - LOG.error("Neutron Security Group with UUID {} does not exist but it is in {}", - providerSecGroupId.getValue(), secRule); - throw new IllegalStateException( - "Neutron Security Group with UUID " + providerSecGroupId.getValue() + " does not exist."); - } - String selectorName = new StringBuilder().append(clauseName.getValue()) + Optional potentialProviderSecGroup = + SecurityGroupUtils.findSecurityGroup(secRule.getSecurityGroupId(), neutron.getSecurityGroups()); + if (!potentialProviderSecGroup.isPresent()) { + LOG.error("Neutron Security Group with UUID {} does not exist but it is in {}", + providerSecGroupId.getValue(), secRule); + throw new IllegalStateException( + "Neutron Security Group with UUID " + providerSecGroupId.getValue() + " does not exist."); + } + String selectorName = + new StringBuilder().append(clauseName.getValue()) .append(MappingUtils.NAME_DOUBLE_DELIMETER) .append(PROVIDED_BY) .append(SecurityGroupUtils.getNameOrUuid(potentialProviderSecGroup.get())) .toString(); - return new SelectorName(selectorName); - } - - String selectorName = new StringBuilder().append(clauseName.getValue()) - .append(MappingUtils.NAME_DOUBLE_DELIMETER) - .append(PROVIDED_BY) - .append(providerSecGroupId.getValue()) - .toString(); return new SelectorName(selectorName); } diff --git a/neutron-mapper/src/main/yang/neutron-mapper-impl.yang b/neutron-mapper/src/main/yang/neutron-mapper-impl.yang deleted file mode 100644 index d56137bc0..000000000 --- a/neutron-mapper/src/main/yang/neutron-mapper-impl.yang +++ /dev/null @@ -1,33 +0,0 @@ -module neutron-mapper-impl { - - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:neutron-mapper:impl"; - prefix "neutron-mapper-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - - description - "This module contains the base YANG definitions for - neutron-mapper implementation."; - - revision "2015-02-19" { - description - "Initial revision."; - } - - // This is the definition of the service implementation as a module identity. - identity neutron-mapper-impl { - base config:module-type; - - // Specifies the prefix for generated java classes. - config:java-name-prefix NeutronMapper; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case neutron-mapper-impl { - when "/config:modules/config:module/config:type = 'neutron-mapper-impl'"; - } - } -} \ No newline at end of file diff --git a/neutron-ovsdb/src/main/config/default-config.xml b/neutron-ovsdb/src/main/config/default-config.xml deleted file mode 100644 index cf74ea68f..000000000 --- a/neutron-ovsdb/src/main/config/default-config.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - neutron-ovsdb:neutron-ovsdb-impl - - neutron-ovsdb-impl - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:neutron-ovsdb:impl?module=neutron-ovsdb-impl&revision=2015-02-19 - - - diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/controller/config/yang/config/neutron_ovsdb/impl/NeutronOvsdbModule.java b/neutron-ovsdb/src/main/java/org/opendaylight/controller/config/yang/config/neutron_ovsdb/impl/NeutronOvsdbModule.java deleted file mode 100644 index 58694c0ea..000000000 --- a/neutron-ovsdb/src/main/java/org/opendaylight/controller/config/yang/config/neutron_ovsdb/impl/NeutronOvsdbModule.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.neutron_ovsdb.impl; - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; -import org.osgi.framework.BundleContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class NeutronOvsdbModule extends org.opendaylight.controller.config.yang.config.neutron_ovsdb.impl.AbstractNeutronOvsdbModule { - - private final Logger LOG = LoggerFactory.getLogger(NeutronOvsdbModule.class); - private BundleContext bundleContext; - - public NeutronOvsdbModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public NeutronOvsdbModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.neutron_ovsdb.impl.NeutronOvsdbModule 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() { - return NoopAutoCloseable.INSTANCE; - } - - public void setBundleContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; - } - -} diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/controller/config/yang/config/neutron_ovsdb/impl/NeutronOvsdbModuleFactory.java b/neutron-ovsdb/src/main/java/org/opendaylight/controller/config/yang/config/neutron_ovsdb/impl/NeutronOvsdbModuleFactory.java deleted file mode 100644 index 74ef6862d..000000000 --- a/neutron-ovsdb/src/main/java/org/opendaylight/controller/config/yang/config/neutron_ovsdb/impl/NeutronOvsdbModuleFactory.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -/* -* Generated file -* -* Generated from: yang module name: neutron-ovsdb-impl yang module local name: neutron-ovsdb-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Fri May 15 13:05:35 EDT 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.neutron_ovsdb.impl; - -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.DynamicMBeanWithInstance; -import org.opendaylight.controller.config.spi.Module; -import org.osgi.framework.BundleContext; - -public class NeutronOvsdbModuleFactory extends org.opendaylight.controller.config.yang.config.neutron_ovsdb.impl.AbstractNeutronOvsdbModuleFactory { - - /** - * @see org.opendaylight.controller.config.yang.config.neutron_ovsdb.impl.AbstractNeutronOvsdbModuleFactory#createModule(java.lang.String, org.opendaylight.controller.config.api.DependencyResolver, org.osgi.framework.BundleContext) - */ - @Override - public Module createModule(String instanceName, DependencyResolver dependencyResolver, BundleContext bundleContext) { - NeutronOvsdbModule module = (NeutronOvsdbModule) super.createModule(instanceName, dependencyResolver, bundleContext); - module.setBundleContext(bundleContext); - return module; - } - - /** - * @see org.opendaylight.controller.config.yang.config.neutron_ovsdb.impl.AbstractNeutronOvsdbModuleFactory#createModule(java.lang.String, org.opendaylight.controller.config.api.DependencyResolver, org.opendaylight.controller.config.api.DynamicMBeanWithInstance, org.osgi.framework.BundleContext) - */ - @Override - public Module createModule(String instanceName, DependencyResolver dependencyResolver, DynamicMBeanWithInstance old, - BundleContext bundleContext) throws Exception { - NeutronOvsdbModule module = (NeutronOvsdbModule) super.createModule(instanceName, dependencyResolver, old, bundleContext); - module.setBundleContext(bundleContext); - return module; - } - - -} diff --git a/neutron-ovsdb/src/main/yang/module-settings.yang b/neutron-ovsdb/src/main/yang/module-settings.yang index f3c3d3321..698cbe8ff 100644 --- a/neutron-ovsdb/src/main/yang/module-settings.yang +++ b/neutron-ovsdb/src/main/yang/module-settings.yang @@ -4,7 +4,6 @@ module neutron-ovsdb-impl { namespace "urn:opendaylight:groupbasedpolicy:neutron:ovsdb:params"; prefix "neutron-ovsdb-params"; - import config { prefix config; revision-date 2013-04-05; } import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } description @@ -32,4 +31,4 @@ module neutron-ovsdb-impl { } } } -} \ No newline at end of file +} diff --git a/neutron-ovsdb/src/main/yang/neutron-ovsdb-impl.yang b/neutron-ovsdb/src/main/yang/neutron-ovsdb-impl.yang deleted file mode 100644 index dc747f320..000000000 --- a/neutron-ovsdb/src/main/yang/neutron-ovsdb-impl.yang +++ /dev/null @@ -1,33 +0,0 @@ -module neutron-ovsdb-impl { - - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:neutron-ovsdb:impl"; - prefix "neutron-ovsdb-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - - description - "This module contains the base YANG definitions for - neutron-ovsdb implementation."; - - revision "2015-02-19" { - description - "Initial revision."; - } - - // This is the definition of the service implementation as a module identity. - identity neutron-ovsdb-impl { - base config:module-type; - - // Specifies the prefix for generated java classes. - config:java-name-prefix NeutronOvsdb; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case neutron-ovsdb-impl { - when "/config:modules/config:module/config:type = 'neutron-ovsdb-impl'"; - } - } -} diff --git a/neutron-vpp-mapper/src/main/config/default-config.xml b/neutron-vpp-mapper/src/main/config/default-config.xml deleted file mode 100644 index 224490950..000000000 --- a/neutron-vpp-mapper/src/main/config/default-config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - neutron-vpp-mapper:neutron-vpp-mapper-impl - - neutron-vpp-mapper-impl - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:neutron-vpp-mapper:impl?module=neutron-vpp-mapper-impl&revision=2016-04-25 - - diff --git a/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperModule.java b/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperModule.java deleted file mode 100644 index 6ded867be..000000000 --- a/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperModule.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.neutron_vpp_mapper.impl; - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; - -@Deprecated -public class NeutronVppMapperModule extends org.opendaylight.controller.config.yang.config.neutron_vpp_mapper.impl.AbstractNeutronVppMapperModule { - public NeutronVppMapperModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public NeutronVppMapperModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.neutron_vpp_mapper.impl.NeutronVppMapperModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - } - - @Override - public java.lang.AutoCloseable createInstance() { - return NoopAutoCloseable.INSTANCE; - } - -} diff --git a/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperModuleFactory.java b/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperModuleFactory.java deleted file mode 100644 index 5a11bc45b..000000000 --- a/neutron-vpp-mapper/src/main/java/org/opendaylight/controller/config/yang/config/neutron_vpp_mapper/impl/NeutronVppMapperModuleFactory.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -/* -* Generated file -* -* Generated from: yang module name: neutron-vpp-mapper-impl yang module local name: neutron-vpp-mapper-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Mon May 02 12:30:34 CEST 2016 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.neutron_vpp_mapper.impl; -@Deprecated -public class NeutronVppMapperModuleFactory extends org.opendaylight.controller.config.yang.config.neutron_vpp_mapper.impl.AbstractNeutronVppMapperModuleFactory { - -} diff --git a/neutron-vpp-mapper/src/main/yang/neutron-vpp-mapper-impl.yang b/neutron-vpp-mapper/src/main/yang/neutron-vpp-mapper-impl.yang deleted file mode 100644 index 0ae253bc6..000000000 --- a/neutron-vpp-mapper/src/main/yang/neutron-vpp-mapper-impl.yang +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module neutron-vpp-mapper-impl { - - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:neutron-vpp-mapper:impl"; - prefix "neutron-vpp-mapper-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - - description - "This module contains the base YANG definitions for - neutron-vpp-mapper implementation."; - - revision "2016-04-25" { - description - "Initial revision."; - } - - // This is the definition of the service implementation as a module identity. - identity neutron-vpp-mapper-impl { - base config:module-type; - - // Specifies the prefix for generated java classes. - config:java-name-prefix NeutronVppMapper; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case neutron-vpp-mapper-impl { - when "/config:modules/config:module/config:type = 'neutron-vpp-mapper-impl'"; - } - } -} \ No newline at end of file diff --git a/renderers/faas/src/main/config/default-config.xml b/renderers/faas/src/main/config/default-config.xml deleted file mode 100644 index 655dd5f5e..000000000 --- a/renderers/faas/src/main/config/default-config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - faas:faas-provider-impl - - faas-provider-impl - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:faas-provider:impl?module=faas-provider-impl&revision=2015-10-09 - - - \ No newline at end of file diff --git a/renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModule.java b/renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModule.java deleted file mode 100644 index 78943c3af..000000000 --- a/renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModule.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2015 Huawei Technologies and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.faas_provider.impl; - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; - -public class FaasProviderModule extends - org.opendaylight.controller.config.yang.config.faas_provider.impl.AbstractFaasProviderModule { - - public FaasProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, - org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public FaasProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, - org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, - org.opendaylight.controller.config.yang.config.faas_provider.impl.FaasProviderModule 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() { - return NoopAutoCloseable.INSTANCE; - } - -} diff --git a/renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModuleFactory.java b/renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModuleFactory.java deleted file mode 100644 index 4f011d567..000000000 --- a/renderers/faas/src/main/java/org/opendaylight/controller/config/yang/config/faas_provider/impl/FaasProviderModuleFactory.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2015 Huawei Technologies and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -/* - * Generated file - * - * Generated from: yang module name: faas-provider-impl yang module local name: faas-provider-impl - * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - * Generated at: Fri Oct 09 16:39:53 EDT 2015 - * - * Do not modify this file unless it is present under src/main directory - */ -package org.opendaylight.controller.config.yang.config.faas_provider.impl; - -public class FaasProviderModuleFactory extends - org.opendaylight.controller.config.yang.config.faas_provider.impl.AbstractFaasProviderModuleFactory { - -} diff --git a/renderers/faas/src/main/yang/faas-provider-impl.yang b/renderers/faas/src/main/yang/faas-provider-impl.yang deleted file mode 100644 index 4b49b4e7b..000000000 --- a/renderers/faas/src/main/yang/faas-provider-impl.yang +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2015 Huawei Technologies and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module faas-provider-impl { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:faas-provider:impl"; - prefix "faas-provider-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - import opendaylight-sal-binding-broker-impl { prefix sal-broker; revision-date 2013-10-28; } - import groupbasedpolicy-cfg { prefix gbpcfg; revision-date 2015-11-06; } - - description - "This module contains the base YANG definitions for faas-provider - impl implementation."; - - revision "2015-10-09" { - description - "Initial revision."; - } - - identity faas-provider-impl { - base "config:module-type"; - - config:java-name-prefix FaasProvider; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case faas-provider-impl { - when "/config:modules/config:module/config:type = 'faas-provider-impl'"; - } - } -} diff --git a/renderers/faas/src/main/yang/faas-provider.yang b/renderers/faas/src/main/yang/faas-provider.yang deleted file mode 100644 index 45bb8606f..000000000 --- a/renderers/faas/src/main/yang/faas-provider.yang +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2015 Huawei Technologies and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module faas-provider { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:faas-provider"; - prefix "faas-provider"; - - import config { prefix config; revision-date 2013-04-05; } - - description - "This module contains the base YANG definitions for faas-provider - services."; - - revision "2015-10-09" { - description - "Initial revision."; - } - - identity faas-provider { - base "config:service-type"; - config:java-class "org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.faas.rev151009.FaasData"; - } -} diff --git a/renderers/ios-xe/pom.xml b/renderers/ios-xe/pom.xml index 06bf068e3..9141673dc 100755 --- a/renderers/ios-xe/pom.xml +++ b/renderers/ios-xe/pom.xml @@ -33,13 +33,6 @@ pom import - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - @@ -116,34 +109,4 @@ - - - - org.opendaylight.yangtools - yang-maven-plugin - - - config - - generate-sources - - - - - org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - ${jmxGeneratorPath} - - urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang - urn:opendaylight:params:xml:ns:yang:groupbasedpolicy:renderer==org.opendaylight.groupbasedpolicy.renderer - - - - true - - - - - - - diff --git a/renderers/ios-xe/src/main/config/default-config.xml b/renderers/ios-xe/src/main/config/default-config.xml deleted file mode 100755 index 6d901c700..000000000 --- a/renderers/ios-xe/src/main/config/default-config.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - iosxe:ios-xe-provider-impl - - ios-xe-provider-impl - - - - - - - - urn:opendaylight:params:xml:ns:yang:groupbasedpolicy:renderer:ios-xe-provider:impl:config?module=ios-xe-provider-impl&revision=2016-05-17 - - - diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/api/IosXeRendererProvider.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/api/IosXeRendererProvider.java deleted file mode 100644 index 4c8e2521a..000000000 --- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/api/IosXeRendererProvider.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.api; - -/** - * Main IOS-XE provider interface - */ -public interface IosXeRendererProvider extends AutoCloseable { - - @Override - void close(); -} diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/IosXeRendererProviderImpl.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/IosXeRendererProviderImpl.java index b41b50e3b..1e19a8df0 100644 --- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/IosXeRendererProviderImpl.java +++ b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/IosXeRendererProviderImpl.java @@ -21,7 +21,6 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; -import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.api.IosXeRendererProvider; import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.api.manager.PolicyManager; import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.listener.IosXeCapableNodeListenerImpl; import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.listener.RendererConfigurationListenerImpl; @@ -52,7 +51,7 @@ import org.slf4j.LoggerFactory; /** * Purpose: bootstrap provider implementation of Ios-xe renderer */ -public class IosXeRendererProviderImpl implements IosXeRendererProvider, BindingAwareProvider { +public class IosXeRendererProviderImpl implements BindingAwareProvider, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(IosXeRendererProviderImpl.class); diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModule.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModule.java deleted file mode 100644 index 48f3a18fd..000000000 --- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModule.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.config; - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; - -@Deprecated -public class IosXeProviderModule extends org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.config.AbstractIosXeProviderModule { - public IosXeProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public IosXeProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.config.IosXeProviderModule 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() { - return NoopAutoCloseable.INSTANCE; - } - -} diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModuleFactory.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModuleFactory.java deleted file mode 100644 index 7169f7226..000000000 --- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/config/IosXeProviderModuleFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.config; -@Deprecated -public class IosXeProviderModuleFactory extends org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.config.AbstractIosXeProviderModuleFactory { - -} diff --git a/renderers/ios-xe/src/main/yang/ios-xe-provider-impl.yang b/renderers/ios-xe/src/main/yang/ios-xe-provider-impl.yang deleted file mode 100755 index a27719fe4..000000000 --- a/renderers/ios-xe/src/main/yang/ios-xe-provider-impl.yang +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module ios-xe-provider-impl { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:groupbasedpolicy:renderer:ios-xe-provider:impl:config"; - prefix "ios-xe-provider-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - import groupbasedpolicy-cfg { prefix gbpcfg; revision-date 2015-11-06; } - import renderer { prefix gbprenderer; revision-date 2015-11-03; } - - description - "This module contains the base YANG definitions for - ios-xe-provider impl implementation."; - - revision "2016-05-17" { - description - "Initial revision."; - } - - identity ios-xe-provider-impl { - base "config:module-type"; - config:java-name-prefix IosXeProvider; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case ios-xe-provider-impl { - when "/config:modules/config:module/config:type = 'ios-xe-provider-impl'"; - } - } -} diff --git a/renderers/ios-xe/src/main/yang/ios-xe-provider.yang b/renderers/ios-xe/src/main/yang/ios-xe-provider.yang deleted file mode 100644 index 5a8718d93..000000000 --- a/renderers/ios-xe/src/main/yang/ios-xe-provider.yang +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module ios-xe-provider { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:groupbasedpolicy:renderer:ios-xe-provider:config"; - prefix "ios-xe-provider"; - - import config { prefix config; revision-date 2013-04-05; } - - description - "This module contains the base YANG definitions for - ios-xe-provider services."; - - revision "2016-05-17" { - description - "Initial revision."; - } - - identity ios-xe-provider { - base "config:service-type"; - config:java-class "org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.api.IosXeRendererProvider"; - } -} diff --git a/renderers/iovisor/src/main/config/default-config.xml b/renderers/iovisor/src/main/config/default-config.xml deleted file mode 100644 index a09575e87..000000000 --- a/renderers/iovisor/src/main/config/default-config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - iovisor:iovisor-provider-impl - - iovisor-provider-impl - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:iovisor-provider:impl?module=iovisor-provider-impl&revision=2015-10-30 - - - \ No newline at end of file diff --git a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java deleted file mode 100644 index 179dd9305..000000000 --- a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModule.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2015 Inocybe Technologies and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.iovisor_provider.impl; - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; -@Deprecated -public class IovisorProviderModule - extends org.opendaylight.controller.config.yang.config.iovisor_provider.impl.AbstractIovisorProviderModule { - - public IovisorProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, - org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public IovisorProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, - org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, - org.opendaylight.controller.config.yang.config.iovisor_provider.impl.IovisorProviderModule 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() { - return NoopAutoCloseable.INSTANCE; - } -} diff --git a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModuleFactory.java b/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModuleFactory.java deleted file mode 100644 index 6521c9360..000000000 --- a/renderers/iovisor/src/main/java/org/opendaylight/controller/config/yang/config/iovisor_provider/impl/IovisorProviderModuleFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2015 Inocybe Technologies and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -/* -* Generated file -* -* Generated from: yang module name: iovisor-provider-impl yang module local name: iovisor-provider-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Tue Nov 03 20:21:10 PST 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.iovisor_provider.impl; -@Deprecated -public class IovisorProviderModuleFactory extends org.opendaylight.controller.config.yang.config.iovisor_provider.impl.AbstractIovisorProviderModuleFactory { - -} diff --git a/renderers/iovisor/src/main/yang/iovisor-provider-impl.yang b/renderers/iovisor/src/main/yang/iovisor-provider-impl.yang deleted file mode 100644 index 173bd947f..000000000 --- a/renderers/iovisor/src/main/yang/iovisor-provider-impl.yang +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2015 Cisco System. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module iovisor-provider-impl { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:iovisor-provider:impl"; - prefix "iovisor-provider-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - import opendaylight-sal-binding-broker-impl { prefix sal-broker; revision-date 2013-10-28; } - import groupbasedpolicy-cfg { prefix gbpcfg; revision-date 2015-11-06; } - - description - "This module contains the base YANG definitions for iovisor-provider - impl implementation."; - - revision "2015-10-30" { - description - "Initial revision."; - } - - identity iovisor-provider-impl { - base "config:module-type"; - - config:java-name-prefix IovisorProvider; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case iovisor-provider-impl { - when "/config:modules/config:module/config:type = 'iovisor-provider-impl'"; - } - } -} diff --git a/renderers/ofoverlay/src/main/config/default-config.xml b/renderers/ofoverlay/src/main/config/default-config.xml deleted file mode 100755 index cf131d763..000000000 --- a/renderers/ofoverlay/src/main/config/default-config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - ofoverlay:ofoverlay-provider-impl - - ofoverlay-provider-impl - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:ofoverlay-provider:impl?module=ofoverlay-provider-impl&revision=2014-06-11 - - - diff --git a/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModule.java b/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModule.java deleted file mode 100755 index 9bd243891..000000000 --- a/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModule.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl; - - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -@Deprecated -public class OFOverlayProviderModule extends org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl.AbstractOFOverlayProviderModule { - private static final Logger LOG = LoggerFactory - .getLogger(OFOverlayProviderModule.class); - - public OFOverlayProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public OFOverlayProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl.OFOverlayProviderModule 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() { - return NoopAutoCloseable.INSTANCE; - } - -} diff --git a/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModuleFactory.java b/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModuleFactory.java deleted file mode 100644 index af5620f1e..000000000 --- a/renderers/ofoverlay/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModuleFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -/* -* Generated file -* -* Generated from: yang module name: ofoverlay-provider-impl yang module local name: ofoverlay-provider-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Tue Jun 24 15:06:29 PDT 2014 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl; -@Deprecated -public class OFOverlayProviderModuleFactory extends org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl.AbstractOFOverlayProviderModuleFactory { - -} diff --git a/renderers/ofoverlay/src/main/yang/ofoverlay-provider-impl.yang b/renderers/ofoverlay/src/main/yang/ofoverlay-provider-impl.yang deleted file mode 100755 index 76cf2953f..000000000 --- a/renderers/ofoverlay/src/main/yang/ofoverlay-provider-impl.yang +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module ofoverlay-provider-impl { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:ofoverlay-provider:impl"; - prefix "ofoverlay-provider-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - import ietf-yang-types { prefix "yang"; revision-date 2013-07-15; } - import opendaylight-sal-binding-broker-impl { prefix sal-broker; revision-date 2013-10-28;} - import ofoverlay { prefix ofoverlay; revision-date 2014-05-28; } - import groupbasedpolicy-cfg { prefix gbpcfg; revision-date 2015-11-06; } - - description - "This module contains the base YANG definitions for - ofoverlay-provider impl implementation."; - - revision "2014-06-11" { - description - "Initial revision."; - } - - identity ofoverlay-provider-impl { - base "config:module-type"; - - config:java-name-prefix OFOverlayProvider; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case ofoverlay-provider-impl { - when "/config:modules/config:module/config:type = 'ofoverlay-provider-impl'"; - } - } -} diff --git a/renderers/ofoverlay/src/main/yang/ofoverlay-provider.yang b/renderers/ofoverlay/src/main/yang/ofoverlay-provider.yang deleted file mode 100644 index 94af4f303..000000000 --- a/renderers/ofoverlay/src/main/yang/ofoverlay-provider.yang +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module ofoverlay-provider { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:ofoverlay-provider"; - prefix "ofoverlay-provider"; - - import config { prefix config; revision-date 2013-04-05; } - - description - "This module contains the base YANG definitions for - ofoverlay-provider services."; - - revision "2014-04-21" { - description - "Initial revision."; - } - - identity ofoverlay-provider { - base "config:service-type"; - config:java-class "org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfoverlayData"; - } -} diff --git a/renderers/pom.xml b/renderers/pom.xml index 81c417559..e3cfe663a 100644 --- a/renderers/pom.xml +++ b/renderers/pom.xml @@ -4,64 +4,71 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT - - + + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT + + - org.opendaylight.groupbasedpolicy - groupbasedpolicy-renderers - 0.6.0-SNAPSHOT - pom - - ODL :: groupbasedpolicy :: ${project.artifactId} + org.opendaylight.groupbasedpolicy + groupbasedpolicy-renderers + 0.6.0-SNAPSHOT + pom + + ODL :: groupbasedpolicy :: ${project.artifactId} - - 0.6.0-SNAPSHOT - + + 0.6.0-SNAPSHOT + - - ofoverlay - iovisor - vpp - ios-xe - + + ofoverlay + iovisor + vpp + ios-xe + - - - - org.opendaylight.groupbasedpolicy - groupbasedpolicy-artifacts - ${project.version} - import - pom - + + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + org.opendaylight.groupbasedpolicy + groupbasedpolicy-artifacts + ${project.version} + import + pom + - - - org.opendaylight.sfc - sfc-provider - ${sfc.version} - - - org.opendaylight.sfc - sfc-model - ${sfc.version} - - - + + + org.opendaylight.sfc + sfc-provider + ${sfc.version} + + + org.opendaylight.sfc + sfc-model + ${sfc.version} + + + - - - org.opendaylight.groupbasedpolicy - groupbasedpolicy - - + + + org.opendaylight.groupbasedpolicy + groupbasedpolicy + + diff --git a/renderers/vpp/pom.xml b/renderers/vpp/pom.xml index d7b2e5b67..53a12e38b 100644 --- a/renderers/vpp/pom.xml +++ b/renderers/vpp/pom.xml @@ -33,13 +33,6 @@ pom import - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - diff --git a/renderers/vpp/src/main/config/default-config.xml b/renderers/vpp/src/main/config/default-config.xml deleted file mode 100644 index 9b16d70b8..000000000 --- a/renderers/vpp/src/main/config/default-config.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - vpp-provider-impl - - vpp:vpp-provider-impl - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:vpp-provider:impl?module=vpp-provider-impl&revision=2016-04-25 - - diff --git a/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderInstance.java b/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderInstance.java index 0b4f7ce5a..7078d0c61 100644 --- a/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderInstance.java +++ b/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderInstance.java @@ -76,7 +76,7 @@ public class GbpVppProviderInstance implements ClusterSingletonService, VppAdapt try { singletonServiceRegistration = clusterSingletonService.registerClusterSingletonService(this); } catch (Exception e) { - LOG.warn("Exception thrown while registering cluster singleton service in {}", this.getClass(), e.getMessage()); + LOG.warn("Exception thrown while registering cluster singleton service in {}. Exception : {}", this.getClass(), e); } } diff --git a/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderModule.java b/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderModule.java deleted file mode 100644 index 556524509..000000000 --- a/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderModule.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.vpp_provider.impl; - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -@Deprecated -public class GbpVppProviderModule extends org.opendaylight.controller.config.yang.config.vpp_provider.impl.AbstractGbpVppProviderModule { - - private static final Logger LOG = LoggerFactory.getLogger(GbpVppProviderModule.class); - - public GbpVppProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public GbpVppProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.vpp_provider.impl.GbpVppProviderModule 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() { - return NoopAutoCloseable.INSTANCE; - } - -} diff --git a/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderModuleFactory.java b/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderModuleFactory.java deleted file mode 100644 index 1bd2093f4..000000000 --- a/renderers/vpp/src/main/java/org/opendaylight/controller/config/yang/config/vpp_provider/impl/GbpVppProviderModuleFactory.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -/* -* Generated file -* -* Generated from: yang module name: vpp-provider-impl yang module local name: vpp-provider-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Wed May 25 17:25:43 CEST 2016 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.vpp_provider.impl; -@Deprecated -public class GbpVppProviderModuleFactory extends org.opendaylight.controller.config.yang.config.vpp_provider.impl.AbstractGbpVppProviderModuleFactory { - -} diff --git a/renderers/vpp/src/main/yang/vpp-provider-impl.yang b/renderers/vpp/src/main/yang/vpp-provider-impl.yang deleted file mode 100644 index 035302cfd..000000000 --- a/renderers/vpp/src/main/yang/vpp-provider-impl.yang +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module vpp-provider-impl { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:vpp-provider:impl"; - prefix "vpp-provider-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - import ietf-yang-types { prefix "yang"; revision-date 2013-07-15; } - import opendaylight-sal-binding-broker-impl { prefix sal-broker; revision-date 2013-10-28;} - import groupbasedpolicy-cfg { prefix gbpcfg; revision-date 2015-11-06; } - - description - "This module contains the base YANG definitions for - vpp-provider impl implementation."; - - revision "2016-04-25" { - description - "Initial revision."; - } - - identity vpp-provider-impl { - base "config:module-type"; - - config:java-name-prefix GbpVppProvider; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case vpp-provider-impl { - when "/config:modules/config:module/config:type = 'vpp-provider-impl'"; - } - } -} diff --git a/sxp-integration/ip-sgt-distribution-service/src/main/config/default-config.xml b/sxp-integration/ip-sgt-distribution-service/src/main/config/default-config.xml deleted file mode 100644 index 6381bca68..000000000 --- a/sxp-integration/ip-sgt-distribution-service/src/main/config/default-config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - ip-sgt-distribution-service:ip-sgt-distribution-service - - ip-sgt-distribution-service - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:ip:sgt:distribution:service:cfg?module=ip-sgt-distribution-service-cfg&revision=2016-07-15 - - - diff --git a/sxp-integration/ip-sgt-distribution-service/src/main/java/org/opendaylight/controller/config/yang/config/ip/sgt/distribution/service/cfg/IpSgtDistributionServiceModule.java b/sxp-integration/ip-sgt-distribution-service/src/main/java/org/opendaylight/controller/config/yang/config/ip/sgt/distribution/service/cfg/IpSgtDistributionServiceModule.java deleted file mode 100644 index bf036ace0..000000000 --- a/sxp-integration/ip-sgt-distribution-service/src/main/java/org/opendaylight/controller/config/yang/config/ip/sgt/distribution/service/cfg/IpSgtDistributionServiceModule.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.ip.sgt.distribution.service.cfg; - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; - -public class IpSgtDistributionServiceModule extends org.opendaylight.controller.config.yang.config.ip.sgt.distribution.service.cfg.AbstractIpSgtDistributionServiceModule { - public IpSgtDistributionServiceModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public IpSgtDistributionServiceModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.ip.sgt.distribution.service.cfg.IpSgtDistributionServiceModule 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() { - return NoopAutoCloseable.INSTANCE; - } - -} diff --git a/sxp-integration/ip-sgt-distribution-service/src/main/java/org/opendaylight/controller/config/yang/config/ip/sgt/distribution/service/cfg/IpSgtDistributionServiceModuleFactory.java b/sxp-integration/ip-sgt-distribution-service/src/main/java/org/opendaylight/controller/config/yang/config/ip/sgt/distribution/service/cfg/IpSgtDistributionServiceModuleFactory.java deleted file mode 100644 index ddd9d24e3..000000000 --- a/sxp-integration/ip-sgt-distribution-service/src/main/java/org/opendaylight/controller/config/yang/config/ip/sgt/distribution/service/cfg/IpSgtDistributionServiceModuleFactory.java +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.ip.sgt.distribution.service.cfg; -public class IpSgtDistributionServiceModuleFactory extends org.opendaylight.controller.config.yang.config.ip.sgt.distribution.service.cfg.AbstractIpSgtDistributionServiceModuleFactory { - -} diff --git a/sxp-integration/ip-sgt-distribution-service/src/main/yang/ip-sgt-distribution-service-cfg.yang b/sxp-integration/ip-sgt-distribution-service/src/main/yang/ip-sgt-distribution-service-cfg.yang deleted file mode 100644 index c8d2ae167..000000000 --- a/sxp-integration/ip-sgt-distribution-service/src/main/yang/ip-sgt-distribution-service-cfg.yang +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module ip-sgt-distribution-service-cfg { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:ip:sgt:distribution:service:cfg"; - prefix "ip-sgt-distribution-service-cfg"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - import ietf-inet-types { prefix inet; revision-date 2013-07-15; } - - description - "This module contains the base YANG definitions for - ip/sgt distribution service implementation."; - - revision "2016-07-15" { - description - "Initial revision."; - } - - identity ip-sgt-distribution-service { - base "config:module-type"; - - config:java-name-prefix IpSgtDistributionService; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case ip-sgt-distribution-service { - when "/config:modules/config:module/config:type = 'ip-sgt-distribution-service'"; - } - } -} diff --git a/sxp-integration/sxp-ep-provider/src/main/config/default-config.xml b/sxp-integration/sxp-ep-provider/src/main/config/default-config.xml deleted file mode 100755 index 2e0812d4f..000000000 --- a/sxp-integration/sxp-ep-provider/src/main/config/default-config.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - sxp-ep-provider:sxp-ep-provider-impl - - sxp-ep-provider-default-impl - - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:sxp-ep-provider:model?module=sxp-ep-provider-model&revision=2016-03-02 - urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:sxp-ep-provider?module=sxp-ep-provider-cfg&revision=2016-07-22 - - - diff --git a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderInstance.java b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderInstance.java index de7910c18..2864d07a2 100644 --- a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderInstance.java +++ b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderInstance.java @@ -23,7 +23,7 @@ import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvid import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration; import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.BaseEndpointService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.rev160722.SgtGeneratorConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.SgtGeneratorConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderModule.java b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderModule.java deleted file mode 100644 index 181e007af..000000000 --- a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderModule.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ep_provider; - - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; - -/** -* sxp-ep-provider impl module -*/ -public class SxpEpProviderProviderModule extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ep_provider.AbstractSxpEpProviderProviderModule { - public SxpEpProviderProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public SxpEpProviderProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ep_provider.SxpEpProviderProviderModule 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() { - return NoopAutoCloseable.INSTANCE; - } - -} diff --git a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderModuleFactory.java b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderModuleFactory.java deleted file mode 100644 index 7e16cc469..000000000 --- a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderModuleFactory.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -/* -* Generated file -* -* Generated from: yang module name: sxp-ep-provider-cfg yang module local name: sxp-ep-provider-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Thu Jul 21 17:55:05 CEST 2016 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ep_provider; -public class SxpEpProviderProviderModuleFactory extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ep_provider.AbstractSxpEpProviderProviderModuleFactory { - -} diff --git a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SgtGeneratorImpl.java b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SgtGeneratorImpl.java index ea8ee0473..a6cc5cf44 100644 --- a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SgtGeneratorImpl.java +++ b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SgtGeneratorImpl.java @@ -14,7 +14,7 @@ import com.google.common.collect.Range; import java.util.Optional; import org.opendaylight.groupbasedpolicy.sxp.ep.provider.impl.util.EPTemplateUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointPolicyTemplateBySgt; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.rev160722.SgtGeneratorConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.SgtGeneratorConfig; import org.opendaylight.yang.gen.v1.urn.opendaylight.sxp.database.rev160308.Sgt; /** diff --git a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SxpEpProviderProviderImpl.java b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SxpEpProviderProviderImpl.java index 37e754ada..b161d9028 100644 --- a/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SxpEpProviderProviderImpl.java +++ b/sxp-integration/sxp-ep-provider/src/main/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SxpEpProviderProviderImpl.java @@ -29,7 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.BaseEndpointService; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointForwardingTemplateBySubnet; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointPolicyTemplateBySgt; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.rev160722.SgtGeneratorConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.SgtGeneratorConfig; import org.opendaylight.yang.gen.v1.urn.opendaylight.sxp.database.rev160308.Sgt; import org.opendaylight.yang.gen.v1.urn.opendaylight.sxp.database.rev160308.master.database.fields.MasterDatabaseBinding; import org.slf4j.Logger; diff --git a/sxp-integration/sxp-ep-provider/src/main/resources/org/opendaylight/blueprint/sxp-mapper.xml b/sxp-integration/sxp-ep-provider/src/main/resources/org/opendaylight/blueprint/sxp-mapper.xml index 118741a85..8245de7f7 100644 --- a/sxp-integration/sxp-ep-provider/src/main/resources/org/opendaylight/blueprint/sxp-mapper.xml +++ b/sxp-integration/sxp-ep-provider/src/main/resources/org/opendaylight/blueprint/sxp-mapper.xml @@ -10,10 +10,10 @@ interface="org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.BaseEndpointService"/> + binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.SgtGeneratorConfig"> + xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:sxp-ep-provider:model"> 100 200 @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/sxp-integration/sxp-ep-provider/src/main/yang/sxp-ep-provider-cfg.yang b/sxp-integration/sxp-ep-provider/src/main/yang/sxp-ep-provider-cfg.yang deleted file mode 100644 index 89a6155f8..000000000 --- a/sxp-integration/sxp-ep-provider/src/main/yang/sxp-ep-provider-cfg.yang +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module sxp-ep-provider-cfg { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:sxp-ep-provider"; - prefix "sxp-ep-prvd-cfg"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - import groupbasedpolicy-cfg {prefix gbpcfg; revision-date 2015-11-06; } - import sxp-database { prefix sxp-database; revision-date 2016-03-08; } - - description - "This module contains the base YANG definitions for - sxf-integration : sxp-ep-provider impl configuration."; - - revision "2016-07-22" { - description - "Initial revision."; - } - - identity sxp-ep-provider-impl { - description - "sxp-ep-provider impl module"; - - base "config:module-type"; - config:provided-service sxp-ep-provider; - config:java-name-prefix SxpEpProviderProvider; - } - - identity sxp-ep-provider { - description - "sxp-ep-provider injection point service for template provider"; - - base "config:service-type"; - config:java-class "org.opendaylight.groupbasedpolicy.sxp.ep.provider.spi.SxpEpProviderProvider"; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case sxp-ep-provider-impl { - when "/config:modules/config:module/config:type = 'sxp-ep-provider-impl'"; - } - } - - container sgt-generator-config { - description "sgt-generator configuration"; - leaf sgt-low { - type sxp-database:sgt; - mandatory true; - description "minimal SGT value to be used by sgt-generator"; - } - leaf sgt-high { - type sxp-database:sgt; - mandatory true; - description "maximal SGT value to be used by sgt-generator"; - } - } -} diff --git a/sxp-integration/sxp-ep-provider/src/main/yang/sxp-ep-provider-model.yang b/sxp-integration/sxp-ep-provider/src/main/yang/sxp-ep-provider-model.yang index 1ea69bdb9..2f89726a3 100644 --- a/sxp-integration/sxp-ep-provider/src/main/yang/sxp-ep-provider-model.yang +++ b/sxp-integration/sxp-ep-provider/src/main/yang/sxp-ep-provider-model.yang @@ -105,6 +105,20 @@ module sxp-ep-provider-model { } } + container sgt-generator-config { + description "sgt-generator configuration"; + leaf sgt-low { + type sxp-database:sgt; + mandatory true; + description "minimal SGT value to be used by sgt-generator"; + } + leaf sgt-high { + type sxp-database:sgt; + mandatory true; + description "maximal SGT value to be used by sgt-generator"; + } + } + augment "renderer:renderers/renderer:renderer/renderer:renderer-policy/renderer:configuration/renderer:endpoints/renderer:address-endpoint-with-location" { ext:augment-identifier "address-endpoint-with-location-aug"; uses sxp-sgt; diff --git a/sxp-integration/sxp-ep-provider/src/test/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderInstanceTest.java b/sxp-integration/sxp-ep-provider/src/test/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderInstanceTest.java index 9824b4e07..934fbda42 100644 --- a/sxp-integration/sxp-ep-provider/src/test/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderInstanceTest.java +++ b/sxp-integration/sxp-ep-provider/src/test/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ep_provider/SxpEpProviderProviderInstanceTest.java @@ -32,7 +32,7 @@ import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvid import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration; import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.BaseEndpointService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.rev160722.SgtGeneratorConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.SgtGeneratorConfig; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -152,4 +152,4 @@ public class SxpEpProviderProviderInstanceTest { instance.instantiateServiceInstance(); Assert.assertEquals(epPolicyTemplateProviderRegistry, instance.getEPPolicyTemplateProviderRegistry()); } -} \ No newline at end of file +} diff --git a/sxp-integration/sxp-ep-provider/src/test/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SgtGeneratorImplTest.java b/sxp-integration/sxp-ep-provider/src/test/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SgtGeneratorImplTest.java index 1b5900ceb..bc69371c3 100644 --- a/sxp-integration/sxp-ep-provider/src/test/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SgtGeneratorImplTest.java +++ b/sxp-integration/sxp-ep-provider/src/test/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SgtGeneratorImplTest.java @@ -16,8 +16,8 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointPolicyTemplateBySgt; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.rev160722.SgtGeneratorConfig; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.rev160722.SgtGeneratorConfigBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.SgtGeneratorConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.SgtGeneratorConfigBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.sxp.database.rev160308.Sgt; import java.util.HashSet; @@ -79,4 +79,4 @@ public class SgtGeneratorImplTest { Assert.assertTrue(sgt.isPresent()); Assert.assertEquals(11, sgt.get().getValue().intValue()); } -} \ No newline at end of file +} diff --git a/sxp-integration/sxp-ep-provider/src/test/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SxpEpProviderProviderImplTest.java b/sxp-integration/sxp-ep-provider/src/test/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SxpEpProviderProviderImplTest.java index 6d5c1123c..169ceee9f 100644 --- a/sxp-integration/sxp-ep-provider/src/test/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SxpEpProviderProviderImplTest.java +++ b/sxp-integration/sxp-ep-provider/src/test/java/org/opendaylight/groupbasedpolicy/sxp/ep/provider/impl/SxpEpProviderProviderImplTest.java @@ -39,7 +39,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpo import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.ConditionName; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.EndpointGroupId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.sxp.ep.mapper.EndpointPolicyTemplateBySgt; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.rev160722.SgtGeneratorConfig; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.groupbasedpolicy.sxp.integration.sxp.ep.provider.model.rev160302.SgtGeneratorConfig; import org.opendaylight.yang.gen.v1.urn.opendaylight.sxp.database.rev160308.Sgt; import org.opendaylight.yang.gen.v1.urn.opendaylight.sxp.database.rev160308.master.database.fields.MasterDatabaseBinding; import org.powermock.core.classloader.annotations.PrepareForTest; @@ -169,4 +169,4 @@ public class SxpEpProviderProviderImplTest { Mockito.verify(epForwardingTemplateListener).close(); Mockito.verify(templateProviderRegistry).close(); } -} \ No newline at end of file +} diff --git a/sxp-integration/sxp-ise-adapter/src/main/config/default-config.xml b/sxp-integration/sxp-ise-adapter/src/main/config/default-config.xml deleted file mode 100755 index cb0fe1632..000000000 --- a/sxp-integration/sxp-ise-adapter/src/main/config/default-config.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - sxp-ise-adapter:sxp-ise-adapter-impl - - gbp-ise-adapter - - - - - - - urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:sxp-ise-adapter?module=sxp-ise-adapter-cfg&revision=2016-06-30 - urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:sxp-ise-adapter:model?module=sxp-ise-adapter-model&revision=2016-06-30 - - - diff --git a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderModule.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderModule.java deleted file mode 100644 index 6e6308470..000000000 --- a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderModule.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ise_adapter; - -import org.opendaylight.controller.sal.common.util.NoopAutoCloseable; - -/** - * gbp-sxp-ise-adapter impl module - */ -@Deprecated -public class SxpIseAdapterProviderModule extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ise_adapter.AbstractSxpIseAdapterProviderModule { - public SxpIseAdapterProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public SxpIseAdapterProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ise_adapter.SxpIseAdapterProviderModule 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() { - return NoopAutoCloseable.INSTANCE; - } - -} diff --git a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderModuleFactory.java b/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderModuleFactory.java deleted file mode 100644 index b8a6c8ff0..000000000 --- a/sxp-integration/sxp-ise-adapter/src/main/java/org/opendaylight/controller/config/yang/config/groupbasedpolicy/sxp_integration/sxp_ise_adapter/SxpIseAdapterProviderModuleFactory.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -/* -* Generated file -* -* Generated from: yang module name: sxp-ise-adapter-cfg yang module local name: sxp-ise-adapter-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Thu Aug 25 11:10:48 CEST 2016 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ise_adapter; - -@Deprecated -public class SxpIseAdapterProviderModuleFactory extends org.opendaylight.controller.config.yang.config.groupbasedpolicy.sxp_integration.sxp_ise_adapter.AbstractSxpIseAdapterProviderModuleFactory { - -} diff --git a/sxp-integration/sxp-ise-adapter/src/main/yang/sxp-ise-adapter-cfg.yang b/sxp-integration/sxp-ise-adapter/src/main/yang/sxp-ise-adapter-cfg.yang deleted file mode 100644 index 1dd319d8d..000000000 --- a/sxp-integration/sxp-ise-adapter/src/main/yang/sxp-ise-adapter-cfg.yang +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -module sxp-ise-adapter-cfg { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-integration:sxp-ise-adapter"; - prefix "gpb-sxp-ise-adapter-cfg"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - import sxp-ep-provider-cfg { prefix gbp-sxp-ep; revision-date 2016-07-22; } - - description - "This module contains the base YANG definitions for - gbp-ise-adapter impl configuration."; - - revision "2016-06-30" { - description - "Initial revision."; - } - - identity sxp-ise-adapter-impl { - description - "gbp-sxp-ise-adapter impl module"; - - base "config:module-type"; - config:java-name-prefix Sxp-IseAdapterProvider; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case gbp-sxp-ise-adapter-impl { - when "/config:modules/config:module/config:type = 'sxp-ise-adapter-impl'"; - } - } -} -- 2.36.6