1 files changed, 0 insertions, 75 deletions
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoTenantUtilsFactory.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoTenantUtilsFactory.java
deleted file mode 100644
index 49c262268d..0000000000
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoTenantUtilsFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.mso.openstack.utils;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.openecomp.mso.cloud.CloudConfig;
-import org.openecomp.mso.cloud.CloudConfigFactory;
-import org.openecomp.mso.cloud.CloudIdentity;
-import org.openecomp.mso.cloud.CloudSite;
-import org.openecomp.mso.logger.MsoLogger;
-import org.openecomp.mso.openstack.exceptions.MsoCloudSiteNotFound;
-
-
-public class MsoTenantUtilsFactory {
-
-	private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
-	private CloudConfigFactory cloudConfigFactory = new CloudConfigFactory();
-	private String msoPropID;
-	
-	public MsoTenantUtilsFactory (String msoPropID) {
-		this.msoPropID = msoPropID;
-	}
-
-	public void setCloudConfigFactory(CloudConfigFactory cloudConfigFactory) {
-		this.cloudConfigFactory = cloudConfigFactory;
-	}
-
-	public CloudConfigFactory getCloudConfigFactory() {
-		return cloudConfigFactory;
-	}
-
-	//based on Cloud IdentityServerType returns ORM or KEYSTONE Utils
-	public MsoTenantUtils getTenantUtils(String cloudSiteId) throws MsoCloudSiteNotFound {
-		// Obtain the cloud site information 
-		CloudConfig cloudConfig = getCloudConfigFactory().getCloudConfig();
-		CloudSite cloudSite = cloudConfig.getCloudSite(cloudSiteId).orElseThrow(
-				() -> new MsoCloudSiteNotFound(cloudSiteId));
-		return getTenantUtilsByServerType(cloudSite.getIdentityService().getIdentityServerType().toString());
-	}
-
-	public MsoTenantUtils getTenantUtilsByServerType(String serverType) {
-
-		MsoTenantUtils tenantU = null;
-		if (CloudIdentity.IdentityServerType.KEYSTONE.toString().equals(serverType)) {
-			tenantU = new MsoKeystoneUtils(msoPropID, getCloudConfigFactory());
-		} else {
-			try {
-				tenantU = CloudIdentity.IdentityServerType.valueOf(serverType).getMsoTenantUtilsClass()
-					.getConstructor(String.class, CloudConfigFactory.class).newInstance(msoPropID, getCloudConfigFactory());
-			} catch (InvocationTargetException | InstantiationException | NoSuchMethodException | IllegalAccessException e) {
-				throw new RuntimeException("Could not instantiate an MsoTenantUtils class for " + serverType, e);
-			}
-		}
-		return tenantU;
-	}
-}