[MSO-8] Update the maven dependency

Update the maven depenency for sdc-distribution-client to cooperate with the sdc changes.

Change-Id: I2da936e5c40cb68c7181bb78307192dd5655b5dc
Signed-off-by: xg353y <xg353y@intl.att.com>

7 files changed, 132 insertions, 45 deletions

diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/VnfRollback.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/VnfRollback.java
index b6e4a6e855..fc148746a0 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/VnfRollback.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/VnfRollback.java
@@ -7,9 +7,9 @@
  * 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.
@@ -42,13 +42,14 @@ public class VnfRollback {
 	private String baseGroupHeatStackId;
 	private boolean isBase = false;
 	private String vfModuleStackId;
+	private String modelCustomizationUuid; //NOTE: this is the vfModule's modelCustomizationUuid
 
 	public VnfRollback() {}
-	
+
 	public VnfRollback(String vnfId, String tenantId, String cloudSiteId,
 			boolean tenantCreated, boolean vnfCreated,
 			MsoRequest msoRequest,
-			String volumeGroupName, String volumeGroupId, String requestType) {
+			String volumeGroupName, String volumeGroupId, String requestType, String modelCustomizationUuid) {
 		super();
 		this.vnfId = vnfId;
 		this.tenantId = tenantId;
@@ -59,6 +60,7 @@ public class VnfRollback {
 		this.volumeGroupName = volumeGroupName;
 		this.volumeGroupId = volumeGroupId;
 		this.requestType = requestType;
+		this.modelCustomizationUuid = modelCustomizationUuid;
 	}
 
 	public String getVnfId() {
@@ -122,14 +124,14 @@ public class VnfRollback {
 	public void setVolumeGroupHeatStackId(String volumeGroupHeatStackId) {
 		this.volumeGroupHeatStackId = volumeGroupHeatStackId;
 	}
-	
+
 	public String getBaseGroupHeatStackId() {
 		return this.baseGroupHeatStackId;
 	}
 	public void setBaseGroupHeatStackId(String baseGroupHeatStackId) {
 		this.baseGroupHeatStackId = baseGroupHeatStackId;
 	}
-	
+
 	public boolean isBase() {
 		return this.isBase;
 	}
@@ -142,11 +144,17 @@ public class VnfRollback {
 	public void setVfModuleStackId(String vfModuleStackId) {
 		this.vfModuleStackId = vfModuleStackId;
 	}
-
+	public String getModelCustomizationUuid() {
+		return this.modelCustomizationUuid;
+	}
+	public void setModelCustomizationUuid(String modelCustomizationUuid) {
+		this.modelCustomizationUuid = modelCustomizationUuid;
+	}
 	@Override
     public String toString() {
 		return "VnfRollback: cloud=" + cloudSiteId + ", tenant=" + tenantId +
 				", vnf=" + vnfId + ", tenantCreated=" + tenantCreated +
-				", vnfCreated=" + vnfCreated + ", requestType = " + requestType;
+				", vnfCreated=" + vnfCreated + ", requestType = " + requestType
+				+ ", modelCustomizationUuid=" + this.modelCustomizationUuid;
 	}
 }
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/CloudConfigInitializer.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/CloudConfigInitializer.java
index 3d9c23cc32..05d9a70a2d 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/CloudConfigInitializer.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/CloudConfigInitializer.java
@@ -27,6 +27,7 @@ import javax.servlet.ServletContextListener;
 import javax.servlet.annotation.WebListener;
 
 import org.openecomp.mso.cloud.CloudConfigFactory;
+import org.openecomp.mso.cloud.CloudConfigIdentityMapper;
 import org.openecomp.mso.logger.MessageEnum;
 import org.openecomp.mso.logger.MsoLogger;
 
@@ -73,6 +74,21 @@ public class CloudConfigInitializer implements ServletContextListener
 					initLogger.error(MessageEnum.RA_CONFIG_EXC, msoPropDecoded[0] + ". MSO Properties failed due to conversion error (in web.xml file)", "", "", MsoLogger.ErrorCode.DataError, "MSO Properties failed due to conversion error (in web.xml file)", ne);
 				}
 			}
+
+			// Second, obtain class name that will register all mappings
+			String msoMapperClassParam = event.getServletContext().getInitParameter("mso.cloud_config.mapper.class");
+			if (msoMapperClassParam != null) {
+			        Class<?> mapperClass = Class.forName(msoMapperClassParam);
+        			if (CloudConfigIdentityMapper.class.isAssignableFrom(mapperClass)) {
+        				((CloudConfigIdentityMapper)mapperClass.newInstance()).registerAllMappings();
+        				initLogger.info(MessageEnum.RA_CONFIG_LOAD,msoMapperClassParam+"(Openstack authentication mapper class)","","");
+        			} else {
+        			    initLogger.info(MessageEnum.RA_CONFIG_LOAD,msoMapperClassParam+"(Openstack authentication mapper class not an implementation of CloudConfigIdentityMapper)","","");
+        			}
+			} else {
+			    initLogger.info(MessageEnum.RA_CONFIG_LOAD,"Openstack authentication mapper class not specified in web.xml (ONLY core authentication mechanisms will be loaded)","","");
+			}
+
 		}
 		catch (Exception e) {
 			initLogger.error(MessageEnum.RA_CONFIG_EXC,  "Unknown. MSO Properties failed to initialize completely", "", "", MsoLogger.ErrorCode.AvailabilityError, "Exception - MSO Properties failed to initialize completely", e);
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
index 9309f05c40..99d5863819 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java
@@ -7,9 +7,9 @@
  * 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.
@@ -58,6 +58,7 @@ import com.woorea.openstack.base.client.OpenStackResponseException;
 import com.woorea.openstack.heat.Heat;
 import com.woorea.openstack.heat.model.CreateStackParam;
 import com.woorea.openstack.heat.model.Stack;
+import com.woorea.openstack.heat.model.Stack.Output;
 import com.woorea.openstack.heat.model.Stacks;
 import com.woorea.openstack.keystone.Keystone;
 import com.woorea.openstack.keystone.model.Access;
@@ -69,7 +70,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
 	private MsoPropertiesFactory msoPropertiesFactory;
 
 	private CloudConfigFactory cloudConfigFactory;
-	
+
     private static final String TOKEN_AUTH = "TokenAuth";
 
     private static final String QUERY_ALL_STACKS = "QueryAllStacks";
@@ -103,7 +104,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
     private int deletePollIntervalDefault = 15;
     private int deletePollTimeoutDefault = 300;
     private String msoPropID;
-    
+
     private static final ObjectMapper JSON_MAPPER = new ObjectMapper();
 
     /**
@@ -127,7 +128,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
 		}
         cloudConfig = cloudConfigFactory.getCloudConfig ();
         LOGGER.debug("MsoHeatUtils:" + msoPropID);
-        
+
     }
 
 
@@ -201,7 +202,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
                                  null,
                                  true);
     }
-    
+
     // This method has environment, files, heatfiles
     public StackInfo createStack (String cloudSiteId,
                                   String tenantId,
@@ -413,6 +414,11 @@ public class MsoHeatUtils extends MsoCommonUtils {
                 try {
                     heatStack = queryHeatStack (heatClient, canonicalName);
                     LOGGER.debug (heatStack.getStackStatus () + " (" + canonicalName + ")");
+                    try {
+                        LOGGER.debug("Current stack " + this.getOutputsAsStringBuilder(heatStack).toString());
+                    } catch (Exception e) {
+                        LOGGER.debug("an error occurred trying to print out the current outputs of the stack");
+                    }
 
                     if ("CREATE_IN_PROGRESS".equals (heatStack.getStackStatus ())) {
                         // Stack creation is still running.
@@ -443,7 +449,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
                 	if (!backout)
                 	{
                 		LOGGER.warn(MessageEnum.RA_CREATE_STACK_ERR, "Create Stack errored, stack deletion suppressed", "", "", MsoLogger.ErrorCode.BusinessProcesssError, "Exception in Create Stack, stack deletion suppressed");
-                	}	
+                	}
                 	else
                 	{
                 		try {
@@ -451,7 +457,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
                 			OpenStackRequest <Void> request = heatClient.getStacks ().deleteByName (canonicalName);
                 			executeAndRecordOpenstackRequest (request, msoProps);
                 			// this may be a waste of time - if we just got an exception trying to query the stack - we'll just
-                			// get another one, n'est-ce pas? 
+                			// get another one, n'est-ce pas?
                 			boolean deleted = false;
                 			while (!deleted) {
                 				try {
@@ -460,8 +466,8 @@ public class MsoHeatUtils extends MsoCommonUtils {
                     					LOGGER.debug(heatStack.getStackStatus());
                     					if ("DELETE_IN_PROGRESS".equals(heatStack.getStackStatus())) {
                     						if (deletePollTimeout <= 0) {
-                    							LOGGER.error (MessageEnum.RA_CREATE_STACK_TIMEOUT, cloudSiteId, tenantId, stackName, 
-                    									heatStack.getStackStatus (), "", "", MsoLogger.ErrorCode.AvailabilityError, 
+                    							LOGGER.error (MessageEnum.RA_CREATE_STACK_TIMEOUT, cloudSiteId, tenantId, stackName,
+                    									heatStack.getStackStatus (), "", "", MsoLogger.ErrorCode.AvailabilityError,
                     									"Rollback: DELETE stack timeout");
                     							break;
                     						} else {
@@ -486,11 +492,11 @@ public class MsoHeatUtils extends MsoCommonUtils {
                     					deleted = true;
                     					continue;
                 					}
-                					
+
                 				} catch (Exception e3) {
                 					// Just log this one. We will report the original exception.
                 					LOGGER.error (MessageEnum.RA_CREATE_STACK_ERR, "Create Stack: Nested exception rolling back stack: " + e3, "", "", MsoLogger.ErrorCode.BusinessProcesssError, "Create Stack: Nested exception rolling back stack on error on query");
-                					
+
                 				}
                 			}
                 		} catch (Exception e2) {
@@ -529,8 +535,8 @@ public class MsoHeatUtils extends MsoCommonUtils {
                 					LOGGER.debug(heatStack.getStackStatus() + " (" + canonicalName + ")");
                 					if ("DELETE_IN_PROGRESS".equals(heatStack.getStackStatus())) {
                 						if (deletePollTimeout <= 0) {
-                							LOGGER.error (MessageEnum.RA_CREATE_STACK_TIMEOUT, cloudSiteId, tenantId, stackName, 
-                									heatStack.getStackStatus (), "", "", MsoLogger.ErrorCode.AvailabilityError, 
+                							LOGGER.error (MessageEnum.RA_CREATE_STACK_TIMEOUT, cloudSiteId, tenantId, stackName,
+                									heatStack.getStackStatus (), "", "", MsoLogger.ErrorCode.AvailabilityError,
                 									"Rollback: DELETE stack timeout");
                 							break;
                 						} else {
@@ -561,13 +567,13 @@ public class MsoHeatUtils extends MsoCommonUtils {
                 					deleted = true;
                 					continue;
                 				}
-                				
+
                 			} catch (MsoException me2) {
                 				// We got an exception on the delete - don't throw this exception - throw the original - just log.
                 				LOGGER.debug("Exception thrown trying to delete " + canonicalName + " on a create->rollback: " + me2.getContextMessage());
                 				LOGGER.warn(MessageEnum.RA_CREATE_STACK_ERR, "Create Stack errored, then stack deletion FAILED - exception thrown", "", "", MsoLogger.ErrorCode.BusinessProcesssError, me2.getContextMessage());
                 			}
-                			
+
                 		} // end while !deleted
                 		StringBuilder errorContextMessage = null;
                 		if (createTimedOut) {
@@ -588,7 +594,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
                 		// shouldn't happen - but handle
                 		LOGGER.error (MessageEnum.RA_CREATE_STACK_ERR, "Create Stack: Nested exception rolling back stack: " + e2, "", "", MsoLogger.ErrorCode.BusinessProcesssError, "Exception in Create Stack: rolling back stack");
                 	}
-                } 
+                }
                 MsoOpenstackException me = new MsoOpenstackException(0, "", stackErrorStatusReason.toString());
                 me.addContext(CREATE_STACK);
                 alarmLogger.sendAlarm(HEAT_ERROR, MsoAlarmLogger.CRITICAL, me.getContextMessage());
@@ -949,10 +955,10 @@ public class MsoHeatUtils extends MsoCommonUtils {
         Access access = null;
         try {
         	Authentication credentials = cloudIdentity.getAuthentication ();
-                	
+
         	OpenStackRequest <Access> request = keystoneTenantClient.tokens ()
                        .authenticate (credentials).withTenantId (tenantId);
-        	
+
             access = executeAndRecordOpenstackRequest (request, msoProps);
         } catch (OpenStackResponseException e) {
             if (e.getStatus () == 401) {
@@ -984,10 +990,6 @@ public class MsoHeatUtils extends MsoCommonUtils {
             alarmLogger.sendAlarm ("MsoConfigurationError", MsoAlarmLogger.CRITICAL, error);
             throw new MsoAdapterException (error, e);
         }
-        // This is needed for testing in the MT cloud
-        if ("MT".equals (cloudId)) {
-            heatUrl = heatUrl.replace ("controller", "mtdnj02bh01wt.bvoip.labs.att.com");
-        }
 
         Heat heatClient = new Heat (heatUrl);
         heatClient.token (access.getToken ().getId ());
@@ -1119,7 +1121,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
     public static void heatCacheReset () {
         heatClientCache = new HashMap <String, HeatCacheEntry> ();
     }
-    
+
 	public Map<String, Object> queryStackForOutputs(String cloudSiteId,
 			String tenantId, String stackName) throws MsoException {
 		LOGGER.debug("MsoHeatUtils.queryStackForOutputs)");
@@ -1208,7 +1210,7 @@ public class MsoHeatUtils extends MsoCommonUtils {
 		}
 		return sb;
 	}
-	
+
 	private String convertNode(final JsonNode node) {
 		try {
 			final Object obj = JSON_MAPPER.treeToValue(node, Object.class);
@@ -1221,4 +1223,53 @@ public class MsoHeatUtils extends MsoCommonUtils {
 		}
 		return "[Error converting json to string]";
 	}
+
+
+    private StringBuilder getOutputsAsStringBuilder(Stack heatStack) {
+        // This should only be used as a utility to print out the stack outputs
+        // to the log
+        StringBuilder sb = new StringBuilder("");
+        if (heatStack == null) {
+            sb.append("(heatStack is null)");
+            return sb;
+        }
+        List<Output> outputList = heatStack.getOutputs();
+        if (outputList == null || outputList.isEmpty()) {
+            sb.append("(outputs is empty)");
+            return sb;
+        }
+        Map<String, Object> outputs = new HashMap<String,Object>();
+        for (Output outputItem : outputList) {
+            outputs.put(outputItem.getOutputKey(), outputItem.getOutputValue());
+        }
+        int counter = 0;
+        sb.append("OUTPUTS:");
+        for (String key : outputs.keySet()) {
+            sb.append("outputs[" + counter++ + "]: " + key + "=");
+            Object obj = outputs.get(key);
+            if (obj instanceof String) {
+                sb.append((String)obj);
+            } else if (obj instanceof JsonNode) {
+                sb.append(this.convertNode((JsonNode)obj));
+            } else if (obj instanceof java.util.LinkedHashMap) {
+                try {
+                    String str = JSON_MAPPER.writeValueAsString(obj);
+                    sb.append(str);
+                } catch (Exception e) {
+                    sb.append("(a LinkedHashMap value that would not convert nicely)");
+                }
+            } else {
+                String str = "";
+                try {
+                    str = (String) obj;
+                } catch (Exception e) {
+                    str = "(a value unable to be cast as a String)";
+                }
+                sb.append(str);
+            }
+            sb.append("; ");
+        }
+        sb.append("[END]");
+        return sb;
+    }
 }
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoKeystoneUtils.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoKeystoneUtils.java
index 8375b973c9..e387ec4023 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoKeystoneUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoKeystoneUtils.java
@@ -454,10 +454,6 @@ public class MsoKeystoneUtils extends MsoTenantUtils {
             LOGGER.error(MessageEnum.IDENTITY_SERVICE_NOT_FOUND, region, cloudIdentity.getId(), "Openstack", "", MsoLogger.ErrorCode.DataError, "Exception in findEndpointURL");
             throw new MsoAdapterException (error, e);
         }
-        // The following is needed for the MT lab.
-        if ("MT".equals (cloudSite.getId ())) {
-            adminUrl = adminUrl.replace ("controller", "mtdnj02bh01wt.bvoip.labs.att.com");
-        }
 
         // A new Keystone object is required for the new URL. Use the auth token from above.
         // Note: this doesn't go back to Openstack, it's just a local object.
@@ -685,4 +681,9 @@ public class MsoKeystoneUtils extends MsoTenantUtils {
     public static void adminCacheReset () {
         adminClientCache = new HashMap <String, KeystoneCacheEntry> ();
     }
+
+	@Override
+	public String getKeystoneUrl(String regionId, String msoPropID, CloudIdentity cloudIdentity) throws MsoException {
+		return cloudIdentity.getIdentityUrl();
+	}
 }
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoNeutronUtils.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoNeutronUtils.java
index f3281e3f1c..5c21913a66 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoNeutronUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoNeutronUtils.java
@@ -425,10 +425,6 @@ public class MsoNeutronUtils extends MsoCommonUtils
 			alarmLogger.sendAlarm("MsoConfigurationError", MsoAlarmLogger.CRITICAL, error);
 			throw new MsoAdapterException (error, e);
 		}
-		// This is needed for testing in the MT cloud
-		if (cloudId.equals("MT")) {
-            neutronUrl = neutronUrl.replace("controller", "mtdnj02bh01wt.bvoip.labs.att.com");
-        }
 
 		Quantum neutronClient = new Quantum(neutronUrl);
 		neutronClient.token(access.getToken().getId());
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoTenantUtils.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoTenantUtils.java
index 41104707cb..5af535f2b5 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoTenantUtils.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoTenantUtils.java
@@ -28,6 +28,7 @@ import java.util.Map;
 
 import org.openecomp.mso.cloud.CloudConfig;
 import org.openecomp.mso.cloud.CloudConfigFactory;
+import org.openecomp.mso.cloud.CloudIdentity;
 import org.openecomp.mso.logger.MsoAlarmLogger;
 import org.openecomp.mso.logger.MsoLogger;
 import org.openecomp.mso.logger.MessageEnum;
@@ -75,5 +76,8 @@ public abstract class MsoTenantUtils extends MsoCommonUtils {
 
     public abstract boolean deleteTenant (String tenantId, String cloudSiteId) 
     		throws MsoException;
-    
+
+    public abstract String getKeystoneUrl (String regionId, String msoPropID, CloudIdentity cloudIdentity)
+    		throws MsoException;
+
 }
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
index 6fd7a6364a..2a5b3ad994 100644
--- 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
@@ -20,6 +20,7 @@
 
 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;
@@ -36,7 +37,7 @@ public class MsoTenantUtilsFactory {
 	protected CloudConfig cloudConfig;
 	protected MsoJavaProperties msoProps = null;
 	private String msoPropID;
-
+	
 	public MsoTenantUtilsFactory (String msoPropID) {
 		this.msoPropID = msoPropID;
 	}
@@ -48,10 +49,20 @@ public class MsoTenantUtilsFactory {
 		cloudConfig = cloudConfigFactory.getCloudConfig();
 		CloudSite cloudSite = cloudConfig.getCloudSite (cloudSiteId);
 
+		return getTenantUtilsByServerType(cloudSite.getIdentityService().getIdentityServerType().toString());
+	}
+
+	public MsoTenantUtils getTenantUtilsByServerType(String serverType) {
+
 		MsoTenantUtils tenantU = null;
-		if (cloudSite.getIdentityService().getIdentityServerType() == CloudIdentity.IdentityServerType.KEYSTONE)
-		{
+		if (CloudIdentity.IdentityServerType.KEYSTONE.equals(serverType)) {
 			tenantU = new MsoKeystoneUtils (msoPropID);
+		} else {
+			try {
+				tenantU = CloudIdentity.IdentityServerType.valueOf(serverType).getMsoTenantUtilsClass().getConstructor(String.class).newInstance(msoPropID);
+			} catch (InvocationTargetException | InstantiationException | NoSuchMethodException | IllegalAccessException e) {
+				throw new RuntimeException("Could not instantiate an MsoTenantUtils class for " + serverType, e);
+			}
 		}
 		return tenantU;
 	}