protectors/zosmfidInConfig

api-catalog-services/src/test/java/org/zowe/apiml/apicatalog/instance/InstanceInitializeServiceTest.java

@@ -10,12 +10,6 @@
 
 package org.zowe.apiml.apicatalog.instance;
 
-import org.zowe.apiml.apicatalog.services.cached.CachedProductFamilyService;
-import org.zowe.apiml.apicatalog.services.cached.CachedServicesService;
-import org.zowe.apiml.product.constants.CoreService;
-import org.zowe.apiml.product.gateway.GatewayNotAvailableException;
-import org.zowe.apiml.product.instance.InstanceInitializationException;
-import org.zowe.apiml.product.registry.CannotRegisterServiceException;
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.discovery.shared.Application;
 import com.netflix.discovery.shared.Applications;
@@ -27,21 +21,22 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.retry.RetryException;
+import org.zowe.apiml.apicatalog.services.cached.CachedProductFamilyService;
+import org.zowe.apiml.apicatalog.services.cached.CachedServicesService;
+import org.zowe.apiml.product.constants.CoreService;
+import org.zowe.apiml.product.gateway.GatewayNotAvailableException;
+import org.zowe.apiml.product.instance.InstanceInitializationException;
+import org.zowe.apiml.product.registry.CannotRegisterServiceException;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-import static org.zowe.apiml.constants.EurekaMetadataDefinition.CATALOG_ID;
-import static org.zowe.apiml.constants.EurekaMetadataDefinition.ROUTES;
-import static org.zowe.apiml.constants.EurekaMetadataDefinition.ROUTES_GATEWAY_URL;
-import static org.zowe.apiml.constants.EurekaMetadataDefinition.ROUTES_SERVICE_URL;
 import static junit.framework.TestCase.assertTrue;
 import static org.hamcrest.Matchers.isA;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
