Unit test cases for iaas impl package

[appc.git] / appc-adapters / appc-iaas-adapter / appc-iaas-adapter-bundle / src / main / java / org / onap / appc / adapter / iaas / impl / ServiceCatalogV3.java

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ServiceCatalogV3.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ServiceCatalogV3.java
index 1e057d1..4773603 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ServiceCatalogV3.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/impl/ServiceCatalogV3.java
@@ -23,13 +23,25 @@
 \r
 package org.onap.appc.adapter.iaas.impl;\r
 \r
+import java.util.ArrayList;\r
+import java.util.Calendar;\r
+import java.util.Date;\r
+import java.util.HashMap;\r
+import java.util.HashSet;\r
+import java.util.List;\r
+import java.util.Map;\r
+import java.util.Properties;\r
+import java.util.Set;\r
+import java.util.concurrent.locks.Lock;\r
+import java.util.concurrent.locks.ReentrantReadWriteLock;\r
+import java.util.regex.Matcher;\r
+import java.util.regex.Pattern;\r
 import com.att.cdp.exceptions.ContextConnectionException;\r
 import com.att.cdp.exceptions.ZoneException;\r
 import com.att.cdp.openstack.util.ExceptionMapper;\r
 import com.att.cdp.pal.util.Time;\r
 import com.att.cdp.zones.ContextFactory;\r
 import com.att.cdp.zones.spi.RequestState;\r
-import com.google.common.collect.Lists;\r
 import com.woorea.openstack.base.client.OpenStackBaseException;\r
 import com.woorea.openstack.base.client.OpenStackClientConnector;\r
 import com.woorea.openstack.base.client.OpenStackSimpleTokenProvider;\r
@@ -42,19 +54,6 @@ import com.woorea.openstack.keystone.v3.model.Token;
 import com.woorea.openstack.keystone.v3.model.Token.Project;\r
 import com.woorea.openstack.keystone.v3.model.Token.Service;\r
 import com.woorea.openstack.keystone.v3.model.Token.Service.Endpoint;\r
-import java.util.ArrayList;\r
-import java.util.Calendar;\r
-import java.util.Date;\r
-import java.util.HashMap;\r
-import java.util.HashSet;\r
-import java.util.List;\r
-import java.util.Map;\r
-import java.util.Properties;\r
-import java.util.Set;\r
-import java.util.concurrent.locks.Lock;\r
-import java.util.concurrent.locks.ReentrantReadWriteLock;\r
-import java.util.regex.Matcher;\r
-import java.util.regex.Pattern;\r
 \r
 /**\r
  * This class is used to capture and cache the service catalog for a specific OpenStack provider.\r
@@ -225,13 +224,7 @@ public class ServiceCatalogV3 extends ServiceCatalog {
      */\r
     @Override\r
     public String getProjectName() {\r
-        Lock readLock = rwLock.readLock();\r
-        readLock.lock();\r
-        try {\r
-            return project.getName();\r
-        } finally {\r
-            readLock.unlock();\r
-        }\r
+        return getProject().getName();\r
     }\r
 \r
     /**\r
@@ -403,4 +396,14 @@ public class ServiceCatalogV3 extends ServiceCatalog {
         }\r
         return now.getTime();\r
     }\r
+    \r
+    public Project getProject() {\r
+        Lock readLock = rwLock.readLock();\r
+        readLock.lock();\r
+        try {\r
+            return project;\r
+        } finally {\r
+            readLock.unlock();\r
+        }\r
+    }\r
 }
\ No newline at end of file