1 files changed, 18 insertions, 4 deletions

diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenUtil.java b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenUtil.java
index 623f958ceb..494428f7a0 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenUtil.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-api/src/main/java/org/openecomp/core/zusammen/api/ZusammenUtil.java
@@ -12,21 +12,35 @@ import org.openecomp.types.ElementPropertyName;
 
 public class ZusammenUtil {
 
+  private ZusammenUtil() {
+    throw new IllegalStateException("Utility class");
+  }
+
   public static SessionContext createSessionContext() {
     org.openecomp.sdc.common.session.SessionContext asdcSessionContext =
         SessionContextProviderFactory.getInstance().createInterface().get();
 
+    return createSessionContext(asdcSessionContext.getUser().getUserId(), asdcSessionContext
+        .getTenant());
+  }
+
+  private static SessionContext createSessionContext(String user, String tenant) {
     SessionContext sessionContext = new SessionContext();
-    sessionContext.setUser(new UserInfo(asdcSessionContext.getUser().getUserId()));
-    sessionContext.setTenant(asdcSessionContext.getTenant());
+    sessionContext.setUser(new UserInfo(user));
+    sessionContext.setTenant(tenant);
     return sessionContext;
   }
 
   public static ZusammenElement buildStructuralElement(ElementType elementType, Action action) {
+    return buildStructuralElement(elementType.name(), action);
+  }
+
+
+  public static ZusammenElement buildStructuralElement(String elementType, Action action) {
     ZusammenElement element = buildElement(null, action);
     Info info = new Info();
-    info.setName(elementType.name());
-    info.addProperty(ElementPropertyName.elementType.name(), elementType.name());
+    info.setName(elementType);
+    info.addProperty(ElementPropertyName.elementType.name(), elementType);
     element.setInfo(info);
     return element;
   }