diff options
author | 2017-10-11 02:16:18 -0400 | |
---|---|---|
committer | 2017-10-11 11:58:16 -0400 | |
commit | 8d8251478f7242d3898b7c2760ddfc230bd94c7e (patch) | |
tree | 25423e02bb62a28822e484b609f46c93e40b01ae /appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java | |
parent | f7824831d63aeb5be44077de7bf51fa05a4e5010 (diff) |
Add support for OpenStack V3 Identity Service
replaced ServiceCatalog with a factory to select correct version
ServiceCatalogV2 contains code previously found in ServiceCatalog
add ServiceCatalogV3 implementation of V3 connector
Issue-ID: APPC-259
Change-Id: Iba7d98cfc9e50914b8063be0b35494a9d0fea793
Signed-off-by: RY303T <RY303T@att.com>
Diffstat (limited to 'appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java')
-rw-r--r-- | appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java index 75dadae58..f17584e2a 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/AppcProviderAdapterActivator.java @@ -32,7 +32,6 @@ import org.openecomp.appc.i18n.Msg; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; - import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -83,12 +82,10 @@ public class AppcProviderAdapterActivator implements BundleActivator { * This method must complete and return to its caller in a timely manner. * </p> * - * @param context - * The execution context of the bundle being started. - * @throws java.lang.Exception - * If this method throws an exception, this bundle is marked as stopped and the Framework will remove - * this bundle's listeners, unregister all services registered by this bundle, and release all services - * used by this bundle. + * @param context The execution context of the bundle being started. + * @throws java.lang.Exception If this method throws an exception, this bundle is marked as stopped and the + * Framework will remove this bundle's listeners, unregister all services registered by this bundle, and + * release all services used by this bundle. * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) */ @Override @@ -100,14 +97,14 @@ public class AppcProviderAdapterActivator implements BundleActivator { logger.info(Msg.COMPONENT_INITIALIZING, appName, "IAAS adapter"); try { adapter = new ProviderAdapterImpl(configuration.getProperties()); - } catch(Exception e){ - logger.error("Error initializing APPC IAAS ProviderAdapterImpl",e); + } catch (Exception e) { + logger.error("Error initializing APPC IAAS ProviderAdapterImpl", e); throw e; } - + if (registration == null) { logger.info(Msg.REGISTERING_SERVICE, appName, adapter.getAdapterName(), - ProviderAdapter.class.getSimpleName()); + ProviderAdapter.class.getSimpleName()); registration = context.registerService(ProviderAdapter.class, adapter, null); } @@ -123,12 +120,10 @@ public class AppcProviderAdapterActivator implements BundleActivator { * This method must complete and return to its caller in a timely manner. * </p> * - * @param context - * The execution context of the bundle being stopped. - * @throws java.lang.Exception - * If this method throws an exception, the bundle is still marked as stopped, and the Framework will - * remove the bundle's listeners, unregister all services registered by the bundle, and release all - * services used by the bundle. * + * @param context The execution context of the bundle being stopped. + * @throws java.lang.Exception If this method throws an exception, the bundle is still marked as stopped, and the + * Framework will remove the bundle's listeners, unregister all services registered by the bundle, and + * release all services used by the bundle. * * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) */ @Override |