+import static org.zowe.apiml.constants.EurekaMetadataDefinition.*;
 
 @RunWith(MockitoJUnitRunner.class)
 public class InstanceInitializeServiceTest {
@@ -165,7 +160,6 @@ private Map<String, InstanceInfo> createInstances() {
             "https://localhost:9090/");
         instanceInfoMap.put(instanceInfo.getAppName(), instanceInfo);
 
-
         instanceInfo = getStandardInstance(
             "STATICCLIENT",
             InstanceInfo.InstanceStatus.UP,
@@ -174,7 +168,6 @@ private Map<String, InstanceInfo> createInstances() {
             "https://localhost:9090/discoverableclient");
         instanceInfoMap.put(instanceInfo.getAppName(), instanceInfo);
 
-
         instanceInfo = getStandardInstance(
             "STATICCLIENT2",
             InstanceInfo.InstanceStatus.UP,
@@ -183,20 +176,19 @@ private Map<String, InstanceInfo> createInstances() {
             null);
         instanceInfoMap.put(instanceInfo.getAppName(), instanceInfo);
 
-
         instanceInfo = getStandardInstance(
-            "ZOSMFTSO21",
+            "ZOSMF1",
             InstanceInfo.InstanceStatus.UP,
-            getMetadataByCatalogUiTitleId("zosmf", "/zosmftso21"),
-            "zosmftso21",
+            getMetadataByCatalogUiTitleId("zosmf", "/zosmf1"),
+            "zosmf1",
             null);
         instanceInfoMap.put(instanceInfo.getAppName(), instanceInfo);
 
         instanceInfo = getStandardInstance(
-            "ZOSMFCA32",
+            "ZOSMF2",
             InstanceInfo.InstanceStatus.UP,
-            getMetadataByCatalogUiTitleId("zosmf", "/zosmfca32"),
-            "zosmfca32",
+            getMetadataByCatalogUiTitleId("zosmf", "/zosmf2"),
+            "zosmf2",
             null);
         instanceInfoMap.put(instanceInfo.getAppName(), instanceInfo);
 

api-catalog-services/src/test/java/org/zowe/apiml/apicatalog/instance/InstanceRetrievalServiceTest.java

@@ -10,11 +10,6 @@
 
 package org.zowe.apiml.apicatalog.instance;
 
-import org.zowe.apiml.apicatalog.discovery.DiscoveryConfigProperties;
-import org.zowe.apiml.apicatalog.util.ApplicationsWrapper;
-import org.zowe.apiml.product.constants.CoreService;
-import org.zowe.apiml.product.instance.InstanceInitializationException;
-import org.zowe.apiml.product.registry.ApplicationWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.netflix.appinfo.InstanceInfo;
@@ -36,6 +31,11 @@
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.client.RestTemplate;
+import org.zowe.apiml.apicatalog.discovery.DiscoveryConfigProperties;
+import org.zowe.apiml.apicatalog.util.ApplicationsWrapper;
+import org.zowe.apiml.product.constants.CoreService;
+import org.zowe.apiml.product.instance.InstanceInitializationException;
+import org.zowe.apiml.product.registry.ApplicationWrapper;
 
 import java.util.*;
 
@@ -259,10 +259,10 @@ private Map<String, InstanceInfo> createInstances() {
         instanceInfoMap.put(instanceInfo.getAppName(), instanceInfo);
 
 
-        instanceInfo = getStandardInstance("ZOSMFTSO21", InstanceInfo.InstanceStatus.UP);
+        instanceInfo = getStandardInstance("ZOSMF1", InstanceInfo.InstanceStatus.UP);
         instanceInfoMap.put(instanceInfo.getAppName(), instanceInfo);
 
-        instanceInfo = getStandardInstance("ZOSMFCA32", InstanceInfo.InstanceStatus.UP);
+        instanceInfo = getStandardInstance("ZOSMF2", InstanceInfo.InstanceStatus.UP);
         instanceInfoMap.put(instanceInfo.getAppName(), instanceInfo);
 
         return instanceInfoMap;

gateway-service/src/test/java/org/zowe/apiml/gateway/security/login/zosmf/ZosmfAuthenticationProviderTest.java

@@ -42,7 +42,9 @@
 import org.zowe.apiml.security.common.token.TokenAuthentication;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumMap;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;

integration-tests/src/test/java/org/zowe/apiml/gatewayservice/ZosmfAuthenticationTest.java

@@ -21,6 +21,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.zowe.apiml.util.categories.AdditionalLocalTest;
+import org.zowe.apiml.util.config.ConfigReader;
 import org.zowe.apiml.util.service.DiscoveryUtils;
 import org.zowe.apiml.util.service.VirtualService;
 
@@ -38,14 +39,14 @@
  * Those tests simulate different version of z/OSMF.
  *
  * For right execution is required:
- *  - set provider in gateway to zosmf with serviceId zosmfca32
+ *  - set provider in gateway to zosmf with using serviceId of z/OSMF
  *  - start discovery service and gateway locally
  */
 @RunWith(JUnit4.class)
 @Category(AdditionalLocalTest.class)
 public class ZosmfAuthenticationTest {
 
-    private static final String ZOSMF_ID = "zosmfca32";
+    private static final String ZOSMF_ID = ConfigReader.environmentConfiguration().getZosmfServiceConfiguration().getServiceId();
     private static final String LOGIN_ENDPOINT = "/api/v1/gateway/auth/login";
 
     private static final String USER_ID = "user";

integration-tests/src/test/java/org/zowe/apiml/gatewayservice/ZosmfSsoIntegrationTest.java

@@ -26,7 +26,8 @@
 public class ZosmfSsoIntegrationTest {
     private final static String PASSWORD = ConfigReader.environmentConfiguration().getCredentials().getPassword();
     private final static String USERNAME = ConfigReader.environmentConfiguration().getCredentials().getUser();
-    private final static String BASE_PATH = "/api/zosmfca32";
+    private final static String ZOSMF_SERVICE_ID = ConfigReader.environmentConfiguration().getZosmfServiceConfiguration().getServiceId();
+    private final static String BASE_PATH = "/api/" + ZOSMF_SERVICE_ID;
     private final static String ZOSMF_ENDPOINT = "/zosmf/restfiles/ds?dslevel=sys1.p*";
 
     private String token;

integration-tests/src/test/java/org/zowe/apiml/util/config/ConfigReader.java

@@ -51,7 +51,7 @@ public static EnvironmentConfiguration environmentConfiguration() {
                             .trustStorePassword("password")
                             .build();
 
-                        ZosmfServiceConfiguration zosmfServiceConfiguration = new ZosmfServiceConfiguration("https", "ca32.ca.com", 1443);
+                        ZosmfServiceConfiguration zosmfServiceConfiguration = new ZosmfServiceConfiguration("https", "zosmf.acme.com", 1443, "zosmf");
                         configuration = new EnvironmentConfiguration(
                             credentials,
                             gatewayServiceConfiguration,

integration-tests/src/test/java/org/zowe/apiml/util/config/ZosmfServiceConfiguration.java

@@ -20,4 +20,5 @@ public class ZosmfServiceConfiguration {
     private String scheme;
     private String host;
     private int port;
+    private String serviceId;
 }