diff options
Diffstat (limited to 'adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoKeystoneV3Utils.java')
-rw-r--r-- | adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoKeystoneV3Utils.java | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoKeystoneV3Utils.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoKeystoneV3Utils.java index 072ab5a8d0..63bc235363 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoKeystoneV3Utils.java +++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoKeystoneV3Utils.java @@ -21,29 +21,15 @@ package org.onap.so.openstack.utils; import java.util.Map; -import org.onap.so.cloud.authentication.AuthenticationMethodFactory; import org.onap.so.db.catalog.beans.CloudIdentity; -import org.onap.so.db.catalog.beans.CloudSite; import org.onap.so.openstack.beans.MsoTenant; import org.onap.so.openstack.exceptions.MsoCloudSiteNotFound; import org.onap.so.openstack.exceptions.MsoException; -import org.onap.so.utils.CryptoUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.woorea.openstack.keystone.v3.model.Token; -import com.woorea.openstack.base.client.OpenStackConnectException; -import com.woorea.openstack.base.client.OpenStackResponseException; -import com.woorea.openstack.keystone.v3.Keystone; -import com.woorea.openstack.keystone.v3.api.TokensResource.Authenticate; -import com.woorea.openstack.keystone.v3.model.Authentication; -import com.woorea.openstack.keystone.v3.model.Authentication.Identity; @Component public class MsoKeystoneV3Utils extends MsoTenantUtils { - @Autowired - private AuthenticationMethodFactory authenticationMethodFactory; - @Override public String createTenant(String tenantName, String cloudSiteId, Map<String, String> metadata, boolean backout) throws MsoException { @@ -71,22 +57,4 @@ public class MsoKeystoneV3Utils extends MsoTenantUtils { return cloudIdentity.getIdentityUrl(); } - public Token getKeystoneToken(CloudSite cloudSite) throws MsoException { - try { - CloudIdentity cloudIdentity = cloudSite.getIdentityService(); - - Keystone keystone = new Keystone(cloudIdentity.getIdentityUrl()); - - Authentication auth = authenticationMethodFactory.getAuthenticationForV3(cloudIdentity); - - Authenticate authenticate = keystone.tokens().authenticate(auth); - return executeAndRecordOpenstackRequest(authenticate); - - } catch (OpenStackResponseException e) { - throw keystoneErrorToMsoException(e, "TokenAuth"); - } catch (OpenStackConnectException e) { - throw keystoneErrorToMsoException(e, "TokenAuth"); - } - } - } |