[DCAE-15] Changes related to version 1.1

See Jira for details Change-Id: I392c4faf0de70d7a810f86eaafb7ed3ab4613386 Signed-off-by: Carsten Lund <lund@research.att.com>
author: Carsten Lund <lund@research.att.com> 2017-04-16 14:00:29 +0000
committer: Carsten Lund <lund@research.att.com> 2017-04-16 14:01:24 +0000
commit: 3ec1de0d0dc87b0123dd0ec47b3c9f40f22bad24 (patch)
tree: 033b72ee193ffa31e701f8fc14fa0968428d2b8f
parent: a3e9b9cea143816780eed14896ca5843402ee371 (diff)
288 files changed, 5353 insertions, 850 deletions
diff --git a/ncomp-sirius-manager-agent-model/.classpath b/ncomp-sirius-manager-agent-model/.classpath
index 69b19c6..d86c4cf 100644
--- a/ncomp-sirius-manager-agent-model/.classpath
+++ b/ncomp-sirius-manager-agent-model/.classpath
@@ -1,17 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/xcore">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/xcore">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/xcore-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/xcore-gen"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/ncomp-sirius-manager-agent-model/.project b/ncomp-sirius-manager-agent-model/.project
index 121b478..fa18343 100644
--- a/ncomp-sirius-manager-agent-model/.project
+++ b/ncomp-sirius-manager-agent-model/.project
@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
diff --git a/ncomp-sirius-manager-agent-model/.settings/org.eclipse.core.resources.prefs b/ncomp-sirius-manager-agent-model/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..447ff97
--- /dev/null
+++ b/ncomp-sirius-manager-agent-model/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/xcore=UTF-8
+encoding//src/main/xcore-gen=UTF-8
+encoding/<project>=UTF-8
diff --git a/ncomp-sirius-manager-agent-model/.settings/org.eclipse.jdt.core.prefs b/ncomp-sirius-manager-agent-model/.settings/org.eclipse.jdt.core.prefs
index 4ede96d..ec4300d 100644
--- a/ncomp-sirius-manager-agent-model/.settings/org.eclipse.jdt.core.prefs
+++ b/ncomp-sirius-manager-agent-model/.settings/org.eclipse.jdt.core.prefs
@@ -1,2 +1,5 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/ncomp-sirius-manager-agent-model/META-INF/MANIFEST.MF b/ncomp-sirius-manager-agent-model/META-INF/MANIFEST.MF
index d96a23a..17311ce 100644
--- a/ncomp-sirius-manager-agent-model/META-INF/MANIFEST.MF
+++ b/ncomp-sirius-manager-agent-model/META-INF/MANIFEST.MF
@@ -17,8 +17,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.emf.ecore.xcore.lib,
- ncomp-core-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-sirius-manager-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-core-types;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0"
+ ncomp-sirius-manager-model;visibility:=reexport,
+ ncomp-core-model;visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdCpu.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdCpu.java
index 3488e9a..797d85c 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdCpu.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdCpu.java
@@ -26,7 +26,6 @@ package org.openecomp.ncomp.sirius.manager.agent.collectd;
 import org.openecomp.ncomp.core.NamedEntity;
 
 import org.openecomp.ncomp.core.alerts.AlertContainer;
-
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
 
 /**
@@ -36,13 +35,13 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdCpu#getIdle <em>Idle</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdCpu#getWait <em>Wait</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdCpu#getUser <em>User</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdCpu#getSystem <em>System</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage#getCollectdCpu()
  * @model
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdDisk.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdDisk.java
index 3fd4209..f49ce07 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdDisk.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdDisk.java
@@ -26,7 +26,6 @@ package org.openecomp.ncomp.sirius.manager.agent.collectd;
 import org.openecomp.ncomp.core.NamedEntity;
 
 import org.openecomp.ncomp.core.alerts.AlertContainer;
-
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
 
 /**
@@ -36,6 +35,7 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdDisk#getDisk_merged_read <em>Disk merged read</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdDisk#getDisk_merged_write <em>Disk merged write</em>}</li>
@@ -46,7 +46,6 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdDisk#getDisk_time_read <em>Disk time read</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdDisk#getDisk_time_write <em>Disk time write</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage#getCollectdDisk()
  * @model
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdFileSystem.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdFileSystem.java
index 2fbf354..b28c6f2 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdFileSystem.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdFileSystem.java
@@ -26,7 +26,6 @@ package org.openecomp.ncomp.sirius.manager.agent.collectd;
 import org.openecomp.ncomp.core.NamedEntity;
 
 import org.openecomp.ncomp.core.alerts.AlertContainer;
-
 import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
 
 /**
@@ -36,11 +35,11 @@ import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdFileSystem#getUsed <em>Used</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdFileSystem#getFree <em>Free</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage#getCollectdFileSystem()
  * @model
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdInterface.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdInterface.java
index 9112db2..98e3f94 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdInterface.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdInterface.java
@@ -26,7 +26,6 @@ package org.openecomp.ncomp.sirius.manager.agent.collectd;
 import org.openecomp.ncomp.core.NamedEntity;
 
 import org.openecomp.ncomp.core.alerts.AlertContainer;
-
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
 
 /**
@@ -36,6 +35,7 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdInterface#getIf_errors_rx <em>If errors rx</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdInterface#getIf_errors_tx <em>If errors tx</em>}</li>
@@ -44,7 +44,6 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdInterface#getIf_packets_rx <em>If packets rx</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdInterface#getIf_packets_tx <em>If packets tx</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage#getCollectdInterface()
  * @model
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdKvmDisk.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdKvmDisk.java
index d47f7f4..9e647ec 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdKvmDisk.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdKvmDisk.java
@@ -26,7 +26,6 @@ package org.openecomp.ncomp.sirius.manager.agent.collectd;
 import org.openecomp.ncomp.core.NamedEntity;
 
 import org.openecomp.ncomp.core.alerts.AlertContainer;
-
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
 
 /**
@@ -36,13 +35,13 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmDisk#getDisk_octets_read <em>Disk octets read</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmDisk#getDisk_octets_write <em>Disk octets write</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmDisk#getDisk_ops_read <em>Disk ops read</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmDisk#getDisk_ops_write <em>Disk ops write</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage#getCollectdKvmDisk()
  * @model
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdKvmInstance.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdKvmInstance.java
index e08a93f..2aa1998 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdKvmInstance.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdKvmInstance.java
@@ -26,9 +26,7 @@ package org.openecomp.ncomp.sirius.manager.agent.collectd;
 import org.openecomp.ncomp.core.NamedEntity;
 
 import org.openecomp.ncomp.core.alerts.AlertContainer;
-
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
-
 import org.eclipse.emf.common.util.EList;
 
 /**
@@ -38,12 +36,12 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmInstance#getVirt_cpu_total <em>Virt cpu total</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmInstance#getDisks <em>Disks</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmInstance#getInterfaces <em>Interfaces</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage#getCollectdKvmInstance()
  * @model
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdKvmInterface.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdKvmInterface.java
index 1f955ae..a8763de 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdKvmInterface.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdKvmInterface.java
@@ -26,7 +26,6 @@ package org.openecomp.ncomp.sirius.manager.agent.collectd;
 import org.openecomp.ncomp.core.NamedEntity;
 
 import org.openecomp.ncomp.core.alerts.AlertContainer;
-
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
 
 /**
@@ -36,6 +35,7 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmInterface#getIf_errors_rx <em>If errors rx</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmInterface#getIf_errors_tx <em>If errors tx</em>}</li>
@@ -46,7 +46,6 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmInterface#getIf_packets_rx <em>If packets rx</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmInterface#getIf_packets_tx <em>If packets tx</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage#getCollectdKvmInterface()
  * @model
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdMemory.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdMemory.java
index f980ace..32a5d92 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdMemory.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdMemory.java
@@ -23,9 +23,8 @@
  */
 package org.openecomp.ncomp.sirius.manager.agent.collectd;
 
-import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
-
 import org.eclipse.emf.ecore.EObject;
+import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,13 +33,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdMemory#getBuffered <em>Buffered</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdMemory#getCached <em>Cached</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdMemory#getFree <em>Free</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdMemory#getUsed <em>Used</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage#getCollectdMemory()
  * @model
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdPackage.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdPackage.java
index 4518a91..78b92f0 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdPackage.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdPackage.java
@@ -42,6 +42,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-sirius-manager-agent-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.sirius.manager.agent'"
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdProcesses.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdProcesses.java
index 30f2e04..09b689b 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdProcesses.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdProcesses.java
@@ -23,11 +23,10 @@
  */
 package org.openecomp.ncomp.sirius.manager.agent.collectd;
 
+import org.eclipse.emf.ecore.EObject;
 import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
 
-import org.eclipse.emf.ecore.EObject;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Processes</b></em>'.
@@ -35,6 +34,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdProcesses#getFork_rate <em>Fork rate</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdProcesses#getBlocked <em>Blocked</em>}</li>
@@ -44,7 +44,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdProcesses#getStopped <em>Stopped</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdProcesses#getZombies <em>Zombies</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage#getCollectdProcesses()
  * @model
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdServer.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdServer.java
index fdba749..dc7ac20 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdServer.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdServer.java
@@ -26,10 +26,8 @@ package org.openecomp.ncomp.sirius.manager.agent.collectd;
 import org.openecomp.ncomp.core.NamedEntity;
 
 import org.openecomp.ncomp.core.alerts.AlertContainer;
-
 import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
-
 import org.eclipse.emf.common.util.EList;
 
 /**
@@ -39,6 +37,7 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdServer#getLoad_shortterm <em>Load shortterm</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdServer#getLoad_midterm <em>Load midterm</em>}</li>
@@ -55,7 +54,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdServer#getInterfaces <em>Interfaces</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdServer#getInstances <em>Instances</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage#getCollectdServer()
  * @model
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdSwap.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdSwap.java
index c865364..bd141b5 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdSwap.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdSwap.java
@@ -23,9 +23,8 @@
  */
 package org.openecomp.ncomp.sirius.manager.agent.collectd;
 
-import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
-
 import org.eclipse.emf.ecore.EObject;
+import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,12 +33,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdSwap#getCached <em>Cached</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdSwap#getFree <em>Free</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdSwap#getUsed <em>Used</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage#getCollectdSwap()
  * @model
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdVmem.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdVmem.java
index e51d6b3..cca7ad2 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdVmem.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/CollectdVmem.java
@@ -23,11 +23,10 @@
  */
 package org.openecomp.ncomp.sirius.manager.agent.collectd;
 
+import org.eclipse.emf.ecore.EObject;
 import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
 
-import org.eclipse.emf.ecore.EObject;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Vmem</b></em>'.
@@ -35,6 +34,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdVmem#getActive_anon <em>Active anon</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdVmem#getActive_file <em>Active file</em>}</li>
@@ -72,7 +72,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdVmem#getFaults_minor <em>Faults minor</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdVmem#getFaults_major <em>Faults major</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage#getCollectdVmem()
  * @model
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdCpuImpl.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdCpuImpl.java
index 5997e29..3964f08 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdCpuImpl.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdCpuImpl.java
@@ -29,9 +29,7 @@ import org.openecomp.ncomp.core.alerts.AlertingTemplate;
 import org.openecomp.ncomp.core.alerts.AlertsPackage;
 
 import org.openecomp.ncomp.core.impl.NamedEntityImpl;
-
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
-
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdCpu;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage;
 
@@ -56,6 +54,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdCpuImpl#getAlerts <em>Alerts</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdCpuImpl#getAlertingTemplate <em>Alerting Template</em>}</li>
@@ -64,7 +63,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdCpuImpl#getUser <em>User</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdCpuImpl#getSystem <em>System</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdDiskImpl.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdDiskImpl.java
index bdeb637..ec011b2 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdDiskImpl.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdDiskImpl.java
@@ -29,9 +29,7 @@ import org.openecomp.ncomp.core.alerts.AlertingTemplate;
 import org.openecomp.ncomp.core.alerts.AlertsPackage;
 
 import org.openecomp.ncomp.core.impl.NamedEntityImpl;
-
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
-
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdDisk;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage;
 
@@ -56,6 +54,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdDiskImpl#getAlerts <em>Alerts</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdDiskImpl#getAlertingTemplate <em>Alerting Template</em>}</li>
@@ -68,7 +67,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdDiskImpl#getDisk_time_read <em>Disk time read</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdDiskImpl#getDisk_time_write <em>Disk time write</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdFileSystemImpl.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdFileSystemImpl.java
index 3f7d6a4..fc83436 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdFileSystemImpl.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdFileSystemImpl.java
@@ -29,9 +29,7 @@ import org.openecomp.ncomp.core.alerts.AlertingTemplate;
 import org.openecomp.ncomp.core.alerts.AlertsPackage;
 
 import org.openecomp.ncomp.core.impl.NamedEntityImpl;
-
 import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
-
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdFileSystem;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage;
 
@@ -56,13 +54,13 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdFileSystemImpl#getAlerts <em>Alerts</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdFileSystemImpl#getAlertingTemplate <em>Alerting Template</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdFileSystemImpl#getUsed <em>Used</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdFileSystemImpl#getFree <em>Free</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdInterfaceImpl.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdInterfaceImpl.java
index 8b26b29..a161c22 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdInterfaceImpl.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdInterfaceImpl.java
@@ -29,9 +29,7 @@ import org.openecomp.ncomp.core.alerts.AlertingTemplate;
 import org.openecomp.ncomp.core.alerts.AlertsPackage;
 
 import org.openecomp.ncomp.core.impl.NamedEntityImpl;
-
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
-
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdInterface;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage;
 
@@ -56,6 +54,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdInterfaceImpl#getAlerts <em>Alerts</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdInterfaceImpl#getAlertingTemplate <em>Alerting Template</em>}</li>
@@ -66,7 +65,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdInterfaceImpl#getIf_packets_rx <em>If packets rx</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdInterfaceImpl#getIf_packets_tx <em>If packets tx</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdKvmDiskImpl.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdKvmDiskImpl.java
index 954a91e..30f0090 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdKvmDiskImpl.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdKvmDiskImpl.java
@@ -29,9 +29,7 @@ import org.openecomp.ncomp.core.alerts.AlertingTemplate;
 import org.openecomp.ncomp.core.alerts.AlertsPackage;
 
 import org.openecomp.ncomp.core.impl.NamedEntityImpl;
-
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
-
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmDisk;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage;
 
@@ -56,6 +54,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdKvmDiskImpl#getAlerts <em>Alerts</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdKvmDiskImpl#getAlertingTemplate <em>Alerting Template</em>}</li>
@@ -64,7 +63,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdKvmDiskImpl#getDisk_ops_read <em>Disk ops read</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdKvmDiskImpl#getDisk_ops_write <em>Disk ops write</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdKvmInstanceImpl.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdKvmInstanceImpl.java
index 997c6aa..dc4dc4f 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdKvmInstanceImpl.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdKvmInstanceImpl.java
@@ -29,9 +29,7 @@ import org.openecomp.ncomp.core.alerts.AlertingTemplate;
 import org.openecomp.ncomp.core.alerts.AlertsPackage;
 
 import org.openecomp.ncomp.core.impl.NamedEntityImpl;
-
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
-
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmDisk;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmInstance;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmInterface;
@@ -58,6 +56,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdKvmInstanceImpl#getAlerts <em>Alerts</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdKvmInstanceImpl#getAlertingTemplate <em>Alerting Template</em>}</li>
@@ -65,7 +64,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdKvmInstanceImpl#getDisks <em>Disks</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdKvmInstanceImpl#getInterfaces <em>Interfaces</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdKvmInterfaceImpl.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdKvmInterfaceImpl.java
index b879890..c2e4316 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdKvmInterfaceImpl.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdKvmInterfaceImpl.java
@@ -29,9 +29,7 @@ import org.openecomp.ncomp.core.alerts.AlertingTemplate;
 import org.openecomp.ncomp.core.alerts.AlertsPackage;
 
 import org.openecomp.ncomp.core.impl.NamedEntityImpl;
-
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
-
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdKvmInterface;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage;
 
@@ -56,6 +54,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdKvmInterfaceImpl#getAlerts <em>Alerts</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdKvmInterfaceImpl#getAlertingTemplate <em>Alerting Template</em>}</li>
@@ -68,7 +67,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdKvmInterfaceImpl#getIf_packets_rx <em>If packets rx</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdKvmInterfaceImpl#getIf_packets_tx <em>If packets tx</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdMemoryImpl.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdMemoryImpl.java
index 7813084..e0af845 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdMemoryImpl.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdMemoryImpl.java
@@ -23,8 +23,6 @@
  */
 package org.openecomp.ncomp.sirius.manager.agent.collectd.impl;
 
-import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
-
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdMemory;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage;
 
@@ -34,6 +32,7 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
 
 /**
  * <!-- begin-user-doc -->
@@ -41,13 +40,13 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdMemoryImpl#getBuffered <em>Buffered</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdMemoryImpl#getCached <em>Cached</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdMemoryImpl#getFree <em>Free</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdMemoryImpl#getUsed <em>Used</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdProcessesImpl.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdProcessesImpl.java
index f3ee4e9..e47487e 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdProcessesImpl.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdProcessesImpl.java
@@ -23,9 +23,6 @@
  */
 package org.openecomp.ncomp.sirius.manager.agent.collectd.impl;
 
-import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
-import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
-
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdProcesses;
 
@@ -35,6 +32,8 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
+import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
 
 /**
  * <!-- begin-user-doc -->
@@ -42,6 +41,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdProcessesImpl#getFork_rate <em>Fork rate</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdProcessesImpl#getBlocked <em>Blocked</em>}</li>
@@ -51,7 +51,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdProcessesImpl#getStopped <em>Stopped</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdProcessesImpl#getZombies <em>Zombies</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdServerImpl.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdServerImpl.java
index c2e6385..54dd9f8 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdServerImpl.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdServerImpl.java
@@ -29,10 +29,8 @@ import org.openecomp.ncomp.core.alerts.AlertingTemplate;
 import org.openecomp.ncomp.core.alerts.AlertsPackage;
 
 import org.openecomp.ncomp.core.impl.NamedEntityImpl;
-
 import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
 import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
-
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdCpu;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdDisk;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdFileSystem;
@@ -66,6 +64,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdServerImpl#getAlerts <em>Alerts</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdServerImpl#getAlertingTemplate <em>Alerting Template</em>}</li>
@@ -84,7 +83,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdServerImpl#getInterfaces <em>Interfaces</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdServerImpl#getInstances <em>Instances</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdSwapImpl.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdSwapImpl.java
index dee03a4..526b845 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdSwapImpl.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdSwapImpl.java
@@ -23,8 +23,6 @@
  */
 package org.openecomp.ncomp.sirius.manager.agent.collectd.impl;
 
-import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
-
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdSwap;
 
@@ -34,6 +32,7 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
 
 /**
  * <!-- begin-user-doc -->
@@ -41,12 +40,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdSwapImpl#getCached <em>Cached</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdSwapImpl#getFree <em>Free</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdSwapImpl#getUsed <em>Used</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdVmemImpl.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdVmemImpl.java
index dd65dd6..252126c 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdVmemImpl.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/impl/CollectdVmemImpl.java
@@ -23,9 +23,6 @@
  */
 package org.openecomp.ncomp.sirius.manager.agent.collectd.impl;
 
-import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
-import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
-
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage;
 import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdVmem;
 
@@ -35,6 +32,8 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute;
+import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute;
 
 /**
  * <!-- begin-user-doc -->
@@ -42,6 +41,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdVmemImpl#getActive_anon <em>Active anon</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdVmemImpl#getActive_file <em>Active file</em>}</li>
@@ -79,7 +79,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdVmemImpl#getFaults_minor <em>Faults minor</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.collectd.impl.CollectdVmemImpl#getFaults_major <em>Faults major</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/util/CollectdSwitch.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/util/CollectdSwitch.java
index d9aaac2..68889b3 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/util/CollectdSwitch.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/collectd/util/CollectdSwitch.java
@@ -72,7 +72,7 @@ public class CollectdSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/monitoring/MonitoringPackage.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/monitoring/MonitoringPackage.java
index 6d8c813..38193fd 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/monitoring/MonitoringPackage.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/monitoring/MonitoringPackage.java
@@ -40,6 +40,24 @@ import org.eclipse.emf.ecore.EPackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.ncomp.sirius.manager.agent.monitoring.MonitoringFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-sirius-manager-agent-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.sirius.manager.agent'"
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/monitoring/impl/SiriusManagerAgentServerImpl.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/monitoring/impl/SiriusManagerAgentServerImpl.java
index 3ab36c1..339d6f0 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/monitoring/impl/SiriusManagerAgentServerImpl.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/monitoring/impl/SiriusManagerAgentServerImpl.java
@@ -54,7 +54,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.json.JSONObject;
 
 /**
@@ -63,11 +62,11 @@ import org.json.JSONObject;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.monitoring.impl.SiriusManagerAgentServerImpl#getConfiguration <em>Configuration</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.agent.monitoring.impl.SiriusManagerAgentServerImpl#getComponent <em>Component</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/monitoring/util/MonitoringSwitch.java b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/monitoring/util/MonitoringSwitch.java
index f6f2dc2..93ce423 100644
--- a/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/monitoring/util/MonitoringSwitch.java
+++ b/ncomp-sirius-manager-agent-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/agent/monitoring/util/MonitoringSwitch.java
@@ -72,7 +72,7 @@ public class MonitoringSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/ncomp-sirius-manager-agent-server/.classpath b/ncomp-sirius-manager-agent-server/.classpath
index d2d34b3..0d82fb7 100644
--- a/ncomp-sirius-manager-agent-server/.classpath
+++ b/ncomp-sirius-manager-agent-server/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="config"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -21,7 +20,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/ncomp-sirius-manager-agent-server/META-INF/MANIFEST.MF b/ncomp-sirius-manager-agent-server/META-INF/MANIFEST.MF
index 1f28bfc..d650e83 100644
--- a/ncomp-sirius-manager-agent-server/META-INF/MANIFEST.MF
+++ b/ncomp-sirius-manager-agent-server/META-INF/MANIFEST.MF
@@ -5,11 +5,3 @@ Bundle-SymbolicName: ncomp-sirius-manager-agent-server
 Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.ncomp.sirius.manager.agent.server.tools,
   org.openecomp.ncomp.sirius.manager.agent.servers.monitoring
-Require-Bundle: ncomp-core-types,
- ncomp-sirius-manager-model,
- ncomp-sirius-manager-server,
- ncomp-sirius-manager-console,
- ncomp-sirius-manager-generator,
- ncomp-utils-java;bundle-version="0.1.0",
- ncomp-sirius-manager-agent-model;bundle-version="0.1.0",
- ncomp-utils-java-extra;bundle-version="0.1.0"
diff --git a/ncomp-sirius-manager-agent-server/src/assembly/assemble_zip.xml b/ncomp-sirius-manager-agent-server/src/assembly/assemble_zip.xml
index 4229587..76dfc18 100644
--- a/ncomp-sirius-manager-agent-server/src/assembly/assemble_zip.xml
+++ b/ncomp-sirius-manager-agent-server/src/assembly/assemble_zip.xml
@@ -56,6 +56,10 @@
 			<directory>src/main/server/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
 		</fileSet>
+		<fileSet>
+			<directory>src/assembly/swm</directory>
+			<outputDirectory>swm</outputDirectory>
+		</fileSet>
 	</fileSets>
 
 </assembly>
diff --git a/ncomp-sirius-manager-agent-server/src/main/java/org/openecomp/ncomp/sirius/manager/agent/server/tools/Generator.java b/ncomp-sirius-manager-agent-server/src/main/java/org/openecomp/ncomp/sirius/manager/agent/server/tools/Generator.java
index f09b110..1ece2a6 100644
--- a/ncomp-sirius-manager-agent-server/src/main/java/org/openecomp/ncomp/sirius/manager/agent/server/tools/Generator.java
+++ b/ncomp-sirius-manager-agent-server/src/main/java/org/openecomp/ncomp/sirius/manager/agent/server/tools/Generator.java
@@ -19,48 +19,57 @@
  * ============LICENSE_END============================================
  */
 	
-package org.openecomp.ncomp.sirius.manager.agent.server.tools;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.openecomp.ncomp.sirius.manager.controllermodel.ControllerModel;
-import org.openecomp.ncomp.sirius.manager.controllermodel.ControllermodelFactory;
-import org.openecomp.ncomp.sirius.manager.generator.ControllerGenerator;
-import org.openecomp.ncomp.gwt.siriusportal.model.*;
-import org.openecomp.ncomp.sirius.manager.agent.monitoring.MonitoringFactory;
-
-
-public class Generator {
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		@SuppressWarnings("unused")
-		MonitoringFactory f = MonitoringFactory.eINSTANCE;
-		EObject o = MonitoringFactory.eINSTANCE.createSiriusManagerAgentServer();
-		EPackage p = o.eClass().getEPackage();
-		String dir = p.getNsURI().replace(p.getNsPrefix(),"") + "servers." + p.getNsPrefix();
-		dir= "src/main/sirius-gen/" + dir.replace('.', '/');
-		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();
-		m.setTemplateDirectory("../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
-		m.setPrefix("Agent");
-		m.setPluginName(p.getNsURI());
-		m.setName("SiriusManagerAgentServer");
-		m.setTitle("SiriusManagerAgentServer");
-		ControllerGenerator g = new ControllerGenerator(o,m); 
-		g.setEnableIRequestHandler(false);
-		g.setEnableISiriusPlugin(true);
-		EObject gui = ModelFactory.eINSTANCE.createGuiClientApi();
-		g.addObject("gui",gui,m);
-		EObject e = org.openecomp.ncomp.sirius.manager.server.ServerFactory.eINSTANCE.createSouthBoundApi();
-		g.addObject("south",e,m);
-		//g.addFactory("org.openecomp.ncomp.sirius.servers.openstack.OsOpenstackFactory");
-		//g.enableDrools();
-		g.generate(dir);
-		g.generateScripts("src/main/server-gen/bin","sirius-manager-agent-server"); 
-	}
-
-
-}
+package org.openecomp.ncomp.sirius.manager.agent.server.tools;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.openecomp.utils.YamlToJava;
+import org.openecomp.ncomp.sirius.manager.controllermodel.ControllerModel;
+import org.openecomp.ncomp.sirius.manager.controllermodel.ControllermodelFactory;
+import org.openecomp.ncomp.sirius.manager.generator.ControllerGenerator;
+import org.openecomp.ncomp.gwt.siriusportal.model.*;
+import org.openecomp.ncomp.sirius.manager.agent.monitoring.MonitoringFactory;
+
+
+public class Generator {
+
+	/**
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		@SuppressWarnings("unused")
+		MonitoringFactory f = MonitoringFactory.eINSTANCE;
+		EObject o = MonitoringFactory.eINSTANCE.createSiriusManagerAgentServer();
+		EPackage p = o.eClass().getEPackage();
+		String dir = p.getNsURI().replace(p.getNsPrefix(),"") + "servers." + p.getNsPrefix();
+		dir= "src/main/sirius-gen/" + dir.replace('.', '/');
+		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();
+		m.setTemplateDirectory("../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
+		m.setPrefix("Agent");
+		m.setPluginName(p.getNsURI());
+		m.setName("SiriusManagerAgentServer");
+		m.setTitle("SiriusManagerAgentServer");
+		ControllerGenerator g = new ControllerGenerator(o,m); 
+		g.setVersion("ONAP-R2");
+		g.setEnableIRequestHandler(false);
+		g.setEnableISiriusPlugin(true);
+		EObject gui = ModelFactory.eINSTANCE.createGuiClientApi();
+		g.addObject("gui",gui,m);
+		EObject e = org.openecomp.ncomp.sirius.manager.server.ServerFactory.eINSTANCE.createSouthBoundApi();
+		g.addObject("south",e,m);
+		//g.addFactory("org.openecomp.ncomp.sirius.servers.openstack.OsOpenstackFactory");
+		//g.enableDrools();
+		g.generate(dir);
+		g.generateScripts("src/main/server-gen/bin","sirius-manager-agent-server"); 
+		String pName = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".logging";
+		YamlToJava.convert("src/main/sirius-gen/SiriusManagerAgentServer.yaml", dir + "/logging", pName);
+		String pName1 = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".south.logging";
+		YamlToJava.convert("src/main/sirius-gen/SouthBoundApi.yaml", dir + "/south/logging", pName1);
+		String pName2 = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".gui.logging";
+		YamlToJava.convert("src/main/sirius-gen/GuiClientApi.yaml", dir + "/gui/logging", pName2);
+
+	}
+
+
+}
diff --git a/ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller b/ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller
index 86a0713..b6708e7 100644
--- a/ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller
+++ b/ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller
@@ -63,22 +63,24 @@ CMD=$1
 shift
 
 check_status
+
+CP=$(find $_DIR/lib/*/* -name \*.jar 2>/dev/null | xargs -I X printf ":%s" X)
+
+JVMARGS=$(grep 'server.jvmargs' $_DIR/config/monitoring.properties | sed -e 's/.*=//')
+
 case $CMD in 
   status)
     echo $_STATUS
     exit 0
     ;;
   console)
-    CP=$(find $_DIR/lib -name \*.jar | xargs -I X printf ":%s" X)
-    $GROOVY_HOME/bin/groovysh -cp $_DIR/config:$_DIR/lib:$CP 
+    $GROOVY_HOME/bin/groovysh -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP 
     ;;
   run)
-    CP=$(find $_DIR/lib -name \*.jar | xargs -I X printf ":%s" X)
-    $JAVA_HOME/bin/java -cp $_DIR/config:$_DIR/lib:$CP "$@"
+    $JAVA_HOME/bin/java -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@"
     ;;
   groovy)
-    CP=$(find $_DIR/lib -name \*.jar | xargs -I X printf ":%s" X)
-    $GROOVY_HOME/bin/groovy -cp $_DIR/config:$_DIR/lib:$CP "$@"
+    $GROOVY_HOME/bin/groovy -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@"
     ;;
    start)
     if [ "$_RUNNING" = "1" ]; then
@@ -90,9 +92,8 @@ case $CMD in
     if [ -e $_DIR/logs/$PNAME.err.1 ]; then mv $_DIR/logs/$PNAME.err.1 $_DIR/logs/$PNAME.err.2; fi
     if [ -e $_DIR/logs/$PNAME.out ]; then mv $_DIR/logs/$PNAME.out $_DIR/logs/$PNAME.out.1; fi
     if [ -e $_DIR/logs/$PNAME.err ]; then mv $_DIR/logs/$PNAME.err $_DIR/logs/$PNAME.err.1; fi
-    CP=$(find $_DIR/lib -name \*.jar | xargs -I X printf ":%s" X)
 
-    nohup $JAVA_HOME/bin/java -cp $_DIR/config:$_DIR/lib:$CP "$@" $CLASS > $_DIR/logs/$PNAME.out 2> $_DIR/logs/$PNAME.err  &
+    nohup $JAVA_HOME/bin/java $JVMARGS -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" $CLASS >> $_DIR/logs/$PNAME.out 2>> $_DIR/logs/$PNAME.err  &
 
     _PID=$!
     echo $_PID > $_PIDFILE
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/GuiClientApi.yaml b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/GuiClientApi.yaml
new file mode 100644
index 0000000..1489339
--- /dev/null
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/GuiClientApi.yaml
@@ -0,0 +1,57 @@
+operations:
+  GuiClientApi@getTree: {}
+  GuiClientApi@getObject: {}
+  GuiClientApi@getTimeSerie: {}
+  GuiClientApi@getTable: {}
+  GuiClientApi@getHtml: {}
+  GuiClientApi@getGraph: {}
+messages:
+  dummy: {}
+  REQUEST-FAILED-getTree:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-getObject:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-getTimeSerie:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-getTable:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-getHtml:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-getGraph:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REMOTE-CALL-FAILED-getTree:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-getObject:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-getTimeSerie:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-getTable:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-getHtml:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-getGraph:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/SiriusManagerAgentServer.yaml b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/SiriusManagerAgentServer.yaml
new file mode 100644
index 0000000..a053875
--- /dev/null
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/SiriusManagerAgentServer.yaml
@@ -0,0 +1,93 @@
+operations:
+  SiriusManagerAgentServer@logs: {}
+  SiriusManagerAgentServer@metrics: {}
+  SiriusManagerAgentServer@properties: {}
+  SiriusManagerAgentServer@uploadInfo: {}
+  SiriusManagerAgentServer@getValues: {}
+  SiriusManagerAgentServer@getValuesAll: {}
+  SiriusManagerAgentServer@getMessages: {}
+  SiriusManagerAgentServer@getRequestLogger: {}
+  SiriusManagerAgentServer@evaluate: {}
+  SiriusManagerAgentServer@update: {}
+messages:
+  dummy: {}
+  REQUEST-FAILED-logs:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-metrics:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-properties:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-uploadInfo:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-getValues:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-getValuesAll:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-getMessages:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-getRequestLogger:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-evaluate:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-update:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REMOTE-CALL-FAILED-logs:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-metrics:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-properties:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-uploadInfo:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-getValues:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-getValuesAll:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-getMessages:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-getRequestLogger:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-evaluate:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-update:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/SouthBoundApi.yaml b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/SouthBoundApi.yaml
new file mode 100644
index 0000000..f7ed5b2
--- /dev/null
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/SouthBoundApi.yaml
@@ -0,0 +1,30 @@
+operations:
+  SouthBoundApi@logs: {}
+  SouthBoundApi@metrics: {}
+  SouthBoundApi@properties: {}
+messages:
+  dummy: {}
+  REQUEST-FAILED-logs:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-metrics:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-properties:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REMOTE-CALL-FAILED-logs:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-metrics:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-properties:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServer.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServer.java
index f4147a4..eb0a780 100644
--- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServer.java
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServer.java
@@ -23,18 +23,40 @@
 // Do not edit. No need to extend this class.
 package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring;
 
+
+
+
+
 import java.io.InputStream;
+
 import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
 import org.openecomp.ncomp.sirius.function.FunctionUtils;
 import org.openecomp.ncomp.component.ApiRequestStatus;
 
 import org.apache.log4j.Logger;
+
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
+
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
+
 import java.util.Date;
 
+import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.logging.SiriusManagerAgentServerOperationEnum;
+import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.logging.SiriusManagerAgentServerMessageEnum;
+
+
+
+
 
 
 
@@ -42,10 +64,14 @@ import java.util.Date;
 
 
 
+
+
 import org.openecomp.ncomp.sirius.manager.server.LoggerInfo;
 
 
 
+
+
 import org.openecomp.ncomp.sirius.manager.server.ServerFactory;
 
 
@@ -53,9 +79,10 @@ import org.openecomp.ncomp.sirius.manager.agent.monitoring.impl.SiriusManagerAge
 
 
 
-public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl implements ISiriusPlugin {
+public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl implements ISiriusProvider, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(AgentSiriusManagerAgentServer.class);
-	AgentSiriusManagerAgentServerProvider controller;
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
+	public AgentSiriusManagerAgentServerProvider controller;
 	ISiriusServer server;
 
 	public AgentSiriusManagerAgentServer(ISiriusServer server) {
@@ -69,6 +96,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 		if (server != null)
 			server.getServer().recordApi(null, this, "logs", ApiRequestStatus.START, duration_,cx,logs);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_logs,server,this);
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_logs,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.logs(cx,logs);
 		}
@@ -77,8 +106,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 			if (server != null)
 				server.getServer().recordApi(null, this, "logs", ApiRequestStatus.ERROR, duration_,cx,logs);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_logs, e.toString());
+			EcompException e1 =  EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_logs, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "logs", ApiRequestStatus.OKAY, duration_,cx,logs);
@@ -91,6 +124,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 		if (server != null)
 			server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.START, duration_,cx,metrics);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_metrics,server,this);
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_metrics,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.metrics(cx,metrics);
 		}
@@ -99,8 +134,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 			if (server != null)
 				server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.ERROR, duration_,cx,metrics);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_metrics, e.toString());
+			EcompException e1 =  EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_metrics, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.OKAY, duration_,cx,metrics);
@@ -113,6 +152,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 		if (server != null)
 			server.getServer().recordApi(null, this, "properties", ApiRequestStatus.START, duration_,cx,l);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_properties,server,this);
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_properties,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.properties(cx,l);
 		}
@@ -121,8 +162,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 			if (server != null)
 				server.getServer().recordApi(null, this, "properties", ApiRequestStatus.ERROR, duration_,cx,l);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_properties, e.toString());
+			EcompException e1 =  EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_properties, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "properties", ApiRequestStatus.OKAY, duration_,cx,l);
@@ -135,6 +180,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 		if (server != null)
 			server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.START, duration_,cx,info);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_uploadInfo,server,this);
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_uploadInfo,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.uploadInfo(cx,info);
 		}
@@ -143,8 +190,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 			if (server != null)
 				server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.ERROR, duration_,cx,info);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_uploadInfo, e.toString());
+			EcompException e1 =  EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_uploadInfo, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.OKAY, duration_,cx,info);
@@ -157,6 +208,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 		if (server != null)
 			server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.START, duration_,cx,path,start,end,option,relativeInterval);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getValues,server,this);
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getValues,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValues(cx,path,start,end,option,relativeInterval);
 		}
@@ -165,8 +218,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 			if (server != null)
 				server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.ERROR, duration_,cx,path,start,end,option,relativeInterval);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getValues, e.toString());
+			EcompException e1 =  EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getValues, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.OKAY, duration_,cx,path,start,end,option,relativeInterval);
@@ -179,6 +236,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 		if (server != null)
 			server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.START, duration_,cx,path,metrics,start,end,option,relativeInterval);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getValuesAll,server,this);
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getValuesAll,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValuesAll(cx,path,metrics,start,end,option,relativeInterval);
 		}
@@ -187,8 +246,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 			if (server != null)
 				server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.ERROR, duration_,cx,path,metrics,start,end,option,relativeInterval);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getValuesAll, e.toString());
+			EcompException e1 =  EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getValuesAll, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.OKAY, duration_,cx,path,metrics,start,end,option,relativeInterval);
@@ -201,6 +264,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 		if (server != null)
 			server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.START, duration_,cx,path,start,end);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getMessages,server,this);
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getMessages,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getMessages(cx,path,start,end);
 		}
@@ -209,8 +274,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 			if (server != null)
 				server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.ERROR, duration_,cx,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getMessages, e.toString());
+			EcompException e1 =  EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getMessages, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.OKAY, duration_,cx,path,start,end);
@@ -223,6 +292,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 		if (server != null)
 			server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.START, duration_,userName,action,resourcePath,context);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getRequestLogger,server,this);
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getRequestLogger,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getRequestLogger(userName,action,resourcePath,context);
 		}
@@ -231,8 +302,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 			if (server != null)
 				server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.ERROR, duration_,userName,action,resourcePath,context);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getRequestLogger, e.toString());
+			EcompException e1 =  EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getRequestLogger, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.OKAY, duration_,userName,action,resourcePath,context);
@@ -245,6 +320,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 		if (server != null)
 			server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.START, duration_,path,function);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_evaluate,server,this);
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_evaluate,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.evaluate(path,function);
 		}
@@ -253,8 +330,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 			if (server != null)
 				server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.ERROR, duration_,path,function);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_evaluate, e.toString());
+			EcompException e1 =  EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_evaluate, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.OKAY, duration_,path,function);
@@ -267,6 +348,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 		if (server != null)
 			server.getServer().recordApi(null, this, "update", ApiRequestStatus.START, duration_,path,function);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_update,server,this);
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_update,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.update(path,function);
 		}
@@ -275,8 +358,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 			if (server != null)
 				server.getServer().recordApi(null, this, "update", ApiRequestStatus.ERROR, duration_,path,function);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_update, e.toString());
+			EcompException e1 =  EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_update, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "update", ApiRequestStatus.OKAY, duration_,path,function);
@@ -288,14 +375,17 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl
 
 
 
+
+
 	@Override
 	public void start() {
 		controller.start();
 	}
 
-
 	public static void ecoreSetup() {
 		AgentSiriusManagerAgentServerProvider.ecoreSetup();
 	}
-	
+	public AgentSiriusManagerAgentServerProvider getSiriusProvider() {
+		return controller;
+	}
 }
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerClient.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerClient.java
index db52905..da4fce5 100644
--- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerClient.java
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerClient.java
@@ -25,13 +25,21 @@ package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring;
 
 import org.openecomp.ncomp.sirius.manager.AbstractClient;
 import org.openecomp.ncomp.sirius.manager.HighAvailabilityClient;
-import org.openecomp.ncomp.sirius.manager.Jetty8Client;
+import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 
 import org.apache.log4j.Logger;
+
+import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
+
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
+
 import org.openecomp.ncomp.sirius.manager.agent.monitoring.impl.SiriusManagerAgentServerImpl;
 import org.openecomp.ncomp.sirius.manager.agent.monitoring.MonitoringPackage;
+import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.logging.SiriusManagerAgentServerOperationEnum;
+import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.logging.SiriusManagerAgentServerMessageEnum;
 
 
 
@@ -41,79 +49,209 @@ import org.openecomp.ncomp.sirius.manager.agent.monitoring.MonitoringPackage;
 @SuppressWarnings("unchecked")
 public class AgentSiriusManagerAgentServerClient extends SiriusManagerAgentServerImpl {
 	public static final Logger logger = Logger.getLogger(AgentSiriusManagerAgentServerClient.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
 	public AbstractClient client;
 
 	public AgentSiriusManagerAgentServerClient(String file, String name) {
 		AgentSiriusManagerAgentServer.ecoreSetup(); 
-		client = new Jetty8Client(file,name);
+		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public AgentSiriusManagerAgentServerClient(String file, String name1, String name2) {
 		HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
 		client = client1.all; // requests should be forwarded to all.
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
+	
+	public AgentSiriusManagerAgentServerClient(AbstractClient c) {
+		client = c;
+		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
+	}
+
 
 
 	@Override
 	public void logs(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.logs.LogMessage> logs) {
-		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer();
-		client.operationPath("/resources", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs);
+		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); 
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_logs,client.getRemote());
+		
+		try {
+		  client.operationPath("/resources", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_logs, e.toString());
+			EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_logs,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		
 	}
 
 	@Override
 	public void metrics(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.metrics.Metric> metrics) {
-		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer();
-		client.operationPath("/resources", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics);
+		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); 
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_metrics,client.getRemote());
+		
+		try {
+		  client.operationPath("/resources", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_metrics, e.toString());
+			EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_metrics,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		
 	}
 
 	@Override
 	public void properties(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) {
-		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer();
-		client.operationPath("/resources", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l);
+		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); 
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_properties,client.getRemote());
+		
+		try {
+		  client.operationPath("/resources", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_properties, e.toString());
+			EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_properties,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		
 	}
 
 	@Override
 	public void uploadInfo(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.server.ManagementInfo> info) {
-		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer();
-		client.operationPath("/resources", c, "uploadInfo", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,info);
+		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); 
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_uploadInfo,client.getRemote());
+		
+		try {
+		  client.operationPath("/resources", c, "uploadInfo", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,info);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_uploadInfo, e.toString());
+			EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		
 	}
 
 	@Override
 	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValues(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
-		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer();
-		return (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValues", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end,option,relativeInterval);
+		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); 
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getValues,client.getRemote());
+		EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res;
+		try {
+		  res = (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValues", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end,option,relativeInterval);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getValues, e.toString());
+			EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getValues,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
 	}
 
 	@Override
 	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValuesAll(org.json.JSONObject cx, java.lang.String path, EList<java.lang.String> metrics, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
-		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer();
-		return (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValuesAll", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,metrics,start,end,option,relativeInterval);
+		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); 
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getValuesAll,client.getRemote());
+		EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res;
+		try {
+		  res = (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValuesAll", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,metrics,start,end,option,relativeInterval);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getValuesAll, e.toString());
+			EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
 	}
 
 	@Override
 	public EList<org.openecomp.ncomp.core.logs.LogMessage> getMessages(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end) {
-		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer();
-		return (EList<org.openecomp.ncomp.core.logs.LogMessage>) client.operationPath("/resources", c, "getMessages", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end);
+		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); 
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getMessages,client.getRemote());
+		EList<org.openecomp.ncomp.core.logs.LogMessage> res;
+		try {
+		  res = (EList<org.openecomp.ncomp.core.logs.LogMessage>) client.operationPath("/resources", c, "getMessages", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getMessages, e.toString());
+			EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getMessages,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
 	}
 
 	@Override
 	public org.openecomp.ncomp.sirius.manager.server.LoggerInfo getRequestLogger(java.lang.String userName, java.lang.String action, java.lang.String resourcePath, org.json.JSONObject context) {
-		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer();
-		return (org.openecomp.ncomp.sirius.manager.server.LoggerInfo) client.operationPath("/resources", c, "getRequestLogger", null, userName,action,resourcePath,context);
+		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); 
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getRequestLogger,client.getRemote());
+		org.openecomp.ncomp.sirius.manager.server.LoggerInfo res;
+		try {
+		  res = (org.openecomp.ncomp.sirius.manager.server.LoggerInfo) client.operationPath("/resources", c, "getRequestLogger", null, userName,action,resourcePath,context);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger, e.toString());
+			EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
 	}
 
 	@Override
 	public EList<org.openecomp.ncomp.core.function.ValuePair> evaluate(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
-		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer();
-		return (EList<org.openecomp.ncomp.core.function.ValuePair>) client.operationPath("/resources", c, "evaluate", null, path,function);
+		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); 
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_evaluate,client.getRemote());
+		EList<org.openecomp.ncomp.core.function.ValuePair> res;
+		try {
+		  res = (EList<org.openecomp.ncomp.core.function.ValuePair>) client.operationPath("/resources", c, "evaluate", null, path,function);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_evaluate, e.toString());
+			EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_evaluate,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
 	}
 
 	@Override
 	public void update(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
-		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer();
-		client.operationPath("/resources", c, "update", null, path,function);
+		EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); 
+		ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_update,client.getRemote());
+		
+		try {
+		  client.operationPath("/resources", c, "update", null, path,function);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_update, e.toString());
+			EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_update,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		
 	}
 
 }
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerConsole.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerConsole.java
index 4efd29f..8c9ad68 100644
--- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerConsole.java
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerConsole.java
@@ -23,13 +23,18 @@
 // Do not edit but extend this class as needed
 package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring;
 
+
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.EList;
+
 import org.openecomp.ncomp.sirius.manager.console.Console;
+import org.openecomp.ncomp.sirius.manager.AbstractClient;
 import org.openecomp.ncomp.sirius.manager.ManagementServerError;
 
     
+
 import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.AgentGuiClientApiConsole;       
+
 import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.AgentSouthBoundApiConsole;   
 
 
@@ -50,6 +55,12 @@ public class AgentSiriusManagerAgentServerConsole extends Console {
             gui = new  AgentGuiClientApiConsole(filename,name);       
             south = new  AgentSouthBoundApiConsole(filename,name);   
     }
+    
+	public AgentSiriusManagerAgentServerConsole(AbstractClient c) {
+        controller = new AgentSiriusManagerAgentServerClient(c);
+        client = controller.client;
+    }
+
 
 	public void logs(EList<org.openecomp.ncomp.core.logs.LogMessage> logs) {
 		
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerProviderTemplate.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerProviderTemplate.java
index 82f9dc6..f600613 100644
--- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerProviderTemplate.java
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerProviderTemplate.java
@@ -19,8 +19,7 @@
  * ============LICENSE_END============================================
  */
 	
-// Autogenerated
-// Do not edit. No need to extend this class.
+
 package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring;
 
 
@@ -51,6 +50,7 @@ import org.openecomp.ncomp.sirius.manager.server.ServerFactory;
 
 import org.openecomp.ncomp.sirius.manager.BasicManagementServerProvider;
 
+
 import org.openecomp.ncomp.sirius.manager.agent.monitoring.impl.SiriusManagerAgentServerImpl;
 import org.openecomp.ncomp.sirius.manager.agent.monitoring.SiriusManagerAgentServer;
 
@@ -68,15 +68,7 @@ public class AgentSiriusManagerAgentServerProviderTemplate extends BasicManageme
 
 
 
-	public void start() {
 
-		// TODO Auto-generated method stub
-	}
-
-	public static void ecoreSetup() {
-		// TODO Auto-generated method stub
-		
-	}
 
 	
 }
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerServer.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerServer.java
index a98eabe..d14b82c 100644
--- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerServer.java
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerServer.java
@@ -26,14 +26,16 @@ package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Properties;
 import java.util.TimeZone;
 
 import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EFactory;
-
+import org.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.ncomp.sirius.manager.agent.monitoring.SiriusManagerAgentServer;
@@ -47,7 +49,7 @@ import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.AgentSe
 
 
 
-public class AgentSiriusManagerAgentServerServer implements ISiriusServer {
+public class AgentSiriusManagerAgentServerServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(AgentSiriusManagerAgentServerServer.class);
     String serverPath;
     ManagementServer server;
@@ -56,6 +58,7 @@ public class AgentSiriusManagerAgentServerServer implements ISiriusServer {
 //      LocationControllerApi api ;
     Jetty8Server webServer;
     AgentMonitoringFactory f = new AgentMonitoringFactory(this);
+	
     
     String guiPath;
     ManagementServer guiServer;
@@ -70,6 +73,7 @@ public class AgentSiriusManagerAgentServerServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "SiriusManagerAgentServer", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
         server.addRuntimeFactories(this);
@@ -79,6 +83,7 @@ public class AgentSiriusManagerAgentServerServer implements ISiriusServer {
         controller = (AgentSiriusManagerAgentServer) server.find("/").o;
         webServer = new Jetty8Server("monitoring.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
     
@@ -113,4 +118,17 @@ public class AgentSiriusManagerAgentServerServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApi.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApi.java
index 37332ad..796c45e 100644
--- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApi.java
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApi.java
@@ -23,18 +23,40 @@
 // Do not edit. No need to extend this class.
 package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui;
 
+
+
+
+
 import java.io.InputStream;
+
 import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
 import org.openecomp.ncomp.sirius.function.FunctionUtils;
 import org.openecomp.ncomp.component.ApiRequestStatus;
 
 import org.apache.log4j.Logger;
+
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
+
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
+
 import java.util.Date;
 
+import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.logging.GuiClientApiOperationEnum;
+import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.logging.GuiClientApiMessageEnum;
+
+
+
+
 
 
 
@@ -42,18 +64,26 @@ import org.openecomp.ncomp.sirius.gui.tools.*;
 
 
 
+
+
 import org.openecomp.ncomp.gwt.siriusportal.model.*;
 
 
 
+
+
 import org.openecomp.ncomp.sirius.manager.Subject;
 
 
 
+
+
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
 
 
 
+
+
 import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer;
 
 
@@ -61,9 +91,10 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
 
 
 
-public class AgentGuiClientApi extends GuiClientApiImpl {
+public class AgentGuiClientApi extends GuiClientApiImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(AgentGuiClientApi.class);
-	AgentGuiClientApiProvider controller;
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
+	public AgentGuiClientApiProvider controller;
 	ISiriusServer server;
 
 	public AgentGuiClientApi(ISiriusServer server) {
@@ -77,6 +108,8 @@ public class AgentGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTree();
 		}
@@ -85,8 +118,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.OKAY, duration_);
@@ -99,6 +136,8 @@ public class AgentGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.START, duration_,path);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getObject(path);
 		}
@@ -107,8 +146,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.ERROR, duration_,path);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.OKAY, duration_,path);
@@ -121,6 +164,8 @@ public class AgentGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.START, duration_,path,start,end,duration);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTimeSerie(path,start,end,duration);
 		}
@@ -129,8 +174,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.ERROR, duration_,path,start,end,duration);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.OKAY, duration_,path,start,end,duration);
@@ -143,6 +192,8 @@ public class AgentGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.START, duration_,path,start,end);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTable(path,start,end);
 		}
@@ -151,8 +202,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.OKAY, duration_,path,start,end);
@@ -165,6 +220,8 @@ public class AgentGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.START, duration_,path,start,end);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getHtml(path,start,end);
 		}
@@ -173,8 +230,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.OKAY, duration_,path,start,end);
@@ -187,6 +248,8 @@ public class AgentGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.START, duration_,path,start,end);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getGraph(path,start,end);
 		}
@@ -195,8 +258,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.OKAY, duration_,path,start,end);
@@ -208,8 +275,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		AgentGuiClientApiProvider.ecoreSetup();
 	}
-	
+	public AgentGuiClientApiProvider getSiriusProvider() {
+		return controller;
+	}
 }
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiClient.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiClient.java
index f480a06..9140d0b 100644
--- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiClient.java
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiClient.java
@@ -25,13 +25,21 @@ package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui;
 
 import org.openecomp.ncomp.sirius.manager.AbstractClient;
 import org.openecomp.ncomp.sirius.manager.HighAvailabilityClient;
-import org.openecomp.ncomp.sirius.manager.Jetty8Client;
+import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 
 import org.apache.log4j.Logger;
+
+import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
+
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
+
 import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
 import org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage;
+import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.logging.GuiClientApiOperationEnum;
+import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.logging.GuiClientApiMessageEnum;
 
 
 import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.AgentSiriusManagerAgentServer; 
@@ -42,55 +50,137 @@ import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.AgentSiriusMa
 @SuppressWarnings("unchecked")
 public class AgentGuiClientApiClient extends GuiClientApiImpl {
 	public static final Logger logger = Logger.getLogger(AgentGuiClientApiClient.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
 	public AbstractClient client;
 
 	public AgentGuiClientApiClient(String file, String name) {
 		AgentSiriusManagerAgentServer.ecoreSetup(); 
-		client = new Jetty8Client(file,name);
+		client = new GenericHttpClient(file,name);
 		client.add("/gui", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public AgentGuiClientApiClient(String file, String name1, String name2) {
 		HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
 		client = client1.all; // requests should be forwarded to all.
 		client.add("/gui", this);
+		client.setVersion("ONAP-R2");
 	}
+	
+	public AgentGuiClientApiClient(AbstractClient c) {
+		client = c;
+		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
+	}
+
 
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi();
-		return (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote());
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res;
+		try {
+		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
 	}
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiObject getObject(java.lang.String path) {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi();
-		return (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote());
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiObject res;
+		try {
+		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
 	}
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie getTimeSerie(java.lang.String path, java.lang.String start, java.lang.String end, java.lang.String duration) {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi();
-		return (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote());
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie res;
+		try {
+		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
 	}
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTable getTable(java.lang.String path, java.lang.String start, java.lang.String end) {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi();
-		return (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote());
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiTable res;
+		try {
+		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
 	}
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml getHtml(java.lang.String path, java.lang.String start, java.lang.String end) {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi();
-		return (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote());
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml res;
+		try {
+		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
 	}
 
 	@Override
 	public org.openecomp.ncomp.sirius.manager.graph.GuiGraph getGraph(java.lang.String path, java.lang.String start, java.lang.String end) {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi();
-		return (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote());
+		org.openecomp.ncomp.sirius.manager.graph.GuiGraph res;
+		try {
+		  res = (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
 	}
 
 }
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiConsole.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiConsole.java
index 2a18f02..2cb0bc5 100644
--- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiConsole.java
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiConsole.java
@@ -23,9 +23,12 @@
 // Do not edit but extend this class as needed
 package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui;
 
+
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.EList;
+
 import org.openecomp.ncomp.sirius.manager.console.Console;
+import org.openecomp.ncomp.sirius.manager.AbstractClient;
 import org.openecomp.ncomp.sirius.manager.ManagementServerError;
 
 
@@ -44,6 +47,12 @@ public class AgentGuiClientApiConsole extends Console {
             client = controller.client;
 
     }
+    
+	public AgentGuiClientApiConsole(AbstractClient c) {
+        controller = new AgentGuiClientApiClient(c);
+        client = controller.client;
+    }
+
 
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res = null;
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiProviderTemplate.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiProviderTemplate.java
index 43754f4..c921aaa 100644
--- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiProviderTemplate.java
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiProviderTemplate.java
@@ -19,8 +19,7 @@
  * ============LICENSE_END============================================
  */
 	
-// Autogenerated
-// Do not edit. No need to extend this class.
+
 package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui;
 
 
@@ -57,6 +56,7 @@ import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer;
 
 import org.openecomp.ncomp.sirius.manager.BasicGuiClientApiProvider;
 
+
 import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
 import org.openecomp.ncomp.gwt.siriusportal.model.GuiClientApi;
 
@@ -74,10 +74,5 @@ public class AgentGuiClientApiProviderTemplate extends BasicGuiClientApiProvider
 
 
 
-	public static void ecoreSetup() {
-		// TODO Auto-generated method stub
-		
-	}
-
 	
 }
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApi.properties b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApi.properties
new file mode 100644
index 0000000..3822d29
--- /dev/null
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApi.properties
@@ -0,0 +1,78 @@
+
+dummy=\
+  dummy-null|\
+  null|\
+  null|\
+  null
+
+REQUEST_FAILED_getTree=\
+  REQUEST-FAILED-getTree-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_getObject=\
+  REQUEST-FAILED-getObject-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_getTimeSerie=\
+  REQUEST-FAILED-getTimeSerie-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_getTable=\
+  REQUEST-FAILED-getTable-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_getHtml=\
+  REQUEST-FAILED-getHtml-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_getGraph=\
+  REQUEST-FAILED-getGraph-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getTree=\
+  REMOTE-CALL-FAILED-getTree-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getObject=\
+  REMOTE-CALL-FAILED-getObject-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getTimeSerie=\
+  REMOTE-CALL-FAILED-getTimeSerie-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getTable=\
+  REMOTE-CALL-FAILED-getTable-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getHtml=\
+  REMOTE-CALL-FAILED-getHtml-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getGraph=\
+  REMOTE-CALL-FAILED-getGraph-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApiMessageEnum.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApiMessageEnum.java
new file mode 100644
index 0000000..606b10f
--- /dev/null
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApiMessageEnum.java
@@ -0,0 +1,26 @@
+
+package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.logging;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.logger.EcompMessageEnum;
+
+public enum GuiClientApiMessageEnum implements EcompMessageEnum {
+
+  dummy,
+  REQUEST_FAILED_getTree,
+  REQUEST_FAILED_getObject,
+  REQUEST_FAILED_getTimeSerie,
+  REQUEST_FAILED_getTable,
+  REQUEST_FAILED_getHtml,
+  REQUEST_FAILED_getGraph,
+  REMOTE_CALL_FAILED_getTree,
+  REMOTE_CALL_FAILED_getObject,
+  REMOTE_CALL_FAILED_getTimeSerie,
+  REMOTE_CALL_FAILED_getTable,
+  REMOTE_CALL_FAILED_getHtml,
+  REMOTE_CALL_FAILED_getGraph;
+
+	static {
+		EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApi");
+	}
+}
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApiOperationEnum.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApiOperationEnum.java
new file mode 100644
index 0000000..5b80740
--- /dev/null
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApiOperationEnum.java
@@ -0,0 +1,27 @@
+
+package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.logging;
+
+import org.openecomp.entity.EcompOperationEnum;
+
+public enum GuiClientApiOperationEnum implements EcompOperationEnum {
+
+  GuiClientApi_getTree("GuiClientApi@getTree"),
+  GuiClientApi_getObject("GuiClientApi@getObject"),
+  GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"),
+  GuiClientApi_getTable("GuiClientApi@getTable"),
+  GuiClientApi_getHtml("GuiClientApi@getHtml"),
+  GuiClientApi_getGraph("GuiClientApi@getGraph") ; 
+
+
+	private String n;
+	
+	private GuiClientApiOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
+}
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServer.properties b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServer.properties
new file mode 100644
index 0000000..945efe6
--- /dev/null
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServer.properties
@@ -0,0 +1,126 @@
+
+dummy=\
+  dummy-null|\
+  null|\
+  null|\
+  null
+
+REQUEST_FAILED_logs=\
+  REQUEST-FAILED-logs-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_metrics=\
+  REQUEST-FAILED-metrics-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_properties=\
+  REQUEST-FAILED-properties-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_uploadInfo=\
+  REQUEST-FAILED-uploadInfo-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_getValues=\
+  REQUEST-FAILED-getValues-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_getValuesAll=\
+  REQUEST-FAILED-getValuesAll-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_getMessages=\
+  REQUEST-FAILED-getMessages-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_getRequestLogger=\
+  REQUEST-FAILED-getRequestLogger-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_evaluate=\
+  REQUEST-FAILED-evaluate-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_update=\
+  REQUEST-FAILED-update-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REMOTE_CALL_FAILED_logs=\
+  REMOTE-CALL-FAILED-logs-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_metrics=\
+  REMOTE-CALL-FAILED-metrics-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_properties=\
+  REMOTE-CALL-FAILED-properties-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_uploadInfo=\
+  REMOTE-CALL-FAILED-uploadInfo-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getValues=\
+  REMOTE-CALL-FAILED-getValues-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getValuesAll=\
+  REMOTE-CALL-FAILED-getValuesAll-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getMessages=\
+  REMOTE-CALL-FAILED-getMessages-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_getRequestLogger=\
+  REMOTE-CALL-FAILED-getRequestLogger-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_evaluate=\
+  REMOTE-CALL-FAILED-evaluate-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_update=\
+  REMOTE-CALL-FAILED-update-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServerMessageEnum.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServerMessageEnum.java
new file mode 100644
index 0000000..1f74179
--- /dev/null
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServerMessageEnum.java
@@ -0,0 +1,34 @@
+
+package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.logging;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.logger.EcompMessageEnum;
+
+public enum SiriusManagerAgentServerMessageEnum implements EcompMessageEnum {
+
+  dummy,
+  REQUEST_FAILED_logs,
+  REQUEST_FAILED_metrics,
+  REQUEST_FAILED_properties,
+  REQUEST_FAILED_uploadInfo,
+  REQUEST_FAILED_getValues,
+  REQUEST_FAILED_getValuesAll,
+  REQUEST_FAILED_getMessages,
+  REQUEST_FAILED_getRequestLogger,
+  REQUEST_FAILED_evaluate,
+  REQUEST_FAILED_update,
+  REMOTE_CALL_FAILED_logs,
+  REMOTE_CALL_FAILED_metrics,
+  REMOTE_CALL_FAILED_properties,
+  REMOTE_CALL_FAILED_uploadInfo,
+  REMOTE_CALL_FAILED_getValues,
+  REMOTE_CALL_FAILED_getValuesAll,
+  REMOTE_CALL_FAILED_getMessages,
+  REMOTE_CALL_FAILED_getRequestLogger,
+  REMOTE_CALL_FAILED_evaluate,
+  REMOTE_CALL_FAILED_update;
+
+	static {
+		EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServer");
+	}
+}
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServerOperationEnum.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServerOperationEnum.java
new file mode 100644
index 0000000..479129a
--- /dev/null
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServerOperationEnum.java
@@ -0,0 +1,31 @@
+
+package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.logging;
+
+import org.openecomp.entity.EcompOperationEnum;
+
+public enum SiriusManagerAgentServerOperationEnum implements EcompOperationEnum {
+
+  SiriusManagerAgentServer_logs("SiriusManagerAgentServer@logs"),
+  SiriusManagerAgentServer_metrics("SiriusManagerAgentServer@metrics"),
+  SiriusManagerAgentServer_properties("SiriusManagerAgentServer@properties"),
+  SiriusManagerAgentServer_uploadInfo("SiriusManagerAgentServer@uploadInfo"),
+  SiriusManagerAgentServer_getValues("SiriusManagerAgentServer@getValues"),
+  SiriusManagerAgentServer_getValuesAll("SiriusManagerAgentServer@getValuesAll"),
+  SiriusManagerAgentServer_getMessages("SiriusManagerAgentServer@getMessages"),
+  SiriusManagerAgentServer_getRequestLogger("SiriusManagerAgentServer@getRequestLogger"),
+  SiriusManagerAgentServer_evaluate("SiriusManagerAgentServer@evaluate"),
+  SiriusManagerAgentServer_update("SiriusManagerAgentServer@update") ; 
+
+
+	private String n;
+	
+	private SiriusManagerAgentServerOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
+}
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApi.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApi.java
index 9f3fe78..90027c8 100644
--- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApi.java
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApi.java
@@ -23,27 +23,48 @@
 // Do not edit. No need to extend this class.
 package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south;
 
+
+
+
+
 import java.io.InputStream;
+
 import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
 import org.openecomp.ncomp.sirius.function.FunctionUtils;
 import org.openecomp.ncomp.component.ApiRequestStatus;
 
 import org.apache.log4j.Logger;
+
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
+
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
+
 import java.util.Date;
 
+import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.logging.SouthBoundApiOperationEnum;
+import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.logging.SouthBoundApiMessageEnum;
+
+
 
 
 import org.openecomp.ncomp.sirius.manager.server.impl.SouthBoundApiImpl;
 
 
 
-public class AgentSouthBoundApi extends SouthBoundApiImpl {
+public class AgentSouthBoundApi extends SouthBoundApiImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(AgentSouthBoundApi.class);
-	AgentSouthBoundApiProvider controller;
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
+	public AgentSouthBoundApiProvider controller;
 	ISiriusServer server;
 
 	public AgentSouthBoundApi(ISiriusServer server) {
@@ -57,6 +78,8 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "logs", ApiRequestStatus.START, duration_,cx,logs);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(SouthBoundApiOperationEnum.SouthBoundApi_logs,server,this);
+		ecomplogger.recordMetricEventStart(SouthBoundApiOperationEnum.SouthBoundApi_logs,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.logs(cx,logs);
 		}
@@ -65,8 +88,12 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "logs", ApiRequestStatus.ERROR, duration_,cx,logs);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(SouthBoundApiMessageEnum.REQUEST_FAILED_logs, e.toString());
+			EcompException e1 =  EcompException.create(SouthBoundApiMessageEnum.REQUEST_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SouthBoundApiMessageEnum.REQUEST_FAILED_logs, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "logs", ApiRequestStatus.OKAY, duration_,cx,logs);
@@ -79,6 +106,8 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.START, duration_,cx,metrics);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(SouthBoundApiOperationEnum.SouthBoundApi_metrics,server,this);
+		ecomplogger.recordMetricEventStart(SouthBoundApiOperationEnum.SouthBoundApi_metrics,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.metrics(cx,metrics);
 		}
@@ -87,8 +116,12 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.ERROR, duration_,cx,metrics);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(SouthBoundApiMessageEnum.REQUEST_FAILED_metrics, e.toString());
+			EcompException e1 =  EcompException.create(SouthBoundApiMessageEnum.REQUEST_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SouthBoundApiMessageEnum.REQUEST_FAILED_metrics, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.OKAY, duration_,cx,metrics);
@@ -101,6 +134,8 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "properties", ApiRequestStatus.START, duration_,cx,l);
 		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(SouthBoundApiOperationEnum.SouthBoundApi_properties,server,this);
+		ecomplogger.recordMetricEventStart(SouthBoundApiOperationEnum.SouthBoundApi_properties,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.properties(cx,l);
 		}
@@ -109,8 +144,12 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "properties", ApiRequestStatus.ERROR, duration_,cx,l);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(SouthBoundApiMessageEnum.REQUEST_FAILED_properties, e.toString());
+			EcompException e1 =  EcompException.create(SouthBoundApiMessageEnum.REQUEST_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SouthBoundApiMessageEnum.REQUEST_FAILED_properties, e.getMessage());
+			throw e1;
 		}
+		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
 		if (server != null)
 			server.getServer().recordApi(null, this, "properties", ApiRequestStatus.OKAY, duration_,cx,l);
@@ -122,8 +161,12 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		AgentSouthBoundApiProvider.ecoreSetup();
 	}
-	
+	public AgentSouthBoundApiProvider getSiriusProvider() {
+		return controller;
+	}
 }
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiClient.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiClient.java
index 223f47d..7ab4356 100644
--- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiClient.java
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiClient.java
@@ -25,13 +25,21 @@ package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south;
 
 import org.openecomp.ncomp.sirius.manager.AbstractClient;
 import org.openecomp.ncomp.sirius.manager.HighAvailabilityClient;
-import org.openecomp.ncomp.sirius.manager.Jetty8Client;
+import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 
 import org.apache.log4j.Logger;
+
+import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
+
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
+
 import org.openecomp.ncomp.sirius.manager.server.impl.SouthBoundApiImpl;
 import org.openecomp.ncomp.sirius.manager.server.ServerPackage;
+import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.logging.SouthBoundApiOperationEnum;
+import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.logging.SouthBoundApiMessageEnum;
 
 
 import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.AgentSiriusManagerAgentServer; 
@@ -42,37 +50,83 @@ import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.AgentSiriusMa
 @SuppressWarnings("unchecked")
 public class AgentSouthBoundApiClient extends SouthBoundApiImpl {
 	public static final Logger logger = Logger.getLogger(AgentSouthBoundApiClient.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
 	public AbstractClient client;
 
 	public AgentSouthBoundApiClient(String file, String name) {
 		AgentSiriusManagerAgentServer.ecoreSetup(); 
-		client = new Jetty8Client(file,name);
+		client = new GenericHttpClient(file,name);
 		client.add("/south", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public AgentSouthBoundApiClient(String file, String name1, String name2) {
 		HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
 		client = client1.all; // requests should be forwarded to all.
 		client.add("/south", this);
+		client.setVersion("ONAP-R2");
 	}
+	
+	public AgentSouthBoundApiClient(AbstractClient c) {
+		client = c;
+		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
+	}
+
 
 
 	@Override
 	public void logs(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.logs.LogMessage> logs) {
-		EClass c = ServerPackage.eINSTANCE.getSouthBoundApi();
-		client.operationPath("/south", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs);
+		EClass c = ServerPackage.eINSTANCE.getSouthBoundApi(); 
+		ecomplogger.recordMetricEventStart(SouthBoundApiOperationEnum.SouthBoundApi_logs,client.getRemote());
+		
+		try {
+		  client.operationPath("/south", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_logs, e.toString());
+			EcompException e1 = EcompException.create(SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_logs,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		
 	}
 
 	@Override
 	public void metrics(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.metrics.Metric> metrics) {
-		EClass c = ServerPackage.eINSTANCE.getSouthBoundApi();
-		client.operationPath("/south", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics);
+		EClass c = ServerPackage.eINSTANCE.getSouthBoundApi(); 
+		ecomplogger.recordMetricEventStart(SouthBoundApiOperationEnum.SouthBoundApi_metrics,client.getRemote());
+		
+		try {
+		  client.operationPath("/south", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_metrics, e.toString());
+			EcompException e1 = EcompException.create(SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_metrics,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		
 	}
 
 	@Override
 	public void properties(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) {
-		EClass c = ServerPackage.eINSTANCE.getSouthBoundApi();
-		client.operationPath("/south", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l);
+		EClass c = ServerPackage.eINSTANCE.getSouthBoundApi(); 
+		ecomplogger.recordMetricEventStart(SouthBoundApiOperationEnum.SouthBoundApi_properties,client.getRemote());
+		
+		try {
+		  client.operationPath("/south", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_properties, e.toString());
+			EcompException e1 = EcompException.create(SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_properties,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		
 	}
 
 }
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiConsole.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiConsole.java
index e65be04..8ec10e7 100644
--- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiConsole.java
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiConsole.java
@@ -23,9 +23,12 @@
 // Do not edit but extend this class as needed
 package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south;
 
+
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.EList;
+
 import org.openecomp.ncomp.sirius.manager.console.Console;
+import org.openecomp.ncomp.sirius.manager.AbstractClient;
 import org.openecomp.ncomp.sirius.manager.ManagementServerError;
 
 
@@ -44,6 +47,12 @@ public class AgentSouthBoundApiConsole extends Console {
             client = controller.client;
 
     }
+    
+	public AgentSouthBoundApiConsole(AbstractClient c) {
+        controller = new AgentSouthBoundApiClient(c);
+        client = controller.client;
+    }
+
 
 	public void logs(EList<org.openecomp.ncomp.core.logs.LogMessage> logs) {
 		
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiProviderTemplate.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiProviderTemplate.java
index fb7d5df..03cd5b3 100644
--- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiProviderTemplate.java
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiProviderTemplate.java
@@ -19,8 +19,7 @@
  * ============LICENSE_END============================================
  */
 	
-// Autogenerated
-// Do not edit. No need to extend this class.
+
 package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south;
 
 
@@ -42,6 +41,7 @@ import org.json.JSONObject;
 
 import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider;
 
+
 import org.openecomp.ncomp.sirius.manager.server.impl.SouthBoundApiImpl;
 import org.openecomp.ncomp.sirius.manager.server.SouthBoundApi;
 
@@ -77,10 +77,5 @@ public class AgentSouthBoundApiProviderTemplate extends BasicAdaptorProvider {
 
 
 
-	public static void ecoreSetup() {
-		// TODO Auto-generated method stub
-		
-	}
-
 	
 }
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApi.properties b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApi.properties
new file mode 100644
index 0000000..eec7023
--- /dev/null
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApi.properties
@@ -0,0 +1,42 @@
+
+dummy=\
+  dummy-null|\
+  null|\
+  null|\
+  null
+
+REQUEST_FAILED_logs=\
+  REQUEST-FAILED-logs-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_metrics=\
+  REQUEST-FAILED-metrics-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_properties=\
+  REQUEST-FAILED-properties-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REMOTE_CALL_FAILED_logs=\
+  REMOTE-CALL-FAILED-logs-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_metrics=\
+  REMOTE-CALL-FAILED-metrics-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_properties=\
+  REMOTE-CALL-FAILED-properties-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApiMessageEnum.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApiMessageEnum.java
new file mode 100644
index 0000000..10ad171
--- /dev/null
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApiMessageEnum.java
@@ -0,0 +1,20 @@
+
+package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.logging;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.logger.EcompMessageEnum;
+
+public enum SouthBoundApiMessageEnum implements EcompMessageEnum {
+
+  dummy,
+  REQUEST_FAILED_logs,
+  REQUEST_FAILED_metrics,
+  REQUEST_FAILED_properties,
+  REMOTE_CALL_FAILED_logs,
+  REMOTE_CALL_FAILED_metrics,
+  REMOTE_CALL_FAILED_properties;
+
+	static {
+		EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApi");
+	}
+}
diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApiOperationEnum.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApiOperationEnum.java
new file mode 100644
index 0000000..9095cb5
--- /dev/null
+++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApiOperationEnum.java
@@ -0,0 +1,24 @@
+
+package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.logging;
+
+import org.openecomp.entity.EcompOperationEnum;
+
+public enum SouthBoundApiOperationEnum implements EcompOperationEnum {
+
+  SouthBoundApi_logs("SouthBoundApi@logs"),
+  SouthBoundApi_metrics("SouthBoundApi@metrics"),
+  SouthBoundApi_properties("SouthBoundApi@properties") ; 
+
+
+	private String n;
+	
+	private SouthBoundApiOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
+}
diff --git a/ncomp-sirius-manager-camunda/.classpath b/ncomp-sirius-manager-camunda/.classpath
new file mode 100644
index 0000000..9a844a4
--- /dev/null
+++ b/ncomp-sirius-manager-camunda/.classpath
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src/main/groovy"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/ncomp-sirius-manager-camunda/.gitignore b/ncomp-sirius-manager-camunda/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/ncomp-sirius-manager-camunda/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/ncomp-sirius-manager-camunda/.project b/ncomp-sirius-manager-camunda/.project
new file mode 100644
index 0000000..6fa8cd2
--- /dev/null
+++ b/ncomp-sirius-manager-camunda/.project
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ncomp-sirius-manager-camunda</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/ncomp-sirius-manager-camunda/.settings/org.eclipse.core.resources.prefs b/ncomp-sirius-manager-camunda/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/ncomp-sirius-manager-camunda/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/ncomp-sirius-manager-camunda/.settings/org.eclipse.jdt.core.prefs b/ncomp-sirius-manager-camunda/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..ec4300d
--- /dev/null
+++ b/ncomp-sirius-manager-camunda/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/ncomp-sirius-manager-camunda/.settings/org.eclipse.jdt.groovy.core.prefs b/ncomp-sirius-manager-camunda/.settings/org.eclipse.jdt.groovy.core.prefs
new file mode 100644
index 0000000..ae98fea
--- /dev/null
+++ b/ncomp-sirius-manager-camunda/.settings/org.eclipse.jdt.groovy.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+groovy.compiler.level=24
diff --git a/ncomp-sirius-manager-camunda/.settings/org.eclipse.m2e.core.prefs b/ncomp-sirius-manager-camunda/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/ncomp-sirius-manager-camunda/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/ncomp-sirius-manager-camunda/LICENSE.txt b/ncomp-sirius-manager-camunda/LICENSE.txt
new file mode 100644
index 0000000..30471b5
--- /dev/null
+++ b/ncomp-sirius-manager-camunda/LICENSE.txt
@@ -0,0 +1,22 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ */
+	
+ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.
diff --git a/ncomp-sirius-manager-camunda/pom.xml b/ncomp-sirius-manager-camunda/pom.xml
new file mode 100644
index 0000000..40c3d00
--- /dev/null
+++ b/ncomp-sirius-manager-camunda/pom.xml
@@ -0,0 +1,199 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.openecomp.ncomp.sirius.manager</groupId>
+  <artifactId>ncomp-sirius-manager-camunda</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+
+	<properties>
+	  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	  <maven.compiler.target>1.7</maven.compiler.target>
+	  <maven.compiler.source>1.7</maven.compiler.source>
+		<openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases>
+		<openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
+		<openecomp.nexus.proxy>https://nexus.openecomp.org</openecomp.nexus.proxy>
+	</properties>
+
+	
+<build>
+		<plugins>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>${openecomp.nexus.staging.serverId}</serverId>
+                    <nexusUrl>${openecomp.nexus.proxy}</nexusUrl>
+                    <stagingProfileId>${openecomp.nexus.staging.profileId}</stagingProfileId>
+                </configuration>
+            </plugin>
+       <!-- site maven plugin -->
+       <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-site-plugin</artifactId>
+           <version>3.6</version>
+           <dependencies>
+             <dependency>
+               <groupId>org.apache.maven.wagon</groupId>
+               <artifactId>wagon-webdav-jackrabbit</artifactId>
+               <version>2.10</version>
+             </dependency>
+           </dependencies>
+       </plugin>
+    
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.10</version>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>src/main/groovy</source>
+								<source>src/main/java</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<!-- 2.8.0-01 and later require maven-compiler-plugin 3.1 or higher -->
+				<version>3.1</version>
+				<configuration>
+					<compilerId>groovy-eclipse-compiler</compilerId>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.codehaus.groovy</groupId>
+						<artifactId>groovy-eclipse-compiler</artifactId>
+						<version>2.9.1-01</version>
+					</dependency>
+					<!-- for 2.8.0-01 and later you must have an explicit dependency on 
+						groovy-eclipse-batch -->
+					<dependency>
+						<groupId>org.codehaus.groovy</groupId>
+						<artifactId>groovy-eclipse-batch</artifactId>
+						<version>2.3.7-01</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-compiler-plugin
+										</artifactId>
+										<versionRange>
+											[3.1,)
+										</versionRange>
+										<goals>
+											<goal>compile</goal>
+											<goal>testCompile</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.codehaus.mojo
+										</groupId>
+										<artifactId>
+											build-helper-maven-plugin
+										</artifactId>
+										<versionRange>
+											[1.9.1,)
+										</versionRange>
+										<goals>
+											<goal>add-source</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+  
+	<dependencies>
+		<dependency>
+			<groupId>org.openecomp.ncomp.sirius.manager</groupId>
+			<artifactId>ncomp-sirius-manager-server</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openecomp.ncomp.sirius.manager</groupId>
+			<artifactId>ncomp-sirius-manager-console</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+	
+		<distributionManagement>
+			<repository>
+				<id>ecomp-releases</id>
+				<name>OpenECOMP Release Repository</name>
+				<url>${openecomp.nexus.releases}</url>
+			</repository>
+			<snapshotRepository>
+				<id>ecomp-snapshots</id>
+				<name>OpenECOMP Snapshot Repository</name>
+				<url>${openecomp.nexus.snapshots}</url>
+			</snapshotRepository>
+			<site>
+				<id>dcae-javadoc</id>
+				<url>${site.urlroot}/${project.artifactId}/${project.version}/</url>
+			</site>
+		</distributionManagement>
+	
+   <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <configuration>
+                    <failOnError>false</failOnError>
+                    <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+                    <docletArtifact>
+                        <groupId>org.umlgraph</groupId>
+                        <artifactId>umlgraph</artifactId>
+                        <version>5.6</version>
+                    </docletArtifact>
+                    <additionalparam>-views</additionalparam>
+                    <useStandardDocletOptions>true</useStandardDocletOptions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
+
+</project>
diff --git a/ncomp-sirius-manager-camunda/src/assembly/assemble_zip.xml b/ncomp-sirius-manager-camunda/src/assembly/assemble_zip.xml
new file mode 100644
index 0000000..378204a
--- /dev/null
+++ b/ncomp-sirius-manager-camunda/src/assembly/assemble_zip.xml
@@ -0,0 +1,61 @@
+<!-- Defines how we build the .zip file which is our distribution. -->
+
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>runtime</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+
+	<!-- we want "system" and related files right at the root level as this 
+		file is suppose to be unzip on top of a karaf distro. -->
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>lib</outputDirectory>
+			<includes>
+				<include>ncomp-sirius-manager-camunda-0.1.0-SNAPSHOT.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target/assembly/</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>.</directory>
+			<outputDirectory>lib</outputDirectory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/server-gen/bin</directory>
+			<outputDirectory>bin</outputDirectory>
+			<fileMode>0744</fileMode>
+			<excludes>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/server/bin</directory>
+			<outputDirectory>bin</outputDirectory>
+			<fileMode>0744</fileMode>
+			<excludes>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/server-gen/scripts</directory>
+			<outputDirectory>scripts</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/server/scripts</directory>
+			<outputDirectory>scripts</outputDirectory>
+		</fileSet>
+	</fileSets>
+
+</assembly>
diff --git a/ncomp-sirius-manager-camunda/src/main/groovy/org/openecomp/ncomp/sirius/manager/camunda/Camunda.groovy b/ncomp-sirius-manager-camunda/src/main/groovy/org/openecomp/ncomp/sirius/manager/camunda/Camunda.groovy
new file mode 100644
index 0000000..d689877
--- /dev/null
+++ b/ncomp-sirius-manager-camunda/src/main/groovy/org/openecomp/ncomp/sirius/manager/camunda/Camunda.groovy
@@ -0,0 +1,220 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ */
+	
+package org.openecomp.ncomp.sirius.manager.camunda;
+
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+
+import org.apache.log4j.Logger;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import org.openecomp.ncomp.sirius.manager.GenericHttpClient
+
+import static org.openecomp.ncomp.sirius.manager.console.Utils.*
+
+
+class Camunda {
+	static final Logger logger = Logger.getLogger(Camunda.class);
+	GenericHttpClient client;
+
+	Camunda(String name="camunda") {
+	    client = new GenericHttpClient("console.properties", name);
+		client.language = "rest";
+	}
+
+	def p(x) { object2json(x).toString(2) }
+	
+	def list(String type) { 
+		if (type == "filter") return listFilter()
+		JSONObject json = client.list("/$type")
+		return json
+	}
+	
+	def list(String type, String id) {
+		if (type == "filter") return listFilter(id)
+	    JSONObject json = client.list("/$type/$id")
+	    return json
+	}
+
+	def listIds(String type) {
+		if (type == "filter") return listFilterIds()
+		def l = []
+		json2object(client.list("/$type"))['$list'].each {
+//			println p(it)
+			l += it.id
+		}
+		return l
+	}
+	def delete(String type, String id) {
+		client.delete("/$type/$id")
+	}
+	
+	def update(String type, String id, String action, x) {
+		client.update("/$type/$id/$action", object2json(x))
+	}
+	
+	def string2json(String s) {
+		if (s == null) return null;
+		if (s.startsWith("[")) {
+			JSONArray a = new JSONArray(s);
+			JSONObject json = new JSONObject();
+			json.put('$list', a);
+			return json;
+		} else {
+			return new JSONObject(s);
+		}
+	}
+	
+	def listFilter() {
+		String s = client.methodAsString("/filter", "GET", null);
+		s = cleanFilter(s);
+		return string2json(s);
+	}
+	
+	def listFilter(String id) {
+		String s = client.methodAsString("/filter/$id", "GET", null);
+		s = cleanFilter(s);
+		return string2json(s);
+	}
+	
+	def listFilterIds() {
+		def l = []
+		json2object(listFilter())['$list'].each {
+//			println p(it)
+			l += it.id
+		}
+		return l
+	}
+
+	private static Pattern filterFixer = Pattern.compile("\"resourceType\":\"([^\"]*)\",");
+	def String cleanFilter(String s) {
+		Matcher m = filterFixer.matcher (s);
+		String t = null;
+		def s2 = new StringBuffer();
+		while (m.find()) {
+			String t1 = m.group(1);
+			if (t != null && t.equals(t1)) {
+				t = null;
+				m.appendReplacement(s2, "");
+			} else {
+				t = t1;
+			}
+		}
+		m.appendTail(s2);
+		return s2.toString();
+	}
+	
+	def create(String type, x) {
+	    client.create("/$type/create",object2json(x))
+	}
+
+	private static AtomicLong episodeCounter = new AtomicLong();
+	
+	private String newEpisode(String label) {
+		long id = episodeCounter.incrementAndGet();
+		return "Episode:Camunda:" + label + ":" + Long.toString(id);
+	}
+	
+	// c.startProcess("eNodeB-reboot", "eNodeB", "FOOBAR", "samEMSname", "someEMS", 
+	//                "samEMSip", "192.168.0.1", "episodeId", "episode:dummy")
+
+	//	json query
+	//  [
+	//		variables: [
+	//			eNodeB : ["value" : "FOOBAR", "type": "String"],
+	//			samEMSname : ["value" : "someEMS", "type": "String"],
+	//			samEMSip : ["value" : "192.168.0.1", "type": "String"],
+	//			episodeId : ["value" : "episode:dummy", "type": "String"],
+	//		]
+	//	]
+	
+	def JSONObject varlist_arr (Object[] args, String episode = null) {
+		JSONObject vars = new JSONObject();
+		for (int i=0; i+1<args.length; i += 2) {
+			String name = (String) args[i]
+			Object val = args[i+1]
+			JSONObject j = new JSONObject()
+			if (episode != null && val instanceof String && val.equals("\$episode")) {
+				j.put("value", episode)
+			} else {
+				j.put("value", val)
+			}
+			
+			if (val instanceof String) {
+				j.put("type", "String")
+			} else if (val instanceof Boolean) {
+				j.put("type", "Boolean")
+			} else if (val instanceof Integer) {
+				j.put("type", "Integer")
+			} else if (val instanceof Double) {
+				j.put("type", "Double")
+			} else if (val instanceof Short) {
+				j.put("type", "Short")
+			} else if (val instanceof Long) {
+				j.put("type", "Long")
+			} else if (val instanceof Date) {
+				j.put("type", "Date")
+			} else {
+				j.put("type", val.class.toString())
+			}
+			vars.put(name, j)
+		}
+		return vars
+	}
+	
+	def JSONObject varlist (Object... args) {
+		return varlist_arr(args)
+	}
+	
+	def JSONObject varlist_episode (String episode, Object... args) {
+		return varlist_arr(args, episode)
+	}
+	
+	def String startProcess(String key, Object... args) {
+		String episodeId = newEpisode(key)
+		
+		JSONObject json = new JSONObject()
+		json.put("variables", varlist_arr(args, episodeId))
+		logger.info("Starting process $key, json " + json.toString())
+		client.create("/process-definition/key/$key/start", json)
+		return episodeId
+	}
+
+	def void message (String messageName, boolean all, Object... corrKeys) {
+		if (corrKeys.length == 0) {
+			message (messageName, null, null, all);
+		} else {
+			message (messageName, varlist_arr(corrKeys), null, all);
+		}
+	}
+	
+	def void message (String messageName, JSONObject corrKeys, JSONObject vars, boolean all = false) {
+		JSONObject json = new JSONObject()
+		json.put("messageName", messageName)
+		if (corrKeys != null) json.put("correlationKeys", corrKeys)
+		if (vars != null) json.put("processVariables", vars)
+		json.put("all", all)
+		client.create("/message", json)
+	}
+}
diff --git a/ncomp-sirius-manager-camunda/src/main/java/.gitignore b/ncomp-sirius-manager-camunda/src/main/java/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/ncomp-sirius-manager-camunda/src/main/java/.gitignore
diff --git a/ncomp-sirius-manager-console/.classpath b/ncomp-sirius-manager-console/.classpath
index 3c48086..c96114d 100644
--- a/ncomp-sirius-manager-console/.classpath
+++ b/ncomp-sirius-manager-console/.classpath
@@ -17,8 +17,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ncomp-sirius-manager-drools"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/ncomp-sirius-manager-console/META-INF/MANIFEST.MF b/ncomp-sirius-manager-console/META-INF/MANIFEST.MF
index 03938de..6e53972 100644
--- a/ncomp-sirius-manager-console/META-INF/MANIFEST.MF
+++ b/ncomp-sirius-manager-console/META-INF/MANIFEST.MF
@@ -6,7 +6,4 @@ Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.ncomp.sirius.manager.console,
  org.openecomp.ncomp.sirius.manager.groovy
 Require-Bundle: org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.emf.ecore;bundle-version="2.10.2",
- ncomp-core-model;bundle-version="0.1.0",
- ncomp-sirius-manager-server;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0"
+ org.eclipse.emf.ecore;bundle-version="2.10.2"
diff --git a/ncomp-sirius-manager-console/src/main/groovy/org/openecomp/ncomp/sirius/manager/console/Console.groovy b/ncomp-sirius-manager-console/src/main/groovy/org/openecomp/ncomp/sirius/manager/console/Console.groovy
index 4f7f038..c36dbfd 100644
--- a/ncomp-sirius-manager-console/src/main/groovy/org/openecomp/ncomp/sirius/manager/console/Console.groovy
+++ b/ncomp-sirius-manager-console/src/main/groovy/org/openecomp/ncomp/sirius/manager/console/Console.groovy
@@ -38,7 +38,7 @@ import static org.openecomp.ncomp.sirius.manager.console.Utils.*
 import static org.openecomp.ncomp.webservice.utils.DateUtils.dateFromString
 
 class Console {
-	protected AbstractClient client
+	public AbstractClient client
 	private String language
 	private String namespace
 	public Console(String filename, String name) {
diff --git a/ncomp-sirius-manager-generator/.classpath b/ncomp-sirius-manager-generator/.classpath
index dafd0e4..d1c4531 100644
--- a/ncomp-sirius-manager-generator/.classpath
+++ b/ncomp-sirius-manager-generator/.classpath
@@ -11,7 +11,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/ncomp-sirius-manager-generator/META-INF/MANIFEST.MF b/ncomp-sirius-manager-generator/META-INF/MANIFEST.MF
index 382ee8e..7da34d7 100644
--- a/ncomp-sirius-manager-generator/META-INF/MANIFEST.MF
+++ b/ncomp-sirius-manager-generator/META-INF/MANIFEST.MF
@@ -4,4 +4,3 @@ Bundle-Name: ncomp-sirius-manager-generator
 Bundle-SymbolicName: ncomp-sirius-manager-generator
 Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.ncomp.sirius.manager.generator
-Require-Bundle: ncomp-sirius-manager-model;bundle-version="0.1.0"
diff --git a/ncomp-sirius-manager-generator/src/main/groovy/org/openecomp/ncomp/sirius/manager/generator/ControllerGenerator.groovy b/ncomp-sirius-manager-generator/src/main/groovy/org/openecomp/ncomp/sirius/manager/generator/ControllerGenerator.groovy
index cf2fd59..49c909d 100644
--- a/ncomp-sirius-manager-generator/src/main/groovy/org/openecomp/ncomp/sirius/manager/generator/ControllerGenerator.groovy
+++ b/ncomp-sirius-manager-generator/src/main/groovy/org/openecomp/ncomp/sirius/manager/generator/ControllerGenerator.groovy
@@ -47,7 +47,8 @@ class ControllerGenerator {
 	String subName
 	String clientName
 	String prefix
-	String type = "R"
+	String type = "R"
+	String version = null
 	ControllerGenerator root;
 	boolean enableDrools = false;
 	boolean enableIRequestHandler = true;
@@ -177,7 +178,8 @@ class ControllerGenerator {
 			packageName : packageName(),
 			cName :       "${m.prefix}${o.eClass().name}$n",
 			fName :       factoryName(),
-			path :        root == this ? "resources" : subName,
+			path :        root == this ? "resources" : subName,
+			version:      version ? "\"$version\"" : "null"
 		  ]
 		  switch (n) {
 			case "Provider": env.cName = "${m.prefix}${o.eClass().name}ProviderTemplate"; break
@@ -215,17 +217,16 @@ class ControllerGenerator {
 		def y = [operations:[:], messages:[dummy:[:]]]
 		EClass c = o.eClass()
 		c.getEAllOperations().each { EOperation op -> 
-			y.operations[op.name] = [:]
-			y.messages[op.name] = [
-				errorCode: "$op.name-FAILED-5001W",
+			y.operations["$c.name@$op.name"] = [:]
+			y.messages["REQUEST-FAILED-$op.name"] = [
+				errorCode: "4001W",
 				messageFormat: "{0}",
 				description: "Operation Failed with Exception"
 			]
 		}
 		c.getEAllOperations().each { EOperation op -> 
-			y.operations["REMOTE_$op.name"] = [decription:"Remote call $op.name"]
-			y.messages["REMOTE_$op.name"] = [
-				errorCode: "REMOTE-$op.name-FAILED-5001W",
+			y.messages["REMOTE-CALL-FAILED-$op.name"] = [
+				errorCode: "4001W",
 				messageFormat: "{0}",
 				description: "Remote Operation Failed with Exception"
 			]
@@ -245,7 +246,8 @@ class ControllerGenerator {
 		g.subName = subpackage
 		g.type = "O"
 		g.enableIRequestHandler = enableIRequestHandler
-		g.enableISiriusPlugin = enableISiriusPlugin
+		g.enableISiriusPlugin = enableISiriusPlugin
+		g.version = version
 		subApis += g
 	}
 	public void addApi(String name, EObject o, ControllerModel m, boolean enableIRequestHandler = false, boolean enableISiriusPlugin = false) {
@@ -254,7 +256,8 @@ class ControllerGenerator {
 		g.subName = name
 		g.type = "A"
 		g.enableIRequestHandler = enableIRequestHandler
-		g.enableISiriusPlugin = enableISiriusPlugin
+		g.enableISiriusPlugin = enableISiriusPlugin
+		g.version = version
 		subApis += g
 	}
 	public void addProvider(String name, EObject o, ControllerModel m) {
@@ -264,6 +267,7 @@ class ControllerGenerator {
 		g.type = "P"
 		g.enableIRequestHandler = false
 		g.enableISiriusPlugin = false
+		g.version = version
 		subApis += g
 	}
 	def subClients = []
@@ -273,7 +277,8 @@ class ControllerGenerator {
 		g.clientName = name
 		g.type = "C"
 		g.enableIRequestHandler = enableIRequestHandler
-		g.enableISiriusPlugin = enableISiriusPlugin
+		g.enableISiriusPlugin = enableISiriusPlugin
+		g.version = version
 		subClients += g
 	}
 	List<String> aliases = new ArrayList<String>();
diff --git a/ncomp-sirius-manager-generator/src/main/templates/Client.java b/ncomp-sirius-manager-generator/src/main/templates/Client.java
index 4b38e94..fb47b3c 100644
--- a/ncomp-sirius-manager-generator/src/main/templates/Client.java
+++ b/ncomp-sirius-manager-generator/src/main/templates/Client.java
@@ -32,6 +32,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -57,17 +59,20 @@ public class ${cName} extends ${name}Impl {
 		${prefix}${g.root.o.eClass().name}.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/$path", this);
+		client.setVersion($version);
 	}
 
 	public ${cName}(String file, String name1, String name2) {
 		HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
 		client = client1.all; // requests should be forwarded to all.
 		client.add("/$path", this);
+		client.setVersion($version);
 	}
 	
 	public ${cName}(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion($version);
 	}
 
 
@@ -107,16 +112,17 @@ public class ${cName} extends ${name}Impl {
 %>
 	$override
 	public ${rType} ${op.name}(${StringUtil.join(decl, ", ")}) {
-		EClass c = ${g.packageName2()}.eINSTANCE.get${g.o.eClass().name}(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(${name}OperationEnum.REMOTE_${op.name});
+		EClass c = ${g.packageName2()}.eINSTANCE.get${g.o.eClass().name}(); 
+		ecomplogger.recordMetricEventStart(${name}OperationEnum.${name}_${op.name},client.getRemote());
 		$decl1
 		try {
 		  ${decl2}client.operationPath($path1, c, "${op.name}", $timeout<% if (vars.size()>0) {%>, <%}%>${StringUtil.join(vars,",")});
 		}
 		catch (Exception e) {
-			ecomplogger.warn(${name}MessageEnum.REMOTE_${op.name}, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@$op.name: " + e);
+			ecomplogger.warn(${name}MessageEnum.REMOTE_CALL_FAILED_${op.name}, e.toString());
+			EcompException e1 = EcompException.create(${name}MessageEnum.REMOTE_CALL_FAILED_${op.name},e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,${name}MessageEnum.REMOTE_CALL_FAILED_${op.name},e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		${ret}
diff --git a/ncomp-sirius-manager-generator/src/main/templates/Controller.java b/ncomp-sirius-manager-generator/src/main/templates/Controller.java
index 903dde0..3020f86 100644
--- a/ncomp-sirius-manager-generator/src/main/templates/Controller.java
+++ b/ncomp-sirius-manager-generator/src/main/templates/Controller.java
@@ -36,13 +36,13 @@ package $packageName;
 
 
 
-
 import java.io.InputStream;
 
 import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
 import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
 import org.openecomp.ncomp.sirius.function.FunctionUtils;
@@ -50,7 +50,9 @@ import org.openecomp.ncomp.component.ApiRequestStatus;
 
 import org.apache.log4j.Logger;
 
-import org.openecomp.logger.EcompLogger;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
@@ -94,7 +96,7 @@ import $n;
 import ${p.nsURI}.impl.${name}Impl;
 
 <%
-  def l = []
+  def l = ["ISiriusProvider"]
   if (g.enableIRequestHandler) l += "IRequestHandler"
   if (g.enableISwaggerHandler) l += "ISwaggerHandler"
   if (g.enableISiriusPlugin) l += "ISiriusPlugin"
@@ -103,7 +105,7 @@ import ${p.nsURI}.impl.${name}Impl;
 
 public class ${cName} extends ${name}Impl${implements1} {
 	public static final Logger logger = Logger.getLogger(${cName}.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public ${prefix}${name}Provider controller;
 	ISiriusServer server;
 
@@ -134,9 +136,8 @@ public class ${cName} extends ${name}Impl${implements1} {
 		if (server != null)
 			server.getServer().recordApi(null, this, "${op.name}", ApiRequestStatus.START, ${StringUtil.join(vars1,",")});
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(${name}OperationEnum.${op.name});
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(${name}OperationEnum.${name}_${op.name},server,this);
+		ecomplogger.recordMetricEventStart(${name}OperationEnum.${name}_${op.name},"self:" + ManagementServer.object2ref(this));
 		try {
 			$assign controller.${op.name}(${StringUtil.join(vars,",")});
 		}
@@ -145,8 +146,10 @@ public class ${cName} extends ${name}Impl${implements1} {
 			if (server != null)
 				server.getServer().recordApi(null, this, "${op.name}", ApiRequestStatus.ERROR, ${StringUtil.join(vars1,",")});
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(${name}MessageEnum.${op.name}, e.toString());
-			throw e;
+			ecomplogger.warn(${name}MessageEnum.REQUEST_FAILED_${op.name}, e.toString());
+			EcompException e1 =  EcompException.create(${name}MessageEnum.REQUEST_FAILED_${op.name},e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ${name}MessageEnum.REQUEST_FAILED_${op.name}, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -158,8 +161,8 @@ public class ${cName} extends ${name}Impl${implements1} {
 
 <% if (g.enableIRequestHandler) { %>
 	@Override
-	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context) {
-		return controller.handleJson(userName,action,resourcePath,json,context);
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context, String clientVersion) {
+		return controller.handleJson(userName,action,resourcePath,json,context,clientVersion);
 	}
 
 	@Override
@@ -185,7 +188,7 @@ public void updateSwagger(String path, SwaggerUtils swagger) {
 	public static void ecoreSetup() {
 		${prefix}${name}Provider.ecoreSetup();
 	}
-	public ${prefix}${name}Provider getSomfProvider() {
+	public ${prefix}${name}Provider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/ncomp-sirius-manager-generator/src/main/templates/Provider.java b/ncomp-sirius-manager-generator/src/main/templates/Provider.java
index 6113401..a5bd5c3 100644
--- a/ncomp-sirius-manager-generator/src/main/templates/Provider.java
+++ b/ncomp-sirius-manager-generator/src/main/templates/Provider.java
@@ -150,7 +150,7 @@ public class ${cName} extends ${provider} {
 	}
 <% } %>
 <% if (g.enableIRequestHandler) { %>
-public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context) {
+public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context, String clientVersion) {
 		// TODO Auto-generated method stub
 		return null;
 	}
diff --git a/ncomp-sirius-manager-generator/src/main/templates/Server.java b/ncomp-sirius-manager-generator/src/main/templates/Server.java
index 638a9ab..b8bd81a 100644
--- a/ncomp-sirius-manager-generator/src/main/templates/Server.java
+++ b/ncomp-sirius-manager-generator/src/main/templates/Server.java
@@ -26,17 +26,16 @@ package $packageName;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Properties;
 import java.util.TimeZone;
 
 import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EFactory;
-
-import org.openecomp.entity.EcompComponent;
-import org.openecomp.entity.EcompSubComponent;
-import org.openecomp.entity.EcompSubComponentInstance;
+import org.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import ${p.nsURI}.${name};
@@ -55,7 +54,7 @@ import ${api.packageName()}.${prefix}${api.o.eClass().name}Client;
 <% } %>
 
 
-public class $cName implements ISiriusServer {
+public class $cName implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(${cName}.class);
     String serverPath;
     ManagementServer server;
@@ -82,6 +81,7 @@ public class $cName implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "${name}", serverPath, filename);
+        ManagementServer.setBuildVersion($version);
         server.addFactory(f);
 <% g.factories.each { factory -> 
   if (g.useNew[factory]) { %>    
@@ -97,6 +97,7 @@ public class $cName implements ISiriusServer {
         controller = (${prefix}${name}) server.find("/").o;
         webServer = new Jetty8Server("${nsPrefix}.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 <% g.aliases.each { %>   
 		webServer.add("$it",controller);
 <%}%>
@@ -132,4 +133,17 @@ public class $cName implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/ncomp-sirius-manager-model/.classpath b/ncomp-sirius-manager-model/.classpath
index 217427e..a31e468 100644
--- a/ncomp-sirius-manager-model/.classpath
+++ b/ncomp-sirius-manager-model/.classpath
@@ -1,12 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/xcore"/>
-	<classpathentry kind="src" path="src/main/xcore-gen"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/xcore">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/xcore-gen">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/ncomp-sirius-manager-model/.project b/ncomp-sirius-manager-model/.project
index 34f1e37..297fa9c 100644
--- a/ncomp-sirius-manager-model/.project
+++ b/ncomp-sirius-manager-model/.project
@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/ncomp-sirius-manager-model/.settings/org.eclipse.core.resources.prefs b/ncomp-sirius-manager-model/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..447ff97
--- /dev/null
+++ b/ncomp-sirius-manager-model/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/xcore=UTF-8
+encoding//src/main/xcore-gen=UTF-8
+encoding/<project>=UTF-8
diff --git a/ncomp-sirius-manager-model/META-INF/MANIFEST.MF b/ncomp-sirius-manager-model/META-INF/MANIFEST.MF
index 50eac37..27c85cf 100644
--- a/ncomp-sirius-manager-model/META-INF/MANIFEST.MF
+++ b/ncomp-sirius-manager-model/META-INF/MANIFEST.MF
@@ -7,7 +7,10 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.openecomp.ncomp.sirius.manager.controllermodel,
+Export-Package: org.openecomp.ncomp.gwt.siriusportal.model,
+ org.openecomp.ncomp.gwt.siriusportal.model.impl,
+ org.openecomp.ncomp.gwt.siriusportal.model.util,
+ org.openecomp.ncomp.sirius.manager.controllermodel,
  org.openecomp.ncomp.sirius.manager.controllermodel.impl,
  org.openecomp.ncomp.sirius.manager.controllermodel.util,
  org.openecomp.ncomp.sirius.manager.graph,
@@ -17,22 +20,17 @@ Export-Package: org.openecomp.ncomp.sirius.manager.controllermodel,
  org.openecomp.ncomp.sirius.manager.server,
  org.openecomp.ncomp.sirius.manager.server.impl,
  org.openecomp.ncomp.sirius.manager.server.util,
- org.openecomp.ncomp.sirius.manager.tableTemplate,
- org.openecomp.ncomp.sirius.manager.tableTemplate.impl,
- org.openecomp.ncomp.sirius.manager.tableTemplate.util,
- org.openecomp.ncomp.gwt.siriusportal.model,
- org.openecomp.ncomp.gwt.siriusportal.model.impl,
- org.openecomp.ncomp.gwt.siriusportal.model.util,
  org.openecomp.ncomp.sirius.manager.swagger,
  org.openecomp.ncomp.sirius.manager.swagger.impl,
- org.openecomp.ncomp.sirius.manager.swagger.util
+ org.openecomp.ncomp.sirius.manager.swagger.util,
+ org.openecomp.ncomp.sirius.manager.tableTemplate,
+ org.openecomp.ncomp.sirius.manager.tableTemplate.impl,
+ org.openecomp.ncomp.sirius.manager.tableTemplate.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.emf.ecore.xcore.lib,
- org.eclipse.xtext;bundle-version="2.7.3",
- ncomp-utils-java;bundle-version="0.1.0",
- ncomp-core-types;bundle-version="0.1.0",
- ncomp-core-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-sirius-manager-model;visibility:=reexport
+ ncomp-core-model;visibility:=reexport,
+ ncomp-sirius-manager-model;visibility:=reexport,
+ org.eclipse.xtext;bundle-version="2.7.3"
 Bundle-ActivationPolicy: lazy
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiDiagram.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiDiagram.java
index 1af84bd..0dbd919 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiDiagram.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiDiagram.java
@@ -34,10 +34,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiDiagram#getItems <em>Items</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiDiagram()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiDiagramItem.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiDiagramItem.java
index ac96d5e..cb74b71 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiDiagramItem.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiDiagramItem.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiDiagramItem#getTooltip <em>Tooltip</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiDiagramItem()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiDiagramRectangle.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiDiagramRectangle.java
index 02375b8..78c9d4e 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiDiagramRectangle.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiDiagramRectangle.java
@@ -31,13 +31,13 @@ package org.openecomp.ncomp.gwt.siriusportal.model;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiDiagramRectangle#getX <em>X</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiDiagramRectangle#getY <em>Y</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiDiagramRectangle#getH <em>H</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiDiagramRectangle#getW <em>W</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiDiagramRectangle()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiHtml.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiHtml.java
index 8fae87a..f00b8e2 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiHtml.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiHtml.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml#getHtml <em>Html</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiHtml()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiNamedObject.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiNamedObject.java
index c3d6ea4..622a220 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiNamedObject.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiNamedObject.java
@@ -31,10 +31,10 @@ package org.openecomp.ncomp.gwt.siriusportal.model;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiNamedObject#getObjectName <em>Object Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiNamedObject()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObject.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObject.java
index 04d3e3d..3ab1e7d 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObject.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObject.java
@@ -34,10 +34,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiObject#getValues <em>Values</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiObject()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectNamedList.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectNamedList.java
index 35295c5..1300de8 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectNamedList.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectNamedList.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiObjectNamedList#getObjects <em>Objects</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiObjectNamedList()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectUnNamedList.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectUnNamedList.java
index 11500a5..d7919fa 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectUnNamedList.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectUnNamedList.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiObjectUnNamedList#getObjects <em>Objects</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiObjectUnNamedList()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValue.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValue.java
index bf85426..ff5cfec 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValue.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValue.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiObjectValue#getValueName <em>Value Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiObjectValue#getTooltip <em>Tooltip</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiObjectValue()
  * @model abstract="true"
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueInteger.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueInteger.java
index 78c478e..8316af5 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueInteger.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueInteger.java
@@ -31,10 +31,10 @@ package org.openecomp.ncomp.gwt.siriusportal.model;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiObjectValueInteger#getI <em>I</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiObjectValueInteger()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueObject.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueObject.java
index 29841d5..5956bc1 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueObject.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueObject.java
@@ -31,10 +31,10 @@ package org.openecomp.ncomp.gwt.siriusportal.model;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiObjectValueObject#getV <em>V</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiObjectValueObject()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueReference.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueReference.java
index 289bd94..47237ba 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueReference.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueReference.java
@@ -31,10 +31,10 @@ package org.openecomp.ncomp.gwt.siriusportal.model;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiObjectValueReference#getPath <em>Path</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiObjectValueReference()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueString.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueString.java
index 66f8d1d..db73454 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueString.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueString.java
@@ -31,10 +31,10 @@ package org.openecomp.ncomp.gwt.siriusportal.model;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiObjectValueString#getV <em>V</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiObjectValueString()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueTimeSeries.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueTimeSeries.java
index 7e0beb6..f3b5be8 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueTimeSeries.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiObjectValueTimeSeries.java
@@ -31,10 +31,10 @@ package org.openecomp.ncomp.gwt.siriusportal.model;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiObjectValueTimeSeries#getPath <em>Path</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiObjectValueTimeSeries()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTable.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTable.java
index 2874f08..b8765f8 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTable.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTable.java
@@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTable#getColumns <em>Columns</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTable#getRows <em>Rows</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiTable()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCell.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCell.java
index 1812f3e..b4342af 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCell.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCell.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTableCell#getTooltip <em>Tooltip</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiTableCell()
  * @model abstract="true"
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellDate.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellDate.java
index b2f44d1..fe1a89d 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellDate.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellDate.java
@@ -32,10 +32,10 @@ import java.util.Date;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTableCellDate#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiTableCellDate()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellDouble.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellDouble.java
index 78e61c8..9beff69 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellDouble.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellDouble.java
@@ -31,11 +31,11 @@ package org.openecomp.ncomp.gwt.siriusportal.model;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTableCellDouble#getValue <em>Value</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTableCellDouble#getTimeseriesPath <em>Timeseries Path</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiTableCellDouble()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellReference.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellReference.java
index 5a42dd3..e14121e 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellReference.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellReference.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTableCellReference#getLabel <em>Label</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTableCellReference#getPath <em>Path</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiTableCellReference()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellReferences.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellReferences.java
index 0f01cfb..8d8ed4f 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellReferences.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellReferences.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTableCellReferences#getRefs <em>Refs</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiTableCellReferences()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellString.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellString.java
index 0a5dd76..55befe2 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellString.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableCellString.java
@@ -31,10 +31,10 @@ package org.openecomp.ncomp.gwt.siriusportal.model;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTableCellString#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiTableCellString()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableColumn.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableColumn.java
index 3ebafc9..7828e0f 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableColumn.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableColumn.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTableColumn#getColName <em>Col Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTableColumn#getTooltip <em>Tooltip</em>}</li>
@@ -40,7 +41,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTableColumn#isHidden <em>Hidden</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTableColumn#getColumnType <em>Column Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiTableColumn()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableColumnType.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableColumnType.java
index a19d9bb..654d4d7 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableColumnType.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableColumnType.java
@@ -165,6 +165,8 @@ public enum GuiTableColumnType implements Enumerator {
 	 * Returns the '<em><b>Gui Table Column Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static GuiTableColumnType get(String literal) {
@@ -181,6 +183,8 @@ public enum GuiTableColumnType implements Enumerator {
 	 * Returns the '<em><b>Gui Table Column Type</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static GuiTableColumnType getByName(String name) {
@@ -197,6 +201,8 @@ public enum GuiTableColumnType implements Enumerator {
 	 * Returns the '<em><b>Gui Table Column Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static GuiTableColumnType get(int value) {
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableRow.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableRow.java
index 7a00276..4a02819 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableRow.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTableRow.java
@@ -34,10 +34,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTableRow#getCells <em>Cells</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiTableRow()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTimeSerie.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTimeSerie.java
index 7a2ddbe..6a3f43f 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTimeSerie.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTimeSerie.java
@@ -36,6 +36,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie#getXAxisLabel <em>XAxis Label</em>}</li>
@@ -46,7 +47,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie#isIsRate <em>Is Rate</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie#getData <em>Data</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiTimeSerie()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTimeSerieData.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTimeSerieData.java
index 18b54cd..1cba82c 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTimeSerieData.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTimeSerieData.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerieData#getTime <em>Time</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerieData#getValue <em>Value</em>}</li>
@@ -41,7 +42,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerieData#getMin <em>Min</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerieData#getNum <em>Num</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiTimeSerieData()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTree.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTree.java
index e9c39aa..13237e7 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTree.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTree.java
@@ -34,10 +34,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTree#getSections <em>Sections</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiTree()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTreeNode.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTreeNode.java
index 0a2149e..3b60c50 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTreeNode.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiTreeNode.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTreeNode#getNodeName <em>Node Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTreeNode#getTitle <em>Title</em>}</li>
@@ -42,7 +43,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTreeNode#getView <em>View</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.GuiTreeNode#getChildren <em>Children</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage#getGuiTreeNode()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiView.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiView.java
index 2bc0f15..b31aee9 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiView.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/GuiView.java
@@ -217,6 +217,8 @@ public enum GuiView implements Enumerator {
 	 * Returns the '<em><b>Gui View</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static GuiView get(String literal) {
@@ -233,6 +235,8 @@ public enum GuiView implements Enumerator {
 	 * Returns the '<em><b>Gui View</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static GuiView getByName(String name) {
@@ -249,6 +253,8 @@ public enum GuiView implements Enumerator {
 	 * Returns the '<em><b>Gui View</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static GuiView get(int value) {
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/ModelPackage.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/ModelPackage.java
index b03f245..c476bde 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/ModelPackage.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/ModelPackage.java
@@ -43,6 +43,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.ncomp.gwt.siriusportal.model.ModelFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-sirius-manager-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.gwt.siriusportal'"
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiClientApiImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiClientApiImpl.java
index d732717..aee078a 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiClientApiImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiClientApiImpl.java
@@ -45,8 +45,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Gui Client Api</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiDiagramImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiDiagramImpl.java
index 288d68f..3c5ce62 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiDiagramImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiDiagramImpl.java
@@ -47,10 +47,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiDiagramImpl#getItems <em>Items</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiDiagramItemImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiDiagramItemImpl.java
index 9671459..d3f4864 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiDiagramItemImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiDiagramItemImpl.java
@@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiDiagramItemImpl#getTooltip <em>Tooltip</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiDiagramRectangleImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiDiagramRectangleImpl.java
index c260ed5..6484e29 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiDiagramRectangleImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiDiagramRectangleImpl.java
@@ -38,13 +38,13 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiDiagramRectangleImpl#getX <em>X</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiDiagramRectangleImpl#getY <em>Y</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiDiagramRectangleImpl#getH <em>H</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiDiagramRectangleImpl#getW <em>W</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiHtmlImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiHtmlImpl.java
index 10430c7..14f2fa8 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiHtmlImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiHtmlImpl.java
@@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiHtmlImpl#getHtml <em>Html</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiNamedObjectImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiNamedObjectImpl.java
index 13b1ffd..9c180bc 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiNamedObjectImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiNamedObjectImpl.java
@@ -38,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiNamedObjectImpl#getObjectName <em>Object Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectImpl.java
index 2aabc3b..99db364 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectImpl.java
@@ -47,10 +47,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiObjectImpl#getValues <em>Values</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectNamedListImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectNamedListImpl.java
index 95b3aa8..729cf59 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectNamedListImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectNamedListImpl.java
@@ -45,10 +45,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiObjectNamedListImpl#getObjects <em>Objects</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectUnNamedListImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectUnNamedListImpl.java
index b10ad2a..869384f 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectUnNamedListImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectUnNamedListImpl.java
@@ -45,10 +45,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiObjectUnNamedListImpl#getObjects <em>Objects</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueImpl.java
index 3b0878d..a8982aa 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiObjectValueImpl#getValueName <em>Value Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiObjectValueImpl#getTooltip <em>Tooltip</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueIntegerImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueIntegerImpl.java
index 357cd4c..1a562d5 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueIntegerImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueIntegerImpl.java
@@ -38,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiObjectValueIntegerImpl#getI <em>I</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueObjectImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueObjectImpl.java
index 6f3606d..91a36ca 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueObjectImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueObjectImpl.java
@@ -41,10 +41,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiObjectValueObjectImpl#getV <em>V</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueReferenceImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueReferenceImpl.java
index 71e7c05..ce02fda 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueReferenceImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueReferenceImpl.java
@@ -38,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiObjectValueReferenceImpl#getPath <em>Path</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueStringImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueStringImpl.java
index 9c8db1c..75b3247 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueStringImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueStringImpl.java
@@ -38,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiObjectValueStringImpl#getV <em>V</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueTimeSeriesImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueTimeSeriesImpl.java
index 897f299..103f51c 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueTimeSeriesImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiObjectValueTimeSeriesImpl.java
@@ -38,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiObjectValueTimeSeriesImpl#getPath <em>Path</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellDateImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellDateImpl.java
index 8620380..2c6c07c 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellDateImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellDateImpl.java
@@ -40,10 +40,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableCellDateImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellDoubleImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellDoubleImpl.java
index 86092e6..49f2fe9 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellDoubleImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellDoubleImpl.java
@@ -38,11 +38,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableCellDoubleImpl#getValue <em>Value</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableCellDoubleImpl#getTimeseriesPath <em>Timeseries Path</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellImpl.java
index 1fcc803..e9a2e4b 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellImpl.java
@@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableCellImpl#getTooltip <em>Tooltip</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellReferenceImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellReferenceImpl.java
index 539de91..812764c 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellReferenceImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellReferenceImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableCellReferenceImpl#getLabel <em>Label</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableCellReferenceImpl#getPath <em>Path</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellReferencesImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellReferencesImpl.java
index 26a1374..0214c28 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellReferencesImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellReferencesImpl.java
@@ -45,10 +45,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableCellReferencesImpl#getRefs <em>Refs</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellStringImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellStringImpl.java
index 8f399e4..1170077 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellStringImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableCellStringImpl.java
@@ -38,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableCellStringImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableColumnImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableColumnImpl.java
index a8c2c4a..d00be8d 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableColumnImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableColumnImpl.java
@@ -40,6 +40,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableColumnImpl#getColName <em>Col Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableColumnImpl#getTooltip <em>Tooltip</em>}</li>
@@ -48,7 +49,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableColumnImpl#isHidden <em>Hidden</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableColumnImpl#getColumnType <em>Column Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableImpl.java
index fcabac8..f177944 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableImpl.java
@@ -48,11 +48,11 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableImpl#getColumns <em>Columns</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableImpl#getRows <em>Rows</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableRowImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableRowImpl.java
index 74757a8..f2b9123 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableRowImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTableRowImpl.java
@@ -47,10 +47,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTableRowImpl#getCells <em>Cells</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTimeSerieDataImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTimeSerieDataImpl.java
index bedbee7..5c8e59b 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTimeSerieDataImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTimeSerieDataImpl.java
@@ -41,6 +41,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTimeSerieDataImpl#getTime <em>Time</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTimeSerieDataImpl#getValue <em>Value</em>}</li>
@@ -48,7 +49,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTimeSerieDataImpl#getMin <em>Min</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTimeSerieDataImpl#getNum <em>Num</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTimeSerieImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTimeSerieImpl.java
index b4fb472..74668fb 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTimeSerieImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTimeSerieImpl.java
@@ -50,6 +50,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTimeSerieImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTimeSerieImpl#getXAxisLabel <em>XAxis Label</em>}</li>
@@ -60,7 +61,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTimeSerieImpl#isIsRate <em>Is Rate</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTimeSerieImpl#getData <em>Data</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTreeImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTreeImpl.java
index 89b8b27..25dd241 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTreeImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTreeImpl.java
@@ -47,10 +47,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTreeImpl#getSections <em>Sections</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTreeNodeImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTreeNodeImpl.java
index 2cb1786..b125161 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTreeNodeImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/impl/GuiTreeNodeImpl.java
@@ -49,6 +49,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTreeNodeImpl#getNodeName <em>Node Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTreeNodeImpl#getTitle <em>Title</em>}</li>
@@ -57,7 +58,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTreeNodeImpl#getView <em>View</em>}</li>
  *   <li>{@link org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiTreeNodeImpl#getChildren <em>Children</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/util/ModelSwitch.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/util/ModelSwitch.java
index cd6aa77..5c2b754 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/util/ModelSwitch.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/gwt/siriusportal/model/util/ModelSwitch.java
@@ -68,7 +68,7 @@ public class ModelSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/ControllerModel.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/ControllerModel.java
index 3301abc..18d14b3 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/ControllerModel.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/ControllerModel.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.controllermodel.ControllerModel#getTemplateDirectory <em>Template Directory</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.controllermodel.ControllerModel#getPluginName <em>Plugin Name</em>}</li>
@@ -39,7 +40,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.controllermodel.ControllerModel#getTitle <em>Title</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.controllermodel.ControllerModel#getPrefix <em>Prefix</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.controllermodel.ControllermodelPackage#getControllerModel()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/ControllermodelPackage.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/ControllermodelPackage.java
index dde38a7..e4fc35b 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/ControllermodelPackage.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/ControllermodelPackage.java
@@ -39,6 +39,24 @@ import org.eclipse.emf.ecore.EPackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.ncomp.sirius.manager.controllermodel.ControllermodelFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-sirius-manager-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.sirius.manager'"
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/impl/ControllerModelImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/impl/ControllerModelImpl.java
index f948d13..098fcdf 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/impl/ControllerModelImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/impl/ControllerModelImpl.java
@@ -39,6 +39,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.controllermodel.impl.ControllerModelImpl#getTemplateDirectory <em>Template Directory</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.controllermodel.impl.ControllerModelImpl#getPluginName <em>Plugin Name</em>}</li>
@@ -46,7 +47,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.controllermodel.impl.ControllerModelImpl#getTitle <em>Title</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.controllermodel.impl.ControllerModelImpl#getPrefix <em>Prefix</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/util/ControllermodelSwitch.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/util/ControllermodelSwitch.java
index 03f3528..d2a6bd8 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/util/ControllermodelSwitch.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/controllermodel/util/ControllermodelSwitch.java
@@ -68,7 +68,7 @@ public class ControllermodelSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GraphPackage.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GraphPackage.java
index 68f61a1..d66d9a5 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GraphPackage.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GraphPackage.java
@@ -40,6 +40,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.ncomp.sirius.manager.graph.GraphFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-sirius-manager-model/src/main/xcore-gen' updateClasspath='false' basePackage='org.openecomp.ncomp.sirius.manager'"
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraph.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraph.java
index c303295..79621cd 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraph.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraph.java
@@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.GuiGraph#getNodes <em>Nodes</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.GuiGraph#getEdges <em>Edges</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.graph.GraphPackage#getGuiGraph()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraphEdge.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraphEdge.java
index 3de2df3..521f445 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraphEdge.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraphEdge.java
@@ -31,11 +31,11 @@ package org.openecomp.ncomp.sirius.manager.graph;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.GuiGraphEdge#getX <em>X</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.GuiGraphEdge#getY <em>Y</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.graph.GraphPackage#getGuiGraphEdge()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraphItem.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraphItem.java
index 7df3873..0b44892 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraphItem.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraphItem.java
@@ -32,12 +32,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.GuiGraphItem#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.GuiGraphItem#getTooltip <em>Tooltip</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.GuiGraphItem#getUrl <em>Url</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.graph.GraphPackage#getGuiGraphItem()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraphNode.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraphNode.java
index 44ce312..245c3bf 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraphNode.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/GuiGraphNode.java
@@ -31,13 +31,13 @@ package org.openecomp.ncomp.sirius.manager.graph;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.GuiGraphNode#getX <em>X</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.GuiGraphNode#getY <em>Y</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.GuiGraphNode#getH <em>H</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.GuiGraphNode#getW <em>W</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.graph.GraphPackage#getGuiGraphNode()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphEdgeImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphEdgeImpl.java
index 0a1c680..69b5d54 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphEdgeImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphEdgeImpl.java
@@ -40,11 +40,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.impl.GuiGraphEdgeImpl#getX <em>X</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.impl.GuiGraphEdgeImpl#getY <em>Y</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphImpl.java
index 7f52720..fb65edc 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphImpl.java
@@ -48,11 +48,11 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.impl.GuiGraphImpl#getNodes <em>Nodes</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.impl.GuiGraphImpl#getEdges <em>Edges</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphItemImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphItemImpl.java
index e6c1fb3..6e64dc7 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphItemImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphItemImpl.java
@@ -39,12 +39,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.impl.GuiGraphItemImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.impl.GuiGraphItemImpl#getTooltip <em>Tooltip</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.impl.GuiGraphItemImpl#getUrl <em>Url</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphNodeImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphNodeImpl.java
index 431c294..4a1b18f 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphNodeImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/impl/GuiGraphNodeImpl.java
@@ -38,13 +38,13 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.impl.GuiGraphNodeImpl#getX <em>X</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.impl.GuiGraphNodeImpl#getY <em>Y</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.impl.GuiGraphNodeImpl#getH <em>H</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.graph.impl.GuiGraphNodeImpl#getW <em>W</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/util/GraphSwitch.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/util/GraphSwitch.java
index db66b0f..0cacaba 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/util/GraphSwitch.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/graph/util/GraphSwitch.java
@@ -68,7 +68,7 @@ public class GraphSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/Module.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/Module.java
index 2cf8f90..4cff325 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/Module.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/Module.java
@@ -34,11 +34,11 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.Module#getVersion <em>Version</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.Module#getSubModules <em>Sub Modules</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.properties.PropertiesPackage#getModule()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/ModuleContainer.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/ModuleContainer.java
index ec990db..09030c3 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/ModuleContainer.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/ModuleContainer.java
@@ -34,10 +34,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.ModuleContainer#getModules <em>Modules</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.properties.PropertiesPackage#getModuleContainer()
  * @model abstract="true"
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/PropertiesPackage.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/PropertiesPackage.java
index 5f1bef1..91be13e 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/PropertiesPackage.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/PropertiesPackage.java
@@ -42,6 +42,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.ncomp.sirius.manager.properties.PropertiesFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-sirius-manager-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.sirius.manager'"
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/Property.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/Property.java
index e716bec..e6516bc 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/Property.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/Property.java
@@ -31,11 +31,11 @@ package org.openecomp.ncomp.sirius.manager.properties;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.Property#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.Property#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.properties.PropertiesPackage#getProperty()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/AbstractPropertyImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/AbstractPropertyImpl.java
index 78243fd..1117074 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/AbstractPropertyImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/AbstractPropertyImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Abstract Property</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/ModuleContainerImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/ModuleContainerImpl.java
index b4451f0..cd341d0 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/ModuleContainerImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/ModuleContainerImpl.java
@@ -47,10 +47,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.impl.ModuleContainerImpl#getModules <em>Modules</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/ModuleImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/ModuleImpl.java
index e5d7536..0332f79 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/ModuleImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/ModuleImpl.java
@@ -49,11 +49,11 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.impl.ModuleImpl#getVersion <em>Version</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.impl.ModuleImpl#getSubModules <em>Sub Modules</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/ModulePropertyImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/ModulePropertyImpl.java
index 82e3a9f..87c1b30 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/ModulePropertyImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/ModulePropertyImpl.java
@@ -52,6 +52,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.impl.ModulePropertyImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.impl.ModulePropertyImpl#getLastPolled <em>Last Polled</em>}</li>
@@ -60,7 +61,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.impl.ModulePropertyImpl#getVersion <em>Version</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.impl.ModulePropertyImpl#getSubModules <em>Sub Modules</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/PropertyImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/PropertyImpl.java
index 08df14f..84ef072 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/PropertyImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/impl/PropertyImpl.java
@@ -38,11 +38,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.impl.PropertyImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.properties.impl.PropertyImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/util/PropertiesSwitch.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/util/PropertiesSwitch.java
index e67e811..fdca8f3 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/util/PropertiesSwitch.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/properties/util/PropertiesSwitch.java
@@ -70,7 +70,7 @@ public class PropertiesSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AbstractManagementServer.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AbstractManagementServer.java
index 853c2eb..7b1fe86 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AbstractManagementServer.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AbstractManagementServer.java
@@ -39,14 +39,14 @@ import org.json.JSONObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer#getConfiguration <em>Configuration</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer#getComponent <em>Component</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getAbstractManagementServer()
- * @model
+ * @model abstract="true"
  * @generated
  */
 public interface AbstractManagementServer extends SouthBoundApiWithProxy {
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AbstractManagementServerConfiguration.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AbstractManagementServerConfiguration.java
index 347dacf..ff9f586 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AbstractManagementServerConfiguration.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AbstractManagementServerConfiguration.java
@@ -38,14 +38,15 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerConfiguration#getRules <em>Rules</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerConfiguration#getMetricOptions <em>Metric Options</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerConfiguration#getTableTemplates <em>Table Templates</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerConfiguration#getAlertTemplates <em>Alert Templates</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerConfiguration#getFunctions <em>Functions</em>}</li>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerConfiguration#getVersion <em>Version</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getAbstractManagementServerConfiguration()
  * @model
@@ -132,4 +133,30 @@ public interface AbstractManagementServerConfiguration extends ModuleContainer {
 	 */
 	EList<Function> getFunctions();
 
+	/**
+	 * Returns the value of the '<em><b>Version</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Version</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Version</em>' containment reference.
+	 * @see #setVersion(VersionConfiguration)
+	 * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getAbstractManagementServerConfiguration_Version()
+	 * @model containment="true"
+	 * @generated
+	 */
+	VersionConfiguration getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerConfiguration#getVersion <em>Version</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Version</em>' containment reference.
+	 * @see #getVersion()
+	 * @generated
+	 */
+	void setVersion(VersionConfiguration value);
+
 } // AbstractManagementServerConfiguration
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AbstractManagementServerVersionConfiguration.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AbstractManagementServerVersionConfiguration.java
new file mode 100644
index 0000000..238ff9b
--- /dev/null
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AbstractManagementServerVersionConfiguration.java
@@ -0,0 +1,77 @@
+/**
+ */
+package org.openecomp.ncomp.sirius.manager.server;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Management Server Version Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerVersionConfiguration#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerVersionConfiguration#getTranslationHandler <em>Translation Handler</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getAbstractManagementServerVersionConfiguration()
+ * @model
+ * @generated
+ */
+public interface AbstractManagementServerVersionConfiguration extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Version</em>' attribute.
+	 * @see #setVersion(String)
+	 * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getAbstractManagementServerVersionConfiguration_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerVersionConfiguration#getVersion <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Version</em>' attribute.
+	 * @see #getVersion()
+	 * @generated
+	 */
+	void setVersion(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Translation Handler</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Translation Handler</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Translation Handler</em>' attribute.
+	 * @see #setTranslationHandler(String)
+	 * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getAbstractManagementServerVersionConfiguration_TranslationHandler()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getTranslationHandler();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerVersionConfiguration#getTranslationHandler <em>Translation Handler</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Translation Handler</em>' attribute.
+	 * @see #getTranslationHandler()
+	 * @generated
+	 */
+	void setTranslationHandler(String value);
+
+} // AbstractManagementServerVersionConfiguration
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AttributeTranslationStep.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AttributeTranslationStep.java
new file mode 100644
index 0000000..2e64f97
--- /dev/null
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/AttributeTranslationStep.java
@@ -0,0 +1,103 @@
+/**
+ */
+package org.openecomp.ncomp.sirius.manager.server;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Attribute Translation Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep#getAttribute <em>Attribute</em>}</li>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep#getCurrentValue <em>Current Value</em>}</li>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep#getOldValue <em>Old Value</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getAttributeTranslationStep()
+ * @model
+ * @generated
+ */
+public interface AttributeTranslationStep extends VersionTranslationStep {
+	/**
+	 * Returns the value of the '<em><b>Attribute</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Attribute</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Attribute</em>' attribute.
+	 * @see #setAttribute(String)
+	 * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getAttributeTranslationStep_Attribute()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAttribute();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep#getAttribute <em>Attribute</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Attribute</em>' attribute.
+	 * @see #getAttribute()
+	 * @generated
+	 */
+	void setAttribute(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Current Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Current Value</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Current Value</em>' attribute.
+	 * @see #setCurrentValue(String)
+	 * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getAttributeTranslationStep_CurrentValue()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getCurrentValue();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep#getCurrentValue <em>Current Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Current Value</em>' attribute.
+	 * @see #getCurrentValue()
+	 * @generated
+	 */
+	void setCurrentValue(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Old Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Old Value</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Old Value</em>' attribute.
+	 * @see #setOldValue(String)
+	 * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getAttributeTranslationStep_OldValue()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getOldValue();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep#getOldValue <em>Old Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Old Value</em>' attribute.
+	 * @see #getOldValue()
+	 * @generated
+	 */
+	void setOldValue(String value);
+
+} // AttributeTranslationStep
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/LoggerInfo.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/LoggerInfo.java
index 20db441..39bb3af 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/LoggerInfo.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/LoggerInfo.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.LoggerInfo#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getLoggerInfo()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ManagementInfo.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ManagementInfo.java
index 768af20..fed1922 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ManagementInfo.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ManagementInfo.java
@@ -36,13 +36,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.ManagementInfo#getIp <em>Ip</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.ManagementInfo#getMetrics <em>Metrics</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.ManagementInfo#getLogs <em>Logs</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.ManagementInfo#getProps <em>Props</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getManagementInfo()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/Response.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/Response.java
index 51e58b6..4ecf834 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/Response.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/Response.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.Response#getStatus <em>Status</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.Response#getMessage <em>Message</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getResponse()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ResponseStatus.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ResponseStatus.java
index 172641a..a02df1e 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ResponseStatus.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ResponseStatus.java
@@ -139,6 +139,8 @@ public enum ResponseStatus implements Enumerator {
 	 * Returns the '<em><b>Response Status</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ResponseStatus get(String literal) {
@@ -155,6 +157,8 @@ public enum ResponseStatus implements Enumerator {
 	 * Returns the '<em><b>Response Status</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ResponseStatus getByName(String name) {
@@ -171,6 +175,8 @@ public enum ResponseStatus implements Enumerator {
 	 * Returns the '<em><b>Response Status</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ResponseStatus get(int value) {
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ServerFactory.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ServerFactory.java
index cffc535..5ec0c32 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ServerFactory.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ServerFactory.java
@@ -88,22 +88,40 @@ public interface ServerFactory extends EFactory {
 	LoggerInfo createLoggerInfo();
 
 	/**
-	 * Returns a new object of class '<em>Abstract Management Server</em>'.
+	 * Returns a new object of class '<em>Abstract Management Server Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Abstract Management Server</em>'.
+	 * @return a new object of class '<em>Abstract Management Server Configuration</em>'.
 	 * @generated
 	 */
-	AbstractManagementServer createAbstractManagementServer();
+	AbstractManagementServerConfiguration createAbstractManagementServerConfiguration();
 
 	/**
-	 * Returns a new object of class '<em>Abstract Management Server Configuration</em>'.
+	 * Returns a new object of class '<em>Version Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Abstract Management Server Configuration</em>'.
+	 * @return a new object of class '<em>Version Configuration</em>'.
 	 * @generated
 	 */
-	AbstractManagementServerConfiguration createAbstractManagementServerConfiguration();
+	VersionConfiguration createVersionConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Version Translation</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Version Translation</em>'.
+	 * @generated
+	 */
+	VersionTranslation createVersionTranslation();
+
+	/**
+	 * Returns a new object of class '<em>Attribute Translation Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Attribute Translation Step</em>'.
+	 * @generated
+	 */
+	AttributeTranslationStep createAttributeTranslationStep();
 
 	/**
 	 * Returns the package supported by this factory.
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ServerPackage.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ServerPackage.java
index 8781f5b..c34477d 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ServerPackage.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/ServerPackage.java
@@ -30,6 +30,7 @@ import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+import org.openecomp.ncomp.core.CorePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -43,6 +44,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.ncomp.sirius.manager.server.ServerFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-sirius-manager-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.sirius.manager'"
@@ -549,13 +568,22 @@ public interface ServerPackage extends EPackage {
 	int ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__FUNCTIONS = PropertiesPackage.MODULE_CONTAINER_FEATURE_COUNT + 4;
 
 	/**
+	 * The feature id for the '<em><b>Version</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__VERSION = PropertiesPackage.MODULE_CONTAINER_FEATURE_COUNT + 5;
+
+	/**
 	 * The number of structural features of the '<em>Abstract Management Server Configuration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION_FEATURE_COUNT = PropertiesPackage.MODULE_CONTAINER_FEATURE_COUNT + 5;
+	int ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION_FEATURE_COUNT = PropertiesPackage.MODULE_CONTAINER_FEATURE_COUNT + 6;
 
 	/**
 	 * The number of operations of the '<em>Abstract Management Server Configuration</em>' class.
@@ -567,6 +595,289 @@ public interface ServerPackage extends EPackage {
 	int ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION_OPERATION_COUNT = PropertiesPackage.MODULE_CONTAINER_OPERATION_COUNT + 0;
 
 	/**
+	 * The meta object id for the '{@link org.openecomp.ncomp.sirius.manager.server.impl.VersionConfigurationImpl <em>Version Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.ncomp.sirius.manager.server.impl.VersionConfigurationImpl
+	 * @see org.openecomp.ncomp.sirius.manager.server.impl.ServerPackageImpl#getVersionConfiguration()
+	 * @generated
+	 */
+	int VERSION_CONFIGURATION = 7;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_CONFIGURATION__VERSION = 0;
+
+	/**
+	 * The feature id for the '<em><b>Translation Handler</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_CONFIGURATION__TRANSLATION_HANDLER = 1;
+
+	/**
+	 * The feature id for the '<em><b>Supported Versions</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_CONFIGURATION__SUPPORTED_VERSIONS = 2;
+
+	/**
+	 * The number of structural features of the '<em>Version Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_CONFIGURATION_FEATURE_COUNT = 3;
+
+	/**
+	 * The number of operations of the '<em>Version Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_CONFIGURATION_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.ncomp.sirius.manager.server.impl.VersionTranslationImpl <em>Version Translation</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.ncomp.sirius.manager.server.impl.VersionTranslationImpl
+	 * @see org.openecomp.ncomp.sirius.manager.server.impl.ServerPackageImpl#getVersionTranslation()
+	 * @generated
+	 */
+	int VERSION_TRANSLATION = 8;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_TRANSLATION__NAME = CorePackage.NAMED_ENTITY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_TRANSLATION__LAST_POLLED = CorePackage.NAMED_ENTITY__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_TRANSLATION__LAST_CHANGED = CorePackage.NAMED_ENTITY__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_TRANSLATION__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Steps</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_TRANSLATION__STEPS = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Version Translation</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_TRANSLATION_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Version Translation</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_TRANSLATION_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.ncomp.sirius.manager.server.impl.VersionTranslationStepImpl <em>Version Translation Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.ncomp.sirius.manager.server.impl.VersionTranslationStepImpl
+	 * @see org.openecomp.ncomp.sirius.manager.server.impl.ServerPackageImpl#getVersionTranslationStep()
+	 * @generated
+	 */
+	int VERSION_TRANSLATION_STEP = 9;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_TRANSLATION_STEP__NAME = CorePackage.NAMED_ENTITY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_TRANSLATION_STEP__LAST_POLLED = CorePackage.NAMED_ENTITY__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_TRANSLATION_STEP__LAST_CHANGED = CorePackage.NAMED_ENTITY__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_TRANSLATION_STEP__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The number of structural features of the '<em>Version Translation Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_TRANSLATION_STEP_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Version Translation Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERSION_TRANSLATION_STEP_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.ncomp.sirius.manager.server.impl.AttributeTranslationStepImpl <em>Attribute Translation Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.ncomp.sirius.manager.server.impl.AttributeTranslationStepImpl
+	 * @see org.openecomp.ncomp.sirius.manager.server.impl.ServerPackageImpl#getAttributeTranslationStep()
+	 * @generated
+	 */
+	int ATTRIBUTE_TRANSLATION_STEP = 10;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_TRANSLATION_STEP__NAME = VERSION_TRANSLATION_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_TRANSLATION_STEP__LAST_POLLED = VERSION_TRANSLATION_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_TRANSLATION_STEP__LAST_CHANGED = VERSION_TRANSLATION_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_TRANSLATION_STEP__CREATED = VERSION_TRANSLATION_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_TRANSLATION_STEP__ATTRIBUTE = VERSION_TRANSLATION_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Current Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_TRANSLATION_STEP__CURRENT_VALUE = VERSION_TRANSLATION_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Old Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_TRANSLATION_STEP__OLD_VALUE = VERSION_TRANSLATION_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Attribute Translation Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_TRANSLATION_STEP_FEATURE_COUNT = VERSION_TRANSLATION_STEP_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Attribute Translation Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_TRANSLATION_STEP_OPERATION_COUNT = VERSION_TRANSLATION_STEP_OPERATION_COUNT + 0;
+
+	/**
 	 * The meta object id for the '{@link org.openecomp.ncomp.sirius.manager.server.ResponseStatus <em>Response Status</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -574,7 +885,7 @@ public interface ServerPackage extends EPackage {
 	 * @see org.openecomp.ncomp.sirius.manager.server.impl.ServerPackageImpl#getResponseStatus()
 	 * @generated
 	 */
-	int RESPONSE_STATUS = 7;
+	int RESPONSE_STATUS = 11;
 
 	/**
 	 * Returns the meta object for class '{@link org.openecomp.ncomp.sirius.manager.server.SouthBoundApiWithProxy <em>South Bound Api With Proxy</em>}'.
@@ -901,6 +1212,134 @@ public interface ServerPackage extends EPackage {
 	EReference getAbstractManagementServerConfiguration_Functions();
 
 	/**
+	 * Returns the meta object for the containment reference '{@link org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerConfiguration#getVersion <em>Version</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Version</em>'.
+	 * @see org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerConfiguration#getVersion()
+	 * @see #getAbstractManagementServerConfiguration()
+	 * @generated
+	 */
+	EReference getAbstractManagementServerConfiguration_Version();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.ncomp.sirius.manager.server.VersionConfiguration <em>Version Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Version Configuration</em>'.
+	 * @see org.openecomp.ncomp.sirius.manager.server.VersionConfiguration
+	 * @generated
+	 */
+	EClass getVersionConfiguration();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.ncomp.sirius.manager.server.VersionConfiguration#getVersion <em>Version</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Version</em>'.
+	 * @see org.openecomp.ncomp.sirius.manager.server.VersionConfiguration#getVersion()
+	 * @see #getVersionConfiguration()
+	 * @generated
+	 */
+	EAttribute getVersionConfiguration_Version();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.ncomp.sirius.manager.server.VersionConfiguration#getTranslationHandler <em>Translation Handler</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Translation Handler</em>'.
+	 * @see org.openecomp.ncomp.sirius.manager.server.VersionConfiguration#getTranslationHandler()
+	 * @see #getVersionConfiguration()
+	 * @generated
+	 */
+	EAttribute getVersionConfiguration_TranslationHandler();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.ncomp.sirius.manager.server.VersionConfiguration#getSupportedVersions <em>Supported Versions</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Supported Versions</em>'.
+	 * @see org.openecomp.ncomp.sirius.manager.server.VersionConfiguration#getSupportedVersions()
+	 * @see #getVersionConfiguration()
+	 * @generated
+	 */
+	EReference getVersionConfiguration_SupportedVersions();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.ncomp.sirius.manager.server.VersionTranslation <em>Version Translation</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Version Translation</em>'.
+	 * @see org.openecomp.ncomp.sirius.manager.server.VersionTranslation
+	 * @generated
+	 */
+	EClass getVersionTranslation();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.ncomp.sirius.manager.server.VersionTranslation#getSteps <em>Steps</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Steps</em>'.
+	 * @see org.openecomp.ncomp.sirius.manager.server.VersionTranslation#getSteps()
+	 * @see #getVersionTranslation()
+	 * @generated
+	 */
+	EReference getVersionTranslation_Steps();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.ncomp.sirius.manager.server.VersionTranslationStep <em>Version Translation Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Version Translation Step</em>'.
+	 * @see org.openecomp.ncomp.sirius.manager.server.VersionTranslationStep
+	 * @generated
+	 */
+	EClass getVersionTranslationStep();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep <em>Attribute Translation Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Attribute Translation Step</em>'.
+	 * @see org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep
+	 * @generated
+	 */
+	EClass getAttributeTranslationStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep#getAttribute <em>Attribute</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Attribute</em>'.
+	 * @see org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep#getAttribute()
+	 * @see #getAttributeTranslationStep()
+	 * @generated
+	 */
+	EAttribute getAttributeTranslationStep_Attribute();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep#getCurrentValue <em>Current Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Current Value</em>'.
+	 * @see org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep#getCurrentValue()
+	 * @see #getAttributeTranslationStep()
+	 * @generated
+	 */
+	EAttribute getAttributeTranslationStep_CurrentValue();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep#getOldValue <em>Old Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Old Value</em>'.
+	 * @see org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep#getOldValue()
+	 * @see #getAttributeTranslationStep()
+	 * @generated
+	 */
+	EAttribute getAttributeTranslationStep_OldValue();
+
+	/**
 	 * Returns the meta object for enum '{@link org.openecomp.ncomp.sirius.manager.server.ResponseStatus <em>Response Status</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1196,6 +1635,110 @@ public interface ServerPackage extends EPackage {
 		EReference ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__FUNCTIONS = eINSTANCE.getAbstractManagementServerConfiguration_Functions();
 
 		/**
+		 * The meta object literal for the '<em><b>Version</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__VERSION = eINSTANCE.getAbstractManagementServerConfiguration_Version();
+
+		/**
+		 * The meta object literal for the '{@link org.openecomp.ncomp.sirius.manager.server.impl.VersionConfigurationImpl <em>Version Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.ncomp.sirius.manager.server.impl.VersionConfigurationImpl
+		 * @see org.openecomp.ncomp.sirius.manager.server.impl.ServerPackageImpl#getVersionConfiguration()
+		 * @generated
+		 */
+		EClass VERSION_CONFIGURATION = eINSTANCE.getVersionConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute VERSION_CONFIGURATION__VERSION = eINSTANCE.getVersionConfiguration_Version();
+
+		/**
+		 * The meta object literal for the '<em><b>Translation Handler</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute VERSION_CONFIGURATION__TRANSLATION_HANDLER = eINSTANCE.getVersionConfiguration_TranslationHandler();
+
+		/**
+		 * The meta object literal for the '<em><b>Supported Versions</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference VERSION_CONFIGURATION__SUPPORTED_VERSIONS = eINSTANCE.getVersionConfiguration_SupportedVersions();
+
+		/**
+		 * The meta object literal for the '{@link org.openecomp.ncomp.sirius.manager.server.impl.VersionTranslationImpl <em>Version Translation</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.ncomp.sirius.manager.server.impl.VersionTranslationImpl
+		 * @see org.openecomp.ncomp.sirius.manager.server.impl.ServerPackageImpl#getVersionTranslation()
+		 * @generated
+		 */
+		EClass VERSION_TRANSLATION = eINSTANCE.getVersionTranslation();
+
+		/**
+		 * The meta object literal for the '<em><b>Steps</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference VERSION_TRANSLATION__STEPS = eINSTANCE.getVersionTranslation_Steps();
+
+		/**
+		 * The meta object literal for the '{@link org.openecomp.ncomp.sirius.manager.server.impl.VersionTranslationStepImpl <em>Version Translation Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.ncomp.sirius.manager.server.impl.VersionTranslationStepImpl
+		 * @see org.openecomp.ncomp.sirius.manager.server.impl.ServerPackageImpl#getVersionTranslationStep()
+		 * @generated
+		 */
+		EClass VERSION_TRANSLATION_STEP = eINSTANCE.getVersionTranslationStep();
+
+		/**
+		 * The meta object literal for the '{@link org.openecomp.ncomp.sirius.manager.server.impl.AttributeTranslationStepImpl <em>Attribute Translation Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.ncomp.sirius.manager.server.impl.AttributeTranslationStepImpl
+		 * @see org.openecomp.ncomp.sirius.manager.server.impl.ServerPackageImpl#getAttributeTranslationStep()
+		 * @generated
+		 */
+		EClass ATTRIBUTE_TRANSLATION_STEP = eINSTANCE.getAttributeTranslationStep();
+
+		/**
+		 * The meta object literal for the '<em><b>Attribute</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ATTRIBUTE_TRANSLATION_STEP__ATTRIBUTE = eINSTANCE.getAttributeTranslationStep_Attribute();
+
+		/**
+		 * The meta object literal for the '<em><b>Current Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ATTRIBUTE_TRANSLATION_STEP__CURRENT_VALUE = eINSTANCE.getAttributeTranslationStep_CurrentValue();
+
+		/**
+		 * The meta object literal for the '<em><b>Old Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ATTRIBUTE_TRANSLATION_STEP__OLD_VALUE = eINSTANCE.getAttributeTranslationStep_OldValue();
+
+		/**
 		 * The meta object literal for the '{@link org.openecomp.ncomp.sirius.manager.server.ResponseStatus <em>Response Status</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/VersionConfiguration.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/VersionConfiguration.java
new file mode 100644
index 0000000..28b20b6
--- /dev/null
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/VersionConfiguration.java
@@ -0,0 +1,96 @@
+/**
+ */
+package org.openecomp.ncomp.sirius.manager.server;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Version Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.VersionConfiguration#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.VersionConfiguration#getTranslationHandler <em>Translation Handler</em>}</li>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.VersionConfiguration#getSupportedVersions <em>Supported Versions</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getVersionConfiguration()
+ * @model
+ * @generated
+ */
+public interface VersionConfiguration extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Version</em>' attribute.
+	 * @see #setVersion(String)
+	 * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getVersionConfiguration_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.ncomp.sirius.manager.server.VersionConfiguration#getVersion <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Version</em>' attribute.
+	 * @see #getVersion()
+	 * @generated
+	 */
+	void setVersion(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Translation Handler</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Translation Handler</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Translation Handler</em>' attribute.
+	 * @see #setTranslationHandler(String)
+	 * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getVersionConfiguration_TranslationHandler()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getTranslationHandler();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.ncomp.sirius.manager.server.VersionConfiguration#getTranslationHandler <em>Translation Handler</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Translation Handler</em>' attribute.
+	 * @see #getTranslationHandler()
+	 * @generated
+	 */
+	void setTranslationHandler(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Supported Versions</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.ncomp.sirius.manager.server.VersionTranslation}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Supported Versions</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Supported Versions</em>' containment reference list.
+	 * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getVersionConfiguration_SupportedVersions()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<VersionTranslation> getSupportedVersions();
+
+} // VersionConfiguration
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/VersionTranslation.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/VersionTranslation.java
new file mode 100644
index 0000000..dc8b4b9
--- /dev/null
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/VersionTranslation.java
@@ -0,0 +1,42 @@
+/**
+ */
+package org.openecomp.ncomp.sirius.manager.server;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Version Translation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.VersionTranslation#getSteps <em>Steps</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getVersionTranslation()
+ * @model
+ * @generated
+ */
+public interface VersionTranslation extends NamedEntity {
+	/**
+	 * Returns the value of the '<em><b>Steps</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.ncomp.sirius.manager.server.VersionTranslationStep}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Steps</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Steps</em>' containment reference list.
+	 * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getVersionTranslation_Steps()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<VersionTranslationStep> getSteps();
+
+} // VersionTranslation
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/VersionTranslationStep.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/VersionTranslationStep.java
new file mode 100644
index 0000000..9d1e1c9
--- /dev/null
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/VersionTranslationStep.java
@@ -0,0 +1,18 @@
+/**
+ */
+package org.openecomp.ncomp.sirius.manager.server;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Version Translation Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.ncomp.sirius.manager.server.ServerPackage#getVersionTranslationStep()
+ * @model abstract="true"
+ * @generated
+ */
+public interface VersionTranslationStep extends NamedEntity {
+} // VersionTranslationStep
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/AbstractManagementServerConfigurationImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/AbstractManagementServerConfigurationImpl.java
index 894064c..1eebb17 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/AbstractManagementServerConfigurationImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/AbstractManagementServerConfigurationImpl.java
@@ -30,12 +30,15 @@ import org.openecomp.ncomp.core.metrics.MetricValueOption;
 import org.openecomp.ncomp.sirius.manager.properties.impl.ModuleContainerImpl;
 import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerConfiguration;
 import org.openecomp.ncomp.sirius.manager.server.ServerPackage;
+import org.openecomp.ncomp.sirius.manager.server.VersionConfiguration;
 import org.openecomp.ncomp.sirius.manager.tableTemplate.AbstractTableTemplate;
 import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
@@ -45,14 +48,15 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.AbstractManagementServerConfigurationImpl#getRules <em>Rules</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.AbstractManagementServerConfigurationImpl#getMetricOptions <em>Metric Options</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.AbstractManagementServerConfigurationImpl#getTableTemplates <em>Table Templates</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.AbstractManagementServerConfigurationImpl#getAlertTemplates <em>Alert Templates</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.AbstractManagementServerConfigurationImpl#getFunctions <em>Functions</em>}</li>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.AbstractManagementServerConfigurationImpl#getVersion <em>Version</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -108,6 +112,16 @@ public class AbstractManagementServerConfigurationImpl extends ModuleContainerIm
 	protected EList<Function> functions;
 
 	/**
+	 * The cached value of the '{@link #getVersion() <em>Version</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected VersionConfiguration version;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -191,6 +205,49 @@ public class AbstractManagementServerConfigurationImpl extends ModuleContainerIm
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public VersionConfiguration getVersion() {
+		return version;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetVersion(VersionConfiguration newVersion, NotificationChain msgs) {
+		VersionConfiguration oldVersion = version;
+		version = newVersion;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__VERSION, oldVersion, newVersion);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVersion(VersionConfiguration newVersion) {
+		if (newVersion != version) {
+			NotificationChain msgs = null;
+			if (version != null)
+				msgs = ((InternalEObject)version).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__VERSION, null, msgs);
+			if (newVersion != null)
+				msgs = ((InternalEObject)newVersion).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__VERSION, null, msgs);
+			msgs = basicSetVersion(newVersion, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__VERSION, newVersion, newVersion));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -204,6 +261,8 @@ public class AbstractManagementServerConfigurationImpl extends ModuleContainerIm
 				return ((InternalEList<?>)getAlertTemplates()).basicRemove(otherEnd, msgs);
 			case ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__FUNCTIONS:
 				return ((InternalEList<?>)getFunctions()).basicRemove(otherEnd, msgs);
+			case ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__VERSION:
+				return basicSetVersion(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -226,6 +285,8 @@ public class AbstractManagementServerConfigurationImpl extends ModuleContainerIm
 				return getAlertTemplates();
 			case ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__FUNCTIONS:
 				return getFunctions();
+			case ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__VERSION:
+				return getVersion();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -259,6 +320,9 @@ public class AbstractManagementServerConfigurationImpl extends ModuleContainerIm
 				getFunctions().clear();
 				getFunctions().addAll((Collection<? extends Function>)newValue);
 				return;
+			case ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__VERSION:
+				setVersion((VersionConfiguration)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -286,6 +350,9 @@ public class AbstractManagementServerConfigurationImpl extends ModuleContainerIm
 			case ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__FUNCTIONS:
 				getFunctions().clear();
 				return;
+			case ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__VERSION:
+				setVersion((VersionConfiguration)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -308,6 +375,8 @@ public class AbstractManagementServerConfigurationImpl extends ModuleContainerIm
 				return alertTemplates != null && !alertTemplates.isEmpty();
 			case ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__FUNCTIONS:
 				return functions != null && !functions.isEmpty();
+			case ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__VERSION:
+				return version != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/AbstractManagementServerImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/AbstractManagementServerImpl.java
index dfe4bca..c25eb84 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/AbstractManagementServerImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/AbstractManagementServerImpl.java
@@ -48,15 +48,15 @@ import org.json.JSONObject;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.AbstractManagementServerImpl#getConfiguration <em>Configuration</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.AbstractManagementServerImpl#getComponent <em>Component</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class AbstractManagementServerImpl extends SouthBoundApiWithProxyImpl implements AbstractManagementServer {
+public abstract class AbstractManagementServerImpl extends SouthBoundApiWithProxyImpl implements AbstractManagementServer {
 	/**
 	 * The cached value of the '{@link #getConfiguration() <em>Configuration</em>}' containment reference.
 	 * <!-- begin-user-doc -->
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/AttributeTranslationStepImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/AttributeTranslationStepImpl.java
new file mode 100644
index 0000000..52f3163
--- /dev/null
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/AttributeTranslationStepImpl.java
@@ -0,0 +1,270 @@
+/**
+ */
+package org.openecomp.ncomp.sirius.manager.server.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep;
+import org.openecomp.ncomp.sirius.manager.server.ServerPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Attribute Translation Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.AttributeTranslationStepImpl#getAttribute <em>Attribute</em>}</li>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.AttributeTranslationStepImpl#getCurrentValue <em>Current Value</em>}</li>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.AttributeTranslationStepImpl#getOldValue <em>Old Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class AttributeTranslationStepImpl extends VersionTranslationStepImpl implements AttributeTranslationStep {
+	/**
+	 * The default value of the '{@link #getAttribute() <em>Attribute</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAttribute()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ATTRIBUTE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAttribute()
+	 * @generated
+	 * @ordered
+	 */
+	protected String attribute = ATTRIBUTE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getCurrentValue() <em>Current Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCurrentValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CURRENT_VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getCurrentValue() <em>Current Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCurrentValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String currentValue = CURRENT_VALUE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getOldValue() <em>Old Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOldValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String OLD_VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getOldValue() <em>Old Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOldValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String oldValue = OLD_VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AttributeTranslationStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServerPackage.Literals.ATTRIBUTE_TRANSLATION_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAttribute() {
+		return attribute;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAttribute(String newAttribute) {
+		String oldAttribute = attribute;
+		attribute = newAttribute;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.ATTRIBUTE_TRANSLATION_STEP__ATTRIBUTE, oldAttribute, attribute));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getCurrentValue() {
+		return currentValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentValue(String newCurrentValue) {
+		String oldCurrentValue = currentValue;
+		currentValue = newCurrentValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.ATTRIBUTE_TRANSLATION_STEP__CURRENT_VALUE, oldCurrentValue, currentValue));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getOldValue() {
+		return oldValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOldValue(String newOldValue) {
+		String oldOldValue = oldValue;
+		oldValue = newOldValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.ATTRIBUTE_TRANSLATION_STEP__OLD_VALUE, oldOldValue, oldValue));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP__ATTRIBUTE:
+				return getAttribute();
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP__CURRENT_VALUE:
+				return getCurrentValue();
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP__OLD_VALUE:
+				return getOldValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP__ATTRIBUTE:
+				setAttribute((String)newValue);
+				return;
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP__CURRENT_VALUE:
+				setCurrentValue((String)newValue);
+				return;
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP__OLD_VALUE:
+				setOldValue((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP__ATTRIBUTE:
+				setAttribute(ATTRIBUTE_EDEFAULT);
+				return;
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP__CURRENT_VALUE:
+				setCurrentValue(CURRENT_VALUE_EDEFAULT);
+				return;
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP__OLD_VALUE:
+				setOldValue(OLD_VALUE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP__ATTRIBUTE:
+				return ATTRIBUTE_EDEFAULT == null ? attribute != null : !ATTRIBUTE_EDEFAULT.equals(attribute);
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP__CURRENT_VALUE:
+				return CURRENT_VALUE_EDEFAULT == null ? currentValue != null : !CURRENT_VALUE_EDEFAULT.equals(currentValue);
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP__OLD_VALUE:
+				return OLD_VALUE_EDEFAULT == null ? oldValue != null : !OLD_VALUE_EDEFAULT.equals(oldValue);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (attribute: ");
+		result.append(attribute);
+		result.append(", currentValue: ");
+		result.append(currentValue);
+		result.append(", oldValue: ");
+		result.append(oldValue);
+		result.append(')');
+		return result.toString();
+	}
+
+} //AttributeTranslationStepImpl
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/LoggerInfoImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/LoggerInfoImpl.java
index a391e5a..aaf01a0 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/LoggerInfoImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/LoggerInfoImpl.java
@@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.LoggerInfoImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ManagementInfoImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ManagementInfoImpl.java
index 741d5d7..08b4690 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ManagementInfoImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ManagementInfoImpl.java
@@ -45,13 +45,13 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.ManagementInfoImpl#getIp <em>Ip</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.ManagementInfoImpl#getMetrics <em>Metrics</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.ManagementInfoImpl#getLogs <em>Logs</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.ManagementInfoImpl#getProps <em>Props</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ResponseImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ResponseImpl.java
index 19d2d1f..09d6a5a 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ResponseImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ResponseImpl.java
@@ -40,11 +40,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.ResponseImpl#getStatus <em>Status</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.ResponseImpl#getMessage <em>Message</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ServerFactoryImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ServerFactoryImpl.java
index 74f35ce..27e1957 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ServerFactoryImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ServerFactoryImpl.java
@@ -80,8 +80,10 @@ public class ServerFactoryImpl extends EFactoryImpl implements ServerFactory {
 			case ServerPackage.MANAGEMENT_INFO: return createManagementInfo();
 			case ServerPackage.RESPONSE: return createResponse();
 			case ServerPackage.LOGGER_INFO: return createLoggerInfo();
-			case ServerPackage.ABSTRACT_MANAGEMENT_SERVER: return createAbstractManagementServer();
 			case ServerPackage.ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION: return createAbstractManagementServerConfiguration();
+			case ServerPackage.VERSION_CONFIGURATION: return createVersionConfiguration();
+			case ServerPackage.VERSION_TRANSLATION: return createVersionTranslation();
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP: return createAttributeTranslationStep();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -172,9 +174,9 @@ public class ServerFactoryImpl extends EFactoryImpl implements ServerFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public AbstractManagementServer createAbstractManagementServer() {
-		AbstractManagementServerImpl abstractManagementServer = new AbstractManagementServerImpl();
-		return abstractManagementServer;
+	public AbstractManagementServerConfiguration createAbstractManagementServerConfiguration() {
+		AbstractManagementServerConfigurationImpl abstractManagementServerConfiguration = new AbstractManagementServerConfigurationImpl();
+		return abstractManagementServerConfiguration;
 	}
 
 	/**
@@ -182,9 +184,29 @@ public class ServerFactoryImpl extends EFactoryImpl implements ServerFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public AbstractManagementServerConfiguration createAbstractManagementServerConfiguration() {
-		AbstractManagementServerConfigurationImpl abstractManagementServerConfiguration = new AbstractManagementServerConfigurationImpl();
-		return abstractManagementServerConfiguration;
+	public VersionConfiguration createVersionConfiguration() {
+		VersionConfigurationImpl versionConfiguration = new VersionConfigurationImpl();
+		return versionConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public VersionTranslation createVersionTranslation() {
+		VersionTranslationImpl versionTranslation = new VersionTranslationImpl();
+		return versionTranslation;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AttributeTranslationStep createAttributeTranslationStep() {
+		AttributeTranslationStepImpl attributeTranslationStep = new AttributeTranslationStepImpl();
+		return attributeTranslationStep;
 	}
 
 	/**
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ServerPackageImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ServerPackageImpl.java
index a6a18b1..90be450 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ServerPackageImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/ServerPackageImpl.java
@@ -32,6 +32,7 @@ import org.openecomp.ncomp.core.metrics.MetricsPackage;
 import org.openecomp.ncomp.sirius.manager.properties.PropertiesPackage;
 import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer;
 import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServerConfiguration;
+import org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep;
 import org.openecomp.ncomp.sirius.manager.server.LoggerInfo;
 import org.openecomp.ncomp.sirius.manager.server.ManagementInfo;
 import org.openecomp.ncomp.sirius.manager.server.Response;
@@ -40,6 +41,9 @@ import org.openecomp.ncomp.sirius.manager.server.ServerFactory;
 import org.openecomp.ncomp.sirius.manager.server.ServerPackage;
 import org.openecomp.ncomp.sirius.manager.server.SouthBoundApi;
 import org.openecomp.ncomp.sirius.manager.server.SouthBoundApiWithProxy;
+import org.openecomp.ncomp.sirius.manager.server.VersionConfiguration;
+import org.openecomp.ncomp.sirius.manager.server.VersionTranslation;
+import org.openecomp.ncomp.sirius.manager.server.VersionTranslationStep;
 import org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplatePackage;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -111,6 +115,34 @@ public class ServerPackageImpl extends EPackageImpl implements ServerPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass versionConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass versionTranslationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass versionTranslationStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass attributeTranslationStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EEnum responseStatusEEnum = null;
 
 	/**
@@ -160,10 +192,10 @@ public class ServerPackageImpl extends EPackageImpl implements ServerPackage {
 		isInited = true;
 
 		// Initialize simple dependencies
-		AlertsPackage.eINSTANCE.eClass();
 		PropertiesPackage.eINSTANCE.eClass();
-		TableTemplatePackage.eINSTANCE.eClass();
 		ComponentPackage.eINSTANCE.eClass();
+		TableTemplatePackage.eINSTANCE.eClass();
+		AlertsPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theServerPackage.createPackageContents();
@@ -464,6 +496,114 @@ public class ServerPackageImpl extends EPackageImpl implements ServerPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getAbstractManagementServerConfiguration_Version() {
+		return (EReference)abstractManagementServerConfigurationEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getVersionConfiguration() {
+		return versionConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getVersionConfiguration_Version() {
+		return (EAttribute)versionConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getVersionConfiguration_TranslationHandler() {
+		return (EAttribute)versionConfigurationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getVersionConfiguration_SupportedVersions() {
+		return (EReference)versionConfigurationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getVersionTranslation() {
+		return versionTranslationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getVersionTranslation_Steps() {
+		return (EReference)versionTranslationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getVersionTranslationStep() {
+		return versionTranslationStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getAttributeTranslationStep() {
+		return attributeTranslationStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getAttributeTranslationStep_Attribute() {
+		return (EAttribute)attributeTranslationStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getAttributeTranslationStep_CurrentValue() {
+		return (EAttribute)attributeTranslationStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getAttributeTranslationStep_OldValue() {
+		return (EAttribute)attributeTranslationStepEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EEnum getResponseStatus() {
 		return responseStatusEEnum;
 	}
@@ -533,6 +673,22 @@ public class ServerPackageImpl extends EPackageImpl implements ServerPackage {
 		createEReference(abstractManagementServerConfigurationEClass, ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__TABLE_TEMPLATES);
 		createEReference(abstractManagementServerConfigurationEClass, ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__ALERT_TEMPLATES);
 		createEReference(abstractManagementServerConfigurationEClass, ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__FUNCTIONS);
+		createEReference(abstractManagementServerConfigurationEClass, ABSTRACT_MANAGEMENT_SERVER_CONFIGURATION__VERSION);
+
+		versionConfigurationEClass = createEClass(VERSION_CONFIGURATION);
+		createEAttribute(versionConfigurationEClass, VERSION_CONFIGURATION__VERSION);
+		createEAttribute(versionConfigurationEClass, VERSION_CONFIGURATION__TRANSLATION_HANDLER);
+		createEReference(versionConfigurationEClass, VERSION_CONFIGURATION__SUPPORTED_VERSIONS);
+
+		versionTranslationEClass = createEClass(VERSION_TRANSLATION);
+		createEReference(versionTranslationEClass, VERSION_TRANSLATION__STEPS);
+
+		versionTranslationStepEClass = createEClass(VERSION_TRANSLATION_STEP);
+
+		attributeTranslationStepEClass = createEClass(ATTRIBUTE_TRANSLATION_STEP);
+		createEAttribute(attributeTranslationStepEClass, ATTRIBUTE_TRANSLATION_STEP__ATTRIBUTE);
+		createEAttribute(attributeTranslationStepEClass, ATTRIBUTE_TRANSLATION_STEP__CURRENT_VALUE);
+		createEAttribute(attributeTranslationStepEClass, ATTRIBUTE_TRANSLATION_STEP__OLD_VALUE);
 
 		// Create enums
 		responseStatusEEnum = createEEnum(RESPONSE_STATUS);
@@ -580,6 +736,9 @@ public class ServerPackageImpl extends EPackageImpl implements ServerPackage {
 		southBoundApiWithProxyEClass.getESuperTypes().add(this.getSouthBoundApi());
 		abstractManagementServerEClass.getESuperTypes().add(this.getSouthBoundApiWithProxy());
 		abstractManagementServerConfigurationEClass.getESuperTypes().add(thePropertiesPackage.getModuleContainer());
+		versionTranslationEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		versionTranslationStepEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		attributeTranslationStepEClass.getESuperTypes().add(this.getVersionTranslationStep());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(southBoundApiWithProxyEClass, SouthBoundApiWithProxy.class, "SouthBoundApiWithProxy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -615,7 +774,7 @@ public class ServerPackageImpl extends EPackageImpl implements ServerPackage {
 		initEClass(loggerInfoEClass, LoggerInfo.class, "LoggerInfo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getLoggerInfo_Name(), theEcorePackage.getEString(), "name", null, 0, 1, LoggerInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(abstractManagementServerEClass, AbstractManagementServer.class, "AbstractManagementServer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(abstractManagementServerEClass, AbstractManagementServer.class, "AbstractManagementServer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getAbstractManagementServer_Configuration(), this.getAbstractManagementServerConfiguration(), null, "configuration", null, 0, 1, AbstractManagementServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getAbstractManagementServer_Component(), theComponentPackage.getComponent(), null, "component", null, 0, 1, AbstractManagementServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -662,6 +821,22 @@ public class ServerPackageImpl extends EPackageImpl implements ServerPackage {
 		initEReference(getAbstractManagementServerConfiguration_TableTemplates(), theTableTemplatePackage.getAbstractTableTemplate(), null, "tableTemplates", null, 0, -1, AbstractManagementServerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getAbstractManagementServerConfiguration_AlertTemplates(), theAlertsPackage.getAlertingTemplate(), null, "alertTemplates", null, 0, -1, AbstractManagementServerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getAbstractManagementServerConfiguration_Functions(), theFunctionPackage.getFunction(), null, "functions", null, 0, -1, AbstractManagementServerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getAbstractManagementServerConfiguration_Version(), this.getVersionConfiguration(), null, "version", null, 0, 1, AbstractManagementServerConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(versionConfigurationEClass, VersionConfiguration.class, "VersionConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getVersionConfiguration_Version(), theEcorePackage.getEString(), "version", null, 0, 1, VersionConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getVersionConfiguration_TranslationHandler(), theEcorePackage.getEString(), "translationHandler", null, 0, 1, VersionConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getVersionConfiguration_SupportedVersions(), this.getVersionTranslation(), null, "supportedVersions", null, 0, -1, VersionConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(versionTranslationEClass, VersionTranslation.class, "VersionTranslation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getVersionTranslation_Steps(), this.getVersionTranslationStep(), null, "steps", null, 0, -1, VersionTranslation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(versionTranslationStepEClass, VersionTranslationStep.class, "VersionTranslationStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(attributeTranslationStepEClass, AttributeTranslationStep.class, "AttributeTranslationStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getAttributeTranslationStep_Attribute(), theEcorePackage.getEString(), "attribute", null, 0, 1, AttributeTranslationStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAttributeTranslationStep_CurrentValue(), theEcorePackage.getEString(), "currentValue", null, 0, 1, AttributeTranslationStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAttributeTranslationStep_OldValue(), theEcorePackage.getEString(), "oldValue", null, 0, 1, AttributeTranslationStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		// Initialize enums and add enum literals
 		initEEnum(responseStatusEEnum, ResponseStatus.class, "ResponseStatus");
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/SouthBoundApiImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/SouthBoundApiImpl.java
index 6857ca0..7543a47 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/SouthBoundApiImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/SouthBoundApiImpl.java
@@ -38,8 +38,6 @@ import org.json.JSONObject;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>South Bound Api</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/SouthBoundApiWithProxyImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/SouthBoundApiWithProxyImpl.java
index 373f971..9fa5f3a 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/SouthBoundApiWithProxyImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/SouthBoundApiWithProxyImpl.java
@@ -35,8 +35,6 @@ import org.json.JSONObject;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>South Bound Api With Proxy</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/VersionConfigurationImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/VersionConfigurationImpl.java
new file mode 100644
index 0000000..9bfada8
--- /dev/null
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/VersionConfigurationImpl.java
@@ -0,0 +1,276 @@
+/**
+ */
+package org.openecomp.ncomp.sirius.manager.server.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.openecomp.ncomp.sirius.manager.server.ServerPackage;
+import org.openecomp.ncomp.sirius.manager.server.VersionConfiguration;
+import org.openecomp.ncomp.sirius.manager.server.VersionTranslation;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Version Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.VersionConfigurationImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.VersionConfigurationImpl#getTranslationHandler <em>Translation Handler</em>}</li>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.VersionConfigurationImpl#getSupportedVersions <em>Supported Versions</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class VersionConfigurationImpl extends MinimalEObjectImpl.Container implements VersionConfiguration {
+	/**
+	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VERSION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected String version = VERSION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getTranslationHandler() <em>Translation Handler</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTranslationHandler()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TRANSLATION_HANDLER_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTranslationHandler() <em>Translation Handler</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTranslationHandler()
+	 * @generated
+	 * @ordered
+	 */
+	protected String translationHandler = TRANSLATION_HANDLER_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getSupportedVersions() <em>Supported Versions</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSupportedVersions()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<VersionTranslation> supportedVersions;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected VersionConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServerPackage.Literals.VERSION_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getVersion() {
+		return version;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVersion(String newVersion) {
+		String oldVersion = version;
+		version = newVersion;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.VERSION_CONFIGURATION__VERSION, oldVersion, version));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getTranslationHandler() {
+		return translationHandler;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTranslationHandler(String newTranslationHandler) {
+		String oldTranslationHandler = translationHandler;
+		translationHandler = newTranslationHandler;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.VERSION_CONFIGURATION__TRANSLATION_HANDLER, oldTranslationHandler, translationHandler));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<VersionTranslation> getSupportedVersions() {
+		if (supportedVersions == null) {
+			supportedVersions = new EObjectContainmentEList<VersionTranslation>(VersionTranslation.class, this, ServerPackage.VERSION_CONFIGURATION__SUPPORTED_VERSIONS);
+		}
+		return supportedVersions;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ServerPackage.VERSION_CONFIGURATION__SUPPORTED_VERSIONS:
+				return ((InternalEList<?>)getSupportedVersions()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ServerPackage.VERSION_CONFIGURATION__VERSION:
+				return getVersion();
+			case ServerPackage.VERSION_CONFIGURATION__TRANSLATION_HANDLER:
+				return getTranslationHandler();
+			case ServerPackage.VERSION_CONFIGURATION__SUPPORTED_VERSIONS:
+				return getSupportedVersions();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ServerPackage.VERSION_CONFIGURATION__VERSION:
+				setVersion((String)newValue);
+				return;
+			case ServerPackage.VERSION_CONFIGURATION__TRANSLATION_HANDLER:
+				setTranslationHandler((String)newValue);
+				return;
+			case ServerPackage.VERSION_CONFIGURATION__SUPPORTED_VERSIONS:
+				getSupportedVersions().clear();
+				getSupportedVersions().addAll((Collection<? extends VersionTranslation>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ServerPackage.VERSION_CONFIGURATION__VERSION:
+				setVersion(VERSION_EDEFAULT);
+				return;
+			case ServerPackage.VERSION_CONFIGURATION__TRANSLATION_HANDLER:
+				setTranslationHandler(TRANSLATION_HANDLER_EDEFAULT);
+				return;
+			case ServerPackage.VERSION_CONFIGURATION__SUPPORTED_VERSIONS:
+				getSupportedVersions().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ServerPackage.VERSION_CONFIGURATION__VERSION:
+				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
+			case ServerPackage.VERSION_CONFIGURATION__TRANSLATION_HANDLER:
+				return TRANSLATION_HANDLER_EDEFAULT == null ? translationHandler != null : !TRANSLATION_HANDLER_EDEFAULT.equals(translationHandler);
+			case ServerPackage.VERSION_CONFIGURATION__SUPPORTED_VERSIONS:
+				return supportedVersions != null && !supportedVersions.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (version: ");
+		result.append(version);
+		result.append(", translationHandler: ");
+		result.append(translationHandler);
+		result.append(')');
+		return result.toString();
+	}
+
+} //VersionConfigurationImpl
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/VersionTranslationImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/VersionTranslationImpl.java
new file mode 100644
index 0000000..d98f1fe
--- /dev/null
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/VersionTranslationImpl.java
@@ -0,0 +1,150 @@
+/**
+ */
+package org.openecomp.ncomp.sirius.manager.server.impl;
+
+import java.util.Collection;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+import org.openecomp.ncomp.sirius.manager.server.ServerPackage;
+import org.openecomp.ncomp.sirius.manager.server.VersionTranslation;
+import org.openecomp.ncomp.sirius.manager.server.VersionTranslationStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Version Translation</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.ncomp.sirius.manager.server.impl.VersionTranslationImpl#getSteps <em>Steps</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class VersionTranslationImpl extends NamedEntityImpl implements VersionTranslation {
+	/**
+	 * The cached value of the '{@link #getSteps() <em>Steps</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSteps()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<VersionTranslationStep> steps;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected VersionTranslationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServerPackage.Literals.VERSION_TRANSLATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<VersionTranslationStep> getSteps() {
+		if (steps == null) {
+			steps = new EObjectContainmentEList<VersionTranslationStep>(VersionTranslationStep.class, this, ServerPackage.VERSION_TRANSLATION__STEPS);
+		}
+		return steps;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ServerPackage.VERSION_TRANSLATION__STEPS:
+				return ((InternalEList<?>)getSteps()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ServerPackage.VERSION_TRANSLATION__STEPS:
+				return getSteps();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ServerPackage.VERSION_TRANSLATION__STEPS:
+				getSteps().clear();
+				getSteps().addAll((Collection<? extends VersionTranslationStep>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ServerPackage.VERSION_TRANSLATION__STEPS:
+				getSteps().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ServerPackage.VERSION_TRANSLATION__STEPS:
+				return steps != null && !steps.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //VersionTranslationImpl
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/VersionTranslationStepImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/VersionTranslationStepImpl.java
new file mode 100644
index 0000000..e6f694d
--- /dev/null
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/impl/VersionTranslationStepImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+package org.openecomp.ncomp.sirius.manager.server.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+import org.openecomp.ncomp.sirius.manager.server.ServerPackage;
+import org.openecomp.ncomp.sirius.manager.server.VersionTranslationStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Version Translation Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class VersionTranslationStepImpl extends NamedEntityImpl implements VersionTranslationStep {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected VersionTranslationStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServerPackage.Literals.VERSION_TRANSLATION_STEP;
+	}
+
+} //VersionTranslationStepImpl
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/util/ServerAdapterFactory.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/util/ServerAdapterFactory.java
index a40f840..ba4e3e9 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/util/ServerAdapterFactory.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/util/ServerAdapterFactory.java
@@ -29,6 +29,7 @@ import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
+import org.openecomp.ncomp.core.NamedEntity;
 
 /**
  * <!-- begin-user-doc -->
@@ -115,10 +116,30 @@ public class ServerAdapterFactory extends AdapterFactoryImpl {
 				return createAbstractManagementServerConfigurationAdapter();
 			}
 			@Override
+			public Adapter caseVersionConfiguration(VersionConfiguration object) {
+				return createVersionConfigurationAdapter();
+			}
+			@Override
+			public Adapter caseVersionTranslation(VersionTranslation object) {
+				return createVersionTranslationAdapter();
+			}
+			@Override
+			public Adapter caseVersionTranslationStep(VersionTranslationStep object) {
+				return createVersionTranslationStepAdapter();
+			}
+			@Override
+			public Adapter caseAttributeTranslationStep(AttributeTranslationStep object) {
+				return createAttributeTranslationStepAdapter();
+			}
+			@Override
 			public Adapter caseModuleContainer(ModuleContainer object) {
 				return createModuleContainerAdapter();
 			}
 			@Override
+			public Adapter caseNamedEntity(NamedEntity object) {
+				return createNamedEntityAdapter();
+			}
+			@Override
 			public Adapter defaultCase(EObject object) {
 				return createEObjectAdapter();
 			}
@@ -209,6 +230,20 @@ public class ServerAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.ncomp.core.NamedEntity <em>Named Entity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.ncomp.core.NamedEntity
+	 * @generated
+	 */
+	public Adapter createNamedEntityAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.openecomp.ncomp.sirius.manager.server.LoggerInfo <em>Logger Info</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
@@ -251,6 +286,62 @@ public class ServerAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.ncomp.sirius.manager.server.VersionConfiguration <em>Version Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.ncomp.sirius.manager.server.VersionConfiguration
+	 * @generated
+	 */
+	public Adapter createVersionConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.ncomp.sirius.manager.server.VersionTranslation <em>Version Translation</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.ncomp.sirius.manager.server.VersionTranslation
+	 * @generated
+	 */
+	public Adapter createVersionTranslationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.ncomp.sirius.manager.server.VersionTranslationStep <em>Version Translation Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.ncomp.sirius.manager.server.VersionTranslationStep
+	 * @generated
+	 */
+	public Adapter createVersionTranslationStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep <em>Attribute Translation Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep
+	 * @generated
+	 */
+	public Adapter createAttributeTranslationStepAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/util/ServerSwitch.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/util/ServerSwitch.java
index 73c7c80..58548ff 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/util/ServerSwitch.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/server/util/ServerSwitch.java
@@ -28,6 +28,7 @@ import org.openecomp.ncomp.sirius.manager.server.*;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
+import org.openecomp.ncomp.core.NamedEntity;
 
 /**
  * <!-- begin-user-doc -->
@@ -67,7 +68,7 @@ public class ServerSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
@@ -132,6 +133,34 @@ public class ServerSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case ServerPackage.VERSION_CONFIGURATION: {
+				VersionConfiguration versionConfiguration = (VersionConfiguration)theEObject;
+				T result = caseVersionConfiguration(versionConfiguration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ServerPackage.VERSION_TRANSLATION: {
+				VersionTranslation versionTranslation = (VersionTranslation)theEObject;
+				T result = caseVersionTranslation(versionTranslation);
+				if (result == null) result = caseNamedEntity(versionTranslation);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ServerPackage.VERSION_TRANSLATION_STEP: {
+				VersionTranslationStep versionTranslationStep = (VersionTranslationStep)theEObject;
+				T result = caseVersionTranslationStep(versionTranslationStep);
+				if (result == null) result = caseNamedEntity(versionTranslationStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ServerPackage.ATTRIBUTE_TRANSLATION_STEP: {
+				AttributeTranslationStep attributeTranslationStep = (AttributeTranslationStep)theEObject;
+				T result = caseAttributeTranslationStep(attributeTranslationStep);
+				if (result == null) result = caseVersionTranslationStep(attributeTranslationStep);
+				if (result == null) result = caseNamedEntity(attributeTranslationStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -212,6 +241,21 @@ public class ServerSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Named Entity</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Named Entity</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseNamedEntity(NamedEntity object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Logger Info</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
@@ -257,6 +301,66 @@ public class ServerSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Version Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Version Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseVersionConfiguration(VersionConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Version Translation</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Version Translation</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseVersionTranslation(VersionTranslation object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Version Translation Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Version Translation Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseVersionTranslationStep(VersionTranslationStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Translation Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Attribute Translation Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAttributeTranslationStep(AttributeTranslationStep object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerCollectionFormat.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerCollectionFormat.java
index dc4ecef..0f6621a 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerCollectionFormat.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerCollectionFormat.java
@@ -185,6 +185,8 @@ public enum SwaggerCollectionFormat implements Enumerator {
 	 * Returns the '<em><b>Collection Format</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SwaggerCollectionFormat get(String literal) {
@@ -201,6 +203,8 @@ public enum SwaggerCollectionFormat implements Enumerator {
 	 * Returns the '<em><b>Collection Format</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SwaggerCollectionFormat getByName(String name) {
@@ -217,6 +221,8 @@ public enum SwaggerCollectionFormat implements Enumerator {
 	 * Returns the '<em><b>Collection Format</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SwaggerCollectionFormat get(int value) {
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerContact.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerContact.java
index f2c16cc..2f1f06d 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerContact.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerContact.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerContact#getEmail <em>Email</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerContact()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerEnumObjectType.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerEnumObjectType.java
index c2d134d..87c837a 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerEnumObjectType.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerEnumObjectType.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerEnumObjectType#getEnum <em>Enum</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerEnumObjectType()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerExternalDocumentation.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerExternalDocumentation.java
index ac98fa0..e290dc3 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerExternalDocumentation.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerExternalDocumentation.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerExternalDocumentation#getDescription <em>Description</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerExternalDocumentation#getUrl <em>Url</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerExternalDocumentation()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerInfo.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerInfo.java
index 71b4ba7..13558fe 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerInfo.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerInfo.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerInfo#getDescription <em>Description</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerInfo#getVersion <em>Version</em>}</li>
@@ -40,7 +41,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerInfo#getContact <em>Contact</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerInfo#getLicense <em>License</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerInfo()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerLicense.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerLicense.java
index afa85f7..e791b82 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerLicense.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerLicense.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerLicense#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerLicense#getUrl <em>Url</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerLicense()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerModel.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerModel.java
index 48a3d3c..cb56e5e 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerModel.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerModel.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerModel#getSwagger <em>Swagger</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerModel#getInfo <em>Info</em>}</li>
@@ -46,7 +47,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerModel#getExternalDocs <em>External Docs</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerModel#getSecurityDefinitions <em>Security Definitions</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerModel()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerNamedObjectType.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerNamedObjectType.java
index 0076d52..c89120f 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerNamedObjectType.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerNamedObjectType.java
@@ -32,13 +32,13 @@ import org.openecomp.ncomp.core.NamedEntity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerNamedObjectType#getType <em>Type</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerNamedObjectType#getDefault <em>Default</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerNamedObjectType#getDescription <em>Description</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerNamedObjectType#getXml <em>Xml</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerNamedObjectType()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerObjectClassDefinition.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerObjectClassDefinition.java
index 99fd6ff..b7907f5 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerObjectClassDefinition.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerObjectClassDefinition.java
@@ -32,13 +32,13 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerObjectClassDefinition#getRequired <em>Required</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerObjectClassDefinition#getAllOf <em>All Of</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerObjectClassDefinition#getProperties <em>Properties</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerObjectClassDefinition#getAdditionalProperties <em>Additional Properties</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerObjectClassDefinition()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerObjectType.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerObjectType.java
index f0c32f8..7bb87d6 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerObjectType.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerObjectType.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerObjectType#isMany <em>Many</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerObjectType()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerOperation.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerOperation.java
index bcc6788..ea59d60 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerOperation.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerOperation.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerOperation#getTags <em>Tags</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerOperation#getSummary <em>Summary</em>}</li>
@@ -46,7 +47,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerOperation#getSecurity <em>Security</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerOperation#isDeprecated <em>Deprecated</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerOperation()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerPackage.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerPackage.java
index 03619b2..5717c54 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerPackage.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerPackage.java
@@ -43,6 +43,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-sirius-manager-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.sirius.manager'"
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerParameter.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerParameter.java
index 1d0f272..e0d8bce 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerParameter.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerParameter.java
@@ -33,11 +33,11 @@ import org.openecomp.ncomp.core.NamedEntity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerParameter#getIn <em>In</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerParameter#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerParameter()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerParameterType.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerParameterType.java
index c0d14d9..80d0649 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerParameterType.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerParameterType.java
@@ -215,6 +215,8 @@ public enum SwaggerParameterType implements Enumerator {
 	 * Returns the '<em><b>Parameter Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SwaggerParameterType get(String literal) {
@@ -231,6 +233,8 @@ public enum SwaggerParameterType implements Enumerator {
 	 * Returns the '<em><b>Parameter Type</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SwaggerParameterType getByName(String name) {
@@ -247,6 +251,8 @@ public enum SwaggerParameterType implements Enumerator {
 	 * Returns the '<em><b>Parameter Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static SwaggerParameterType get(int value) {
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerPath.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerPath.java
index cc28040..25bf508 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerPath.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerPath.java
@@ -34,10 +34,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerPath#getMethods <em>Methods</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerPath()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerReferenceObjectType.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerReferenceObjectType.java
index c496b2d..155ee26 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerReferenceObjectType.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerReferenceObjectType.java
@@ -31,11 +31,11 @@ package org.openecomp.ncomp.sirius.manager.swagger;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerReferenceObjectType#isRequired <em>Required</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerReferenceObjectType#getReference <em>Reference</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerReferenceObjectType()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerResponse.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerResponse.java
index a2e6a32..e0b1796 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerResponse.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerResponse.java
@@ -33,12 +33,12 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerResponse#getDescription <em>Description</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerResponse#getSchema <em>Schema</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerResponse#getHeaders <em>Headers</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerResponse()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurity.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurity.java
index e70d885..f4df974 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurity.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurity.java
@@ -33,10 +33,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerSecurity#getRoles <em>Roles</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerSecurity()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurityDefinition.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurityDefinition.java
index a24c9b7..2ca28bb 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurityDefinition.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurityDefinition.java
@@ -32,13 +32,13 @@ import org.openecomp.ncomp.core.NamedEntity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerSecurityDefinition#getType <em>Type</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerSecurityDefinition#getAuthorizationUrl <em>Authorization Url</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerSecurityDefinition#getFlow <em>Flow</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerSecurityDefinition#getIn <em>In</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerSecurityDefinition()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurityDefinitionScope.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurityDefinitionScope.java
index 150c34d..c58907b 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurityDefinitionScope.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurityDefinitionScope.java
@@ -32,10 +32,10 @@ import org.openecomp.ncomp.core.NamedEntity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerSecurityDefinitionScope#getDescription <em>Description</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerSecurityDefinitionScope()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurityObject.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurityObject.java
index 3095ec5..ff2caea 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurityObject.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSecurityObject.java
@@ -33,10 +33,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerSecurityObject#getList <em>List</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerSecurityObject()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSimpleObjectType.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSimpleObjectType.java
index 2a415eb..1787b0e 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSimpleObjectType.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerSimpleObjectType.java
@@ -31,6 +31,7 @@ package org.openecomp.ncomp.sirius.manager.swagger;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerSimpleObjectType#isRequired <em>Required</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerSimpleObjectType#getFormat <em>Format</em>}</li>
@@ -40,7 +41,6 @@ package org.openecomp.ncomp.sirius.manager.swagger;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerSimpleObjectType#getExample <em>Example</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerSimpleObjectType#getCollectionFormat <em>Collection Format</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerSimpleObjectType()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerTag.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerTag.java
index debeba0..deb22ff 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerTag.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerTag.java
@@ -32,12 +32,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerTag#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerTag#getDescription <em>Description</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerTag#getExternalDocs <em>External Docs</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerTag()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerXml.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerXml.java
index 1f10a87..c927060 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerXml.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/SwaggerXml.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerXml#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.SwaggerXml#isWrapped <em>Wrapped</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.swagger.SwaggerPackage#getSwaggerXml()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerContactImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerContactImpl.java
index 3454e1f..a989572 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerContactImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerContactImpl.java
@@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerContactImpl#getEmail <em>Email</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerEnumObjectTypeImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerEnumObjectTypeImpl.java
index 08536f8..2b02caa 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerEnumObjectTypeImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerEnumObjectTypeImpl.java
@@ -36,10 +36,10 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerEnumObjectTypeImpl#getEnum <em>Enum</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerExternalDocumentationImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerExternalDocumentationImpl.java
index 5340aa2..2335c60 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerExternalDocumentationImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerExternalDocumentationImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerExternalDocumentationImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerExternalDocumentationImpl#getUrl <em>Url</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerInfoImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerInfoImpl.java
index e325523..c213f40 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerInfoImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerInfoImpl.java
@@ -40,6 +40,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerInfoImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerInfoImpl#getVersion <em>Version</em>}</li>
@@ -48,7 +49,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerInfoImpl#getContact <em>Contact</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerInfoImpl#getLicense <em>License</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerLicenseImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerLicenseImpl.java
index d67be65..448ced0 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerLicenseImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerLicenseImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerLicenseImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerLicenseImpl#getUrl <em>Url</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerModelImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerModelImpl.java
index c8be5c5..d87f896 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerModelImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerModelImpl.java
@@ -55,6 +55,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerModelImpl#getSwagger <em>Swagger</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerModelImpl#getInfo <em>Info</em>}</li>
@@ -67,7 +68,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerModelImpl#getExternalDocs <em>External Docs</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerModelImpl#getSecurityDefinitions <em>Security Definitions</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerNamedObjectTypeImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerNamedObjectTypeImpl.java
index d8d4e7c..d16e51b 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerNamedObjectTypeImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerNamedObjectTypeImpl.java
@@ -44,6 +44,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerNamedObjectTypeImpl#isMany <em>Many</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerNamedObjectTypeImpl#getType <em>Type</em>}</li>
@@ -51,7 +52,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerNamedObjectTypeImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerNamedObjectTypeImpl#getXml <em>Xml</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerObjectClassDefinitionImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerObjectClassDefinitionImpl.java
index 6af474e..f896a35 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerObjectClassDefinitionImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerObjectClassDefinitionImpl.java
@@ -45,13 +45,13 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerObjectClassDefinitionImpl#getRequired <em>Required</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerObjectClassDefinitionImpl#getAllOf <em>All Of</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerObjectClassDefinitionImpl#getProperties <em>Properties</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerObjectClassDefinitionImpl#getAdditionalProperties <em>Additional Properties</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerObjectTypeImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerObjectTypeImpl.java
index 5e4459b..b123113 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerObjectTypeImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerObjectTypeImpl.java
@@ -36,10 +36,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerObjectTypeImpl#isMany <em>Many</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerOperationImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerOperationImpl.java
index acdd2c4..abf2920 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerOperationImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerOperationImpl.java
@@ -46,6 +46,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerOperationImpl#getTags <em>Tags</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerOperationImpl#getSummary <em>Summary</em>}</li>
@@ -58,7 +59,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerOperationImpl#getSecurity <em>Security</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerOperationImpl#isDeprecated <em>Deprecated</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerParameterImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerParameterImpl.java
index 07933d6..1dabc5a 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerParameterImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerParameterImpl.java
@@ -40,11 +40,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerParameterImpl#getIn <em>In</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerParameterImpl#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerPathImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerPathImpl.java
index fce7016..749140e 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerPathImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerPathImpl.java
@@ -47,10 +47,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerPathImpl#getMethods <em>Methods</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerReferenceObjectTypeImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerReferenceObjectTypeImpl.java
index afe3621..a5378d5 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerReferenceObjectTypeImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerReferenceObjectTypeImpl.java
@@ -40,11 +40,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerReferenceObjectTypeImpl#isRequired <em>Required</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerReferenceObjectTypeImpl#getReference <em>Reference</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerResponseImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerResponseImpl.java
index 4bf31e4..777be02 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerResponseImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerResponseImpl.java
@@ -44,12 +44,12 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerResponseImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerResponseImpl#getSchema <em>Schema</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerResponseImpl#getHeaders <em>Headers</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityDefinitionImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityDefinitionImpl.java
index 221d33f..5450501 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityDefinitionImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityDefinitionImpl.java
@@ -37,13 +37,13 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerSecurityDefinitionImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerSecurityDefinitionImpl#getAuthorizationUrl <em>Authorization Url</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerSecurityDefinitionImpl#getFlow <em>Flow</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerSecurityDefinitionImpl#getIn <em>In</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityDefinitionScopeImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityDefinitionScopeImpl.java
index 80fa9e0..b84401d 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityDefinitionScopeImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityDefinitionScopeImpl.java
@@ -40,10 +40,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerSecurityDefinitionScopeImpl#getDescription <em>Description</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityImpl.java
index d1b49c3..f81bfdc 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityImpl.java
@@ -37,10 +37,10 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerSecurityImpl#getRoles <em>Roles</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityObjectImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityObjectImpl.java
index ed134d2..a9bcbee 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityObjectImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSecurityObjectImpl.java
@@ -41,10 +41,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerSecurityObjectImpl#getList <em>List</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSimpleObjectTypeImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSimpleObjectTypeImpl.java
index 427bbf2..ec4f308 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSimpleObjectTypeImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerSimpleObjectTypeImpl.java
@@ -36,6 +36,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerSimpleObjectTypeImpl#isRequired <em>Required</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerSimpleObjectTypeImpl#getFormat <em>Format</em>}</li>
@@ -45,7 +46,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerSimpleObjectTypeImpl#getExample <em>Example</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerSimpleObjectTypeImpl#getCollectionFormat <em>Collection Format</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerTagImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerTagImpl.java
index a7035c9..60346c3 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerTagImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerTagImpl.java
@@ -42,12 +42,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerTagImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerTagImpl#getDescription <em>Description</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerTagImpl#getExternalDocs <em>External Docs</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerXmlImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerXmlImpl.java
index b9cb7f3..c3b4296 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerXmlImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/impl/SwaggerXmlImpl.java
@@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerXmlImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.swagger.impl.SwaggerXmlImpl#isWrapped <em>Wrapped</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/util/SwaggerSwitch.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/util/SwaggerSwitch.java
index dc3e38b..cacb099 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/util/SwaggerSwitch.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/swagger/util/SwaggerSwitch.java
@@ -70,7 +70,7 @@ public class SwaggerSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/AbstractTableTemplate.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/AbstractTableTemplate.java
index f0f634b..8c9143f 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/AbstractTableTemplate.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/AbstractTableTemplate.java
@@ -32,11 +32,11 @@ import org.openecomp.ncomp.core.NamedEntity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.AbstractTableTemplate#getTreePath <em>Tree Path</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.AbstractTableTemplate#getTablePath <em>Table Path</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplatePackage#getAbstractTableTemplate()
  * @model abstract="true"
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/HasColumnsTableTemplate.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/HasColumnsTableTemplate.java
index 84a5d81..7377a7f 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/HasColumnsTableTemplate.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/HasColumnsTableTemplate.java
@@ -34,10 +34,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.HasColumnsTableTemplate#getColumns <em>Columns</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplatePackage#getHasColumnsTableTemplate()
  * @model abstract="true"
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/IteratorTableTemplate.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/IteratorTableTemplate.java
index 4a78790..d642e52 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/IteratorTableTemplate.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/IteratorTableTemplate.java
@@ -32,10 +32,10 @@ import org.openecomp.ncomp.core.function.Iterator;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.IteratorTableTemplate#getIterator <em>Iterator</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplatePackage#getIteratorTableTemplate()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/LogTableTemplate.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/LogTableTemplate.java
index a458fde..4a77cfa 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/LogTableTemplate.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/LogTableTemplate.java
@@ -33,6 +33,7 @@ import org.openecomp.ncomp.core.logs.LogSeverity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate#getMinLevel <em>Min Level</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate#getMinSeverity <em>Min Severity</em>}</li>
@@ -40,7 +41,6 @@ import org.openecomp.ncomp.core.logs.LogSeverity;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate#getDuration <em>Duration</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.LogTableTemplate#getAggregationDuration <em>Aggregation Duration</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplatePackage#getLogTableTemplate()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplate.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplate.java
index ff0d58c..6a8b051 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplate.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplate.java
@@ -31,10 +31,10 @@ package org.openecomp.ncomp.sirius.manager.tableTemplate;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplate#getRowPath <em>Row Path</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplatePackage#getTableTemplate()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplateAttributeColumn.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplateAttributeColumn.java
index 4b5dea4..30bc5ce 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplateAttributeColumn.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplateAttributeColumn.java
@@ -31,10 +31,10 @@ package org.openecomp.ncomp.sirius.manager.tableTemplate;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateAttributeColumn#getPath <em>Path</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplatePackage#getTableTemplateAttributeColumn()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplateMetricColumn.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplateMetricColumn.java
index f345c77..d97ed98 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplateMetricColumn.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplateMetricColumn.java
@@ -32,11 +32,11 @@ import org.openecomp.ncomp.core.metrics.MetricValueOption;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateMetricColumn#getPath <em>Path</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateMetricColumn#getOption <em>Option</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplatePackage#getTableTemplateMetricColumn()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplatePackage.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplatePackage.java
index ddf5d4b..a0bcc08 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplatePackage.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TableTemplatePackage.java
@@ -42,6 +42,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplateFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-sirius-manager-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.sirius.manager'"
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TimeTableTemplate.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TimeTableTemplate.java
index 53faf84..bc23af2 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TimeTableTemplate.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/TimeTableTemplate.java
@@ -31,10 +31,10 @@ package org.openecomp.ncomp.sirius.manager.tableTemplate;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.TimeTableTemplate#getDuration <em>Duration</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.sirius.manager.tableTemplate.TableTemplatePackage#getTimeTableTemplate()
  * @model
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/AbstractTableTemplateImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/AbstractTableTemplateImpl.java
index eb1b228..1821d35 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/AbstractTableTemplateImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/AbstractTableTemplateImpl.java
@@ -40,11 +40,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.AbstractTableTemplateImpl#getTreePath <em>Tree Path</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.AbstractTableTemplateImpl#getTablePath <em>Table Path</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/HasColumnsTableTemplateImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/HasColumnsTableTemplateImpl.java
index e2714d6..271d9fc 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/HasColumnsTableTemplateImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/HasColumnsTableTemplateImpl.java
@@ -47,10 +47,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.HasColumnsTableTemplateImpl#getColumns <em>Columns</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/IteratorTableTemplateImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/IteratorTableTemplateImpl.java
index 9221429..a102ca8 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/IteratorTableTemplateImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/IteratorTableTemplateImpl.java
@@ -51,11 +51,11 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.IteratorTableTemplateImpl#getColumns <em>Columns</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.IteratorTableTemplateImpl#getIterator <em>Iterator</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/LogTableTemplateImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/LogTableTemplateImpl.java
index 12cd999..cdd887b 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/LogTableTemplateImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/LogTableTemplateImpl.java
@@ -41,6 +41,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.LogTableTemplateImpl#getMinLevel <em>Min Level</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.LogTableTemplateImpl#getMinSeverity <em>Min Severity</em>}</li>
@@ -48,7 +49,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.LogTableTemplateImpl#getDuration <em>Duration</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.LogTableTemplateImpl#getAggregationDuration <em>Aggregation Duration</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateAttributeColumnImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateAttributeColumnImpl.java
index faa23d0..5fc9bfc 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateAttributeColumnImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateAttributeColumnImpl.java
@@ -38,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.TableTemplateAttributeColumnImpl#getPath <em>Path</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateColumnImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateColumnImpl.java
index 5995352..5225713 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateColumnImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateColumnImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Column</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateImpl.java
index 3a24cb6..aa3b72f 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateImpl.java
@@ -49,11 +49,11 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.TableTemplateImpl#getColumns <em>Columns</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.TableTemplateImpl#getRowPath <em>Row Path</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateMetricColumnImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateMetricColumnImpl.java
index a59b006..1bba2ef 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateMetricColumnImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TableTemplateMetricColumnImpl.java
@@ -41,11 +41,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.TableTemplateMetricColumnImpl#getPath <em>Path</em>}</li>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.TableTemplateMetricColumnImpl#getOption <em>Option</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TimeTableTemplateImpl.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TimeTableTemplateImpl.java
index 942b194..7fae05b 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TimeTableTemplateImpl.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/impl/TimeTableTemplateImpl.java
@@ -38,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.sirius.manager.tableTemplate.impl.TimeTableTemplateImpl#getDuration <em>Duration</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/util/TableTemplateSwitch.java b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/util/TableTemplateSwitch.java
index 20d863e..0396b71 100644
--- a/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/util/TableTemplateSwitch.java
+++ b/ncomp-sirius-manager-model/src/main/xcore-gen/org/openecomp/ncomp/sirius/manager/tableTemplate/util/TableTemplateSwitch.java
@@ -70,7 +70,7 @@ public class TableTemplateSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/ncomp-sirius-manager-model/src/main/xcore/server.xcore b/ncomp-sirius-manager-model/src/main/xcore/server.xcore
index de3b243..d423fa1 100644
--- a/ncomp-sirius-manager-model/src/main/xcore/server.xcore
+++ b/ncomp-sirius-manager-model/src/main/xcore/server.xcore
@@ -37,6 +37,7 @@ import org.openecomp.ncomp.sirius.manager.tableTemplate.AbstractTableTemplate
 import org.openecomp.ncomp.core.alerts.AlertingTemplate
 import org.openecomp.ncomp.core.metrics.DoubleMetric
 import org.openecomp.ncomp.component.Component
+import org.openecomp.ncomp.core.NamedEntity
 
 annotation "http://www.eclipse.org/emf/2002/GenModel" as GenModel
 annotation 'http://openecomp.org/sirius/doc' as doc  
@@ -93,7 +94,7 @@ class LoggerInfo {
 	String name
 }
 
-class AbstractManagementServer extends SouthBoundApiWithProxy {
+abstract class AbstractManagementServer extends SouthBoundApiWithProxy {
 	op DoubleMetric[] getValues(RemoteContext cx, String path, Long start, Long end, MetricValueOption option, boolean relativeInterval)
 	op DoubleMetric[] getValuesAll(RemoteContext cx, String path, String[] metrics, Long start, Long end, MetricValueOption option, boolean relativeInterval) 
 	op LogMessage[] getMessages(RemoteContext cx, String path, Long start, Long end)
@@ -109,10 +110,29 @@ class AbstractManagementServerConfiguration extends ModuleContainer {
 	contains unordered MetricValueOption[] metricOptions
 	contains AbstractTableTemplate[] tableTemplates
 	contains unordered AlertingTemplate[] alertTemplates
-	contains unordered Function[] functions 
+	contains unordered Function[] functions 
+	contains VersionConfiguration version
+}
+
+class VersionConfiguration {
+	String version
+	String translationHandler
+	contains VersionTranslation[] supportedVersions
+}
+
+class VersionTranslation extends NamedEntity {
+	contains VersionTranslationStep[] steps
 }
 
-
+abstract class VersionTranslationStep extends NamedEntity {
+	
+}
+
+class AttributeTranslationStep extends VersionTranslationStep {
+	String attribute
+	String currentValue
+	String oldValue
+}
 
 
 
diff --git a/ncomp-sirius-manager-server/.classpath b/ncomp-sirius-manager-server/.classpath
index 81fc615..850d265 100644
--- a/ncomp-sirius-manager-server/.classpath
+++ b/ncomp-sirius-manager-server/.classpath
@@ -6,6 +6,13 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="src/main/java-gen"/>
+	<classpathentry kind="src" path="src/main/resources-gen"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
@@ -23,10 +30,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/ncomp-sirius-manager-server/.settings/org.eclipse.core.resources.prefs b/ncomp-sirius-manager-server/.settings/org.eclipse.core.resources.prefs
index 839d647..abdea9a 100644
--- a/ncomp-sirius-manager-server/.settings/org.eclipse.core.resources.prefs
+++ b/ncomp-sirius-manager-server/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,4 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8
diff --git a/ncomp-sirius-manager-server/META-INF/MANIFEST.MF b/ncomp-sirius-manager-server/META-INF/MANIFEST.MF
index 0efa0d0..cb897da 100644
--- a/ncomp-sirius-manager-server/META-INF/MANIFEST.MF
+++ b/ncomp-sirius-manager-server/META-INF/MANIFEST.MF
@@ -6,17 +6,10 @@ Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.ncomp.sirius.function,
  org.openecomp.ncomp.sirius.gui.tools,
  org.openecomp.ncomp.sirius.manager,
+ org.openecomp.ncomp.sirius.manager.logging,
  org.openecomp.ncomp.sirius.manager.logs,
  org.openecomp.ncomp.sirius.manager.metrics,
  org.openecomp.ncomp.sirius.manager.properties
-Require-Bundle: org.eclipse.emf.common,
- ncomp-core-model;bundle-version="0.1.0",
- ncomp-sirius-manager-model;bundle-version="0.1.0",
- ncomp-sirius-manager-drools;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- ncomp-core-types;bundle-version="0.1.0",
- operation-utils,
- ncomp-utils-java-extra,
- ncomp-utils-journaling
+Require-Bundle: org.eclipse.emf.common
 Import-Package: junit.framework
 Bundle-Vendor: %providerName
diff --git a/ncomp-sirius-manager-server/pom.xml b/ncomp-sirius-manager-server/pom.xml
index 1ced92a..ceb5f09 100644
--- a/ncomp-sirius-manager-server/pom.xml
+++ b/ncomp-sirius-manager-server/pom.xml
@@ -16,34 +16,34 @@
 		<openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId>
   <nexusproxy>https://nexus.onap.org</nexusproxy></properties>
 
-    	
-<build>
+
+	<build>
 		<plugins>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.7</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>${openecomp.nexus.staging.serverId}</serverId>
-                    <nexusUrl>${openecomp.nexus.proxy}</nexusUrl>
-                    <stagingProfileId>${openecomp.nexus.staging.profileId}</stagingProfileId>
-                </configuration>
-            </plugin>
-       <!-- site maven plugin -->
-       <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-site-plugin</artifactId>
-           <version>3.6</version>
-           <dependencies>
-             <dependency>
-               <groupId>org.apache.maven.wagon</groupId>
-               <artifactId>wagon-webdav-jackrabbit</artifactId>
-               <version>2.10</version>
-             </dependency>
-           </dependencies>
-       </plugin>
-    
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+				<version>1.6.7</version>
+				<extensions>true</extensions>
+				<configuration>
+					<serverId>${openecomp.nexus.staging.serverId}</serverId>
+					<nexusUrl>${openecomp.nexus.proxy}</nexusUrl>
+					<stagingProfileId>${openecomp.nexus.staging.profileId}</stagingProfileId>
+				</configuration>
+			</plugin>
+			<!-- site maven plugin -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.6</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.wagon</groupId>
+						<artifactId>wagon-webdav-jackrabbit</artifactId>
+						<version>2.10</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.1</version>
@@ -52,10 +52,101 @@
 					<target/>
 				</configuration>
 			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.5.0</version>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>java</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<executable>java</executable>
+					<mainClass>org.openecomp.utils.YamlToJava</mainClass>
+					<arguments>
+						<argument>${project.basedir}/src/main/resources/ManagementServer.yaml</argument>
+					</arguments>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>1.10</version>
+				<executions>
+					<execution>
+						<id>add-source</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>src/main/java</source>
+								<source>src/main/java-gen</source>
+							</sources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>add-resource</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>add-resource</goal>
+						</goals>
+						<configuration>
+							<resources>
+								<resource>
+									<directory>src/main/resources</directory>
+								</resource>
+								<resource>
+									<directory>src/main/resources-gen</directory>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+
+			</plugin>
+
 		</plugins>
+
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.codehaus.mojo</groupId>
+										<artifactId>exec-maven-plugin</artifactId>
+										<versionRange>[1.2.1,)</versionRange>
+										<goals>
+											<goal>java</goal>
+											<goal>exec</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+
 	</build>
-  
-  <dependencies>
+
+	<dependencies>
 		<dependency>
 			<groupId>org.openecomp.ncomp.utils</groupId>
 			<artifactId>ncomp-utils-java</artifactId>
diff --git a/ncomp-sirius-manager-server/src/main/java-gen/org/openecomp/ncomp/sirius/manager/logging/ManagementServerMessageEnum.java b/ncomp-sirius-manager-server/src/main/java-gen/org/openecomp/ncomp/sirius/manager/logging/ManagementServerMessageEnum.java
new file mode 100644
index 0000000..c537d90
--- /dev/null
+++ b/ncomp-sirius-manager-server/src/main/java-gen/org/openecomp/ncomp/sirius/manager/logging/ManagementServerMessageEnum.java
@@ -0,0 +1,22 @@
+
+package org.openecomp.ncomp.sirius.manager.logging;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.logger.EcompMessageEnum;
+
+public enum ManagementServerMessageEnum implements EcompMessageEnum {
+
+  MANAGEMENT_SERVER_WEB_REQUEST_WITHOUT_HANDLER,
+  MANAGEMENT_SERVER_WEB_REQUEST_UNKNOWN_RETURN_CLASS,
+  MANAGEMENT_SERVER_WEB_REQUEST_UNSUPPORTED_CONTENT_TYPE,
+  MANAGEMENT_SERVER_WEB_REQUEST_UNKNOWN_EXCEPTION,
+  MANAGEMENT_SERVER_RESOURCE_DOES_NOT_EXIST,
+  MANAGEMENT_SERVER_RESOURCE_EXIST,
+  MANAGEMENT_SERVER_ACTION_FORBIDDEN,
+  MANAGEMENT_SERVER_UNKNOWN_SERVICE_FAILED,
+  MANAGEMENT_SERVER_JSON_VERSION_MISMATCH;
+
+	static {
+		EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/sirius/manager/logging/ManagementServer");
+	}
+}
diff --git a/ncomp-sirius-manager-server/src/main/java-gen/org/openecomp/ncomp/sirius/manager/logging/ManagementServerOperationEnum.java b/ncomp-sirius-manager-server/src/main/java-gen/org/openecomp/ncomp/sirius/manager/logging/ManagementServerOperationEnum.java
new file mode 100644
index 0000000..eebdbff
--- /dev/null
+++ b/ncomp-sirius-manager-server/src/main/java-gen/org/openecomp/ncomp/sirius/manager/logging/ManagementServerOperationEnum.java
@@ -0,0 +1,26 @@
+
+package org.openecomp.ncomp.sirius.manager.logging;
+
+import org.openecomp.entity.EcompOperationEnum;
+
+public enum ManagementServerOperationEnum implements EcompOperationEnum {
+
+  MANAGEMENT_SERVER_CREATE_RESOURCE("MANAGEMENT-SERVER-CREATE-RESOURCE"),
+  MANAGEMENT_SERVER_UPDATE_RESOURCE("MANAGEMENT-SERVER-UPDATE-RESOURCE"),
+  MANAGEMENT_SERVER_LIST_RESOURCE("MANAGEMENT-SERVER-LIST-RESOURCE"),
+  MANAGEMENT_SERVER_DELETE_RESOURCE("MANAGEMENT-SERVER-DELETE-RESOURCE"),
+  MANAGEMENT_SERVER_UNKNOWN_SERVICE("MANAGEMENT-SERVER-UNKNOWN-SERVICE") ; 
+
+
+	private String n;
+	
+	private ManagementServerOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
+}
diff --git a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/gui/tools/GuiModelUtils.java b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/gui/tools/GuiModelUtils.java
index 3d8049a..f94c946 100644
--- a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/gui/tools/GuiModelUtils.java
+++ b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/gui/tools/GuiModelUtils.java
@@ -499,7 +499,7 @@ public class GuiModelUtils {
 			// TODO handle parameters.
 			return logsReport(s, "", DateUtils.dateFromString("-24hour"), new Date(),LogLevel.DEBUG,LogSeverity.SEV4);
 		}
-		throw new RuntimeException("Unable to create table: " + path);
+		throw new RuntimeException("Unable to find table: " + path);
 	}
 
 	private static GuiTable tableFromIteratorTableTemplate(ManagementServer s, EObject o, IteratorTableTemplate t) {
diff --git a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/AbstractClient.java b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/AbstractClient.java
index a61c02c..782c32b 100644
--- a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/AbstractClient.java
+++ b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/AbstractClient.java
@@ -41,6 +41,7 @@ public abstract class AbstractClient {
 	public String language;
 	public String namespace;
 	protected int defaultTimeout = 60000;
+	private String version;
 	private static HashMap<EObject, AbstractClient> map1 = new HashMap<EObject, AbstractClient>();
 	private static HashMap<EObject, String> map2 = new HashMap<EObject, String>();
 
@@ -74,8 +75,22 @@ public abstract class AbstractClient {
 		EOperation op = EUtils.name2operation(o.eClass(), opName);
 		if (op == null)
 			throw new RuntimeException("no such operation: " + opName + " on " + o);
-		JSONObject res = operationPath2(path, opName, timeout, ManagementServer.params2json(op, params));
-		return ManagementServer.json2response(op, res);
+		String clientVersion = getClientVersion();
+		JSONObject res = operationPath2(path, opName, timeout, ManagementServer.params2json(op, params, clientVersion));
+		return ManagementServer.json2response(op, res, clientVersion);
+	}
+
+	private String getClientVersion() {
+		try {
+			HashMap<String, String> headers = new HashMap<String, String>();
+			JSONObject json = new JSONObject();
+			Long timeout = 5000L;			
+			JSONObject res = httpJsonTransaction("/api/versions", "PUT", headers, json, timeout);
+			return res.getJSONArray("$list").getString(0);
+		}
+		catch (Exception e) {
+			return "UNKNOWN";
+		}
 	}
 
 	public JSONObject operation(String resourcePath, String opName, Long timeout, JSONObject json) {
@@ -95,15 +110,16 @@ public abstract class AbstractClient {
 		if (op == null) {
 			throw new RuntimeException("Unknown operation " + opName + " on Eclass " + c.getName());
 		}
+		String clientVersion = getClientVersion();
 		JSONObject res;
-		JSONObject json1 = ManagementServer.params2json(op, params);
+		JSONObject json1 = ManagementServer.params2json(op, params, clientVersion);
 		if (language != null && language.equals("restconf")) { 
 		    res = operationOdl("/restconf/operations/" + namespace + ":" + opName,timeout,json1);
 		}
 		else {
 			res = operationPath2(resourcePath, op.getName(), timeout, json1 );
 		}
-		return ManagementServer.json2response(op, res);
+		return ManagementServer.json2response(op, res, clientVersion);
 	}
 
 	// abstract public void sendToDataRouter(String feedname, String fileId,
@@ -168,6 +184,11 @@ public abstract class AbstractClient {
 	}
 
 	public JSONObject httpJsonTransaction(String path, String method, HashMap<String, String> headers, JSONObject body, Long timeout) {
+		if (version != null) {
+			if (headers == null) 
+				headers = new HashMap<String, String>();
+			headers.put("X-ECOMP-Client-Version", version);
+		}
 		String s = httpStringTransaction(path, method, headers, body, timeout);
 		if (s == null) return null;
 		if (s.startsWith("[")) {
@@ -196,4 +217,12 @@ public abstract class AbstractClient {
 	}
 
 	abstract public String getRemote();
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	
+	public String getVersion() {
+		return version;
+	}
 }
diff --git a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/IRequestHandler.java b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/IRequestHandler.java
index f1d8020..cbfbd99 100644
--- a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/IRequestHandler.java
+++ b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/IRequestHandler.java
@@ -26,6 +26,6 @@ import java.io.InputStream;
 import org.json.JSONObject;
 
 public interface IRequestHandler {
-	Object handleJson(String userName , String action,  String resourcePath, JSONObject json, JSONObject context);
+	Object handleJson(String userName , String action,  String resourcePath, JSONObject json, JSONObject context, String clientVersion);
 	Object handleBinary(String userName , String action,  String resourcePath, InputStream in);
 }
diff --git a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/ISiriusProvider.java b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/ISiriusProvider.java
new file mode 100644
index 0000000..55e9c42
--- /dev/null
+++ b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/ISiriusProvider.java
@@ -0,0 +1,26 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ */
+	
+package org.openecomp.ncomp.sirius.manager;
+
+public interface ISiriusProvider {
+	BasicAdaptorProvider getSiriusProvider();
+}
diff --git a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/IVersionConverterHandler.java b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/IVersionConverterHandler.java
new file mode 100644
index 0000000..8b5c4b1
--- /dev/null
+++ b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/IVersionConverterHandler.java
@@ -0,0 +1,30 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ */
+	
+package org.openecomp.ncomp.sirius.manager;
+
+import org.json.JSONObject;
+import org.openecomp.ncomp.sirius.manager.server.VersionConfiguration;
+
+public interface IVersionConverterHandler {
+	JSONObject translateJsonObject(JSONObject json, String version1, String version2);
+	void setconfiguration(VersionConfiguration c);
+}
diff --git a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/JavaHttpClient.java b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/JavaHttpClient.java
index 88deb35..de5a80f 100644
--- a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/JavaHttpClient.java
+++ b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/JavaHttpClient.java
@@ -29,12 +29,17 @@ import org.apache.log4j.Logger;
 import org.json.JSONObject;
 import org.apache.commons.codec.binary.Base64;
 
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.ncomp.sirius.manager.logging.ManagementServerMessageEnum;
+import org.openecomp.ncomp.sirius.manager.logging.ManagementServerOperationEnum;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
 import org.openecomp.ncomp.utils.CryptoUtils;
 import org.openecomp.ncomp.utils.PropertyUtil;
 import org.openecomp.ncomp.webservice.utils.FileUtils;
 
 public class JavaHttpClient extends AbstractClient {
 	public static final Logger logger = Logger.getLogger(JavaHttpClient.class);
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	String authorization;
 	String baseAddress;
 	private boolean debug = false;
@@ -90,6 +95,7 @@ public class JavaHttpClient extends AbstractClient {
 		}
 		HttpURLConnection uc = null;
 		InputStream is = null;
+		boolean recordRequest = ecomplogger.isTargetSelf();
 		try {
 			URL u = new URL(url);
 			uc = (HttpURLConnection) u.openConnection();
@@ -99,10 +105,23 @@ public class JavaHttpClient extends AbstractClient {
 				headers = new HashMap<String, String>();
 			headers.put("Content-type", "application/json");
 			headers.put("Authorization", authorization);
+			if (ecomplogger.getRequestId() == null) {
+				if (System.getProperties().contains("ecomp.requestid"))
+					ecomplogger.setRequestId(System.getProperties().getProperty("ecomp.requestid"));
+				else if (System.getenv("ECOMP_REQUESTID") != null)
+					ecomplogger.setRequestId(System.getenv("ECOMP_REQUESTID"));
+				else 
+					ecomplogger.newRequestId();
+			}
+			if (recordRequest) {
+				// request is not currently recorded.
+				ecomplogger.recordMetricEventStart(ManagementServerOperationEnum.MANAGEMENT_SERVER_UNKNOWN_SERVICE, url);
+			}
+			headers.put("X-ECOMP-RequestID", ecomplogger.getRequestId());
 			for (String n : headers.keySet()) {
 				uc.setRequestProperty(n, headers.get(n));
 				if (debug) {
-					System.err.println("HTTP REQUEST header: " + n + " " + headers.get(n));
+					System.err.println("HTTP REQUEST header: " + n + ": " + headers.get(n));
 				}
 			}
 			uc.setRequestMethod(method);
@@ -128,18 +147,33 @@ public class JavaHttpClient extends AbstractClient {
 					System.err.println("HTTP ERROR: " + url + " " + baos);
 				}
 				throw new Jetty8ClientException("HTTP Request Failed: URL: " + url + " code:" + rc + " msg:"
-						+ uc.getResponseMessage() + " " + baos);
+						+ uc.getResponseMessage());
 			}
 			is = uc.getInputStream();
 			FileUtils.copyStream(is, baos);
+			byte[] res;
 			if (baos.size() == 0)
-				return null;
-			return (baos.toByteArray());
+				res = null;
+			else
+				res = (baos.toByteArray());
+			if (recordRequest) 
+				ecomplogger.recordMetricEventEnd();
+			return res;
 		} catch (RuntimeException re) {
 //			ManagementServerUtils.printStackTrace(re);
+			ManagementServerMessageEnum msg = ManagementServerMessageEnum.MANAGEMENT_SERVER_UNKNOWN_SERVICE_FAILED;
+			ecomplogger.warn(msg, re.toString(), url);
+			if (recordRequest) {
+				ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, msg, re.getMessage());
+			}
 			throw re;
 		} catch (Exception e) {
-//			ManagementServerUtils.printStackTrace(e);
+			ManagementServerMessageEnum msg = ManagementServerMessageEnum.MANAGEMENT_SERVER_UNKNOWN_SERVICE_FAILED;
+			ecomplogger.warn(msg, e.toString(), url);
+			if (recordRequest) { 
+				ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, msg, e.getMessage());
+			}
+			ManagementServerUtils.printStackTrace(e);
 			throw new RuntimeException("http error: " + e, e);
 		} finally {
 			if (is != null) {
diff --git a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/Jetty8ClientOld.java b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/Jetty8ClientOld.java
deleted file mode 100644
index d3aae2a..0000000
--- a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/Jetty8ClientOld.java
+++ /dev/null
@@ -1,204 +0,0 @@
-
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-package org.openecomp.ncomp.sirius.manager;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.util.HashMap;
-
-import org.apache.log4j.Logger;
-import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.HttpExchange;
-import org.eclipse.jetty.http.ssl.SslContextFactory;
-import org.eclipse.jetty.io.Buffer;
-import org.eclipse.jetty.io.ByteArrayBuffer;
-import org.eclipse.jetty.util.B64Code;
-import org.eclipse.jetty.util.StringUtil;
-import org.json.JSONObject;
-
-import org.openecomp.ncomp.utils.CryptoUtils;
-import org.openecomp.ncomp.utils.PropertyUtil;
-
-@SuppressWarnings("deprecation")
-public class Jetty8ClientOld extends AbstractClient {
-	public static final Logger logger = Logger.getLogger(Jetty8ClientOld.class);
-	HttpClient httpClient;
-	String authorization;
-	String baseAddress;
-	private boolean debug = false;
-
-	public Jetty8ClientOld(String fileName, String endpoint) {
-		try {
-			props = PropertyUtil.getPropertiesFromClasspath(fileName);
-			language = props.getProperty(endpoint + ".language", "somf");
-			namespace = props.getProperty(endpoint + ".namespace", null);
-			setBaseAddress(props.getProperty(endpoint + ".endpoint"));
-			if (getBaseAddress() == null) {
-				logger.error("unable to determine baseAddress for endpoint: " + endpoint + " in " + fileName);
-				throw new RuntimeException("unable to determine baseAddress for endpoint: " + endpoint + " in " + fileName);
-			}
-			String user = props.getProperty(endpoint + ".user");
-			String password = decryptPassword(props.getProperty(endpoint + ".password"));
-			debug = Boolean.parseBoolean(props.getProperty(endpoint + ".debug","false"));
-//			if (debug) 
-//				System.err.println("using " + user + " "+ password + " "+ endpoint + " " + fileName + " " + getBaseAddress());
-			authorization = "Basic " + B64Code.encode(user + ":" + password, StringUtil.__ISO_8859_1);
-			if (props.containsKey(endpoint + ".keyStore")) {
-				SslContextFactory sslContextFactory = new SslContextFactory(props.getProperty(endpoint + ".keyStore"));
-				sslContextFactory.setKeyManagerPassword(props.getProperty(endpoint + ".keyManagerPassword"));
-				sslContextFactory.setKeyStorePassword(props.getProperty(endpoint + ".keyStorePassword"));
-				// sslContextFactory.setTrustStorePath(probs.getProperty(endpoint.trustStore"));
-				sslContextFactory.setTrustStorePassword(props.getProperty(endpoint + ".trustStorePassword"));
-				httpClient = new HttpClient(sslContextFactory);
-			} else
-				httpClient = new HttpClient();
-			httpClient.start();
-		} catch (Exception e) {
-			ManagementServerUtils.printStackTrace(e);
-			logger.error("creating client failed: " + e.toString());
-		}
-	}
-	
-	private String decryptPassword(String s) {
-		if (s.startsWith("rsa:")) {
-			s = CryptoUtils.decryptPrivate(CryptoUtils.getKey("config/server.private"), s.substring(4));
-		}
-		return s;
-	}
-
-	@Override
-	public byte[] httpBinaryTransaction(String path, String method, HashMap<String, String> headers, JSONObject body, Long timeout) {
-		class Exchange extends HttpExchange {
-			@SuppressWarnings("unused")
-			String version;
-			int code;
-			String message;
-			@SuppressWarnings("unused")
-			String location;
-			ByteArrayOutputStream content = new ByteArrayOutputStream();
-
-			@Override
-			protected void onResponseHeader(Buffer name, Buffer value) {
-				// System.out.println("HEADER: " + name + " " + value);
-				if (name.toString().equals("Location"))
-					location = value.toString();
-			}
-
-			@Override
-			protected void onResponseStatus(Buffer httpVersion, int statusCode, Buffer statusMessage) {
-				logger.debug("v=" + httpVersion + " code=" + statusCode + " m=" + "statusMessage");
-				version = httpVersion.toString();
-				code = statusCode;
-				message = statusMessage.toString();
-			}
-
-			@Override
-			protected void onResponseContent(Buffer content) {
-				logger.debug("onResponseContent: " + content.toString());
-				byte[] b = content.asArray();
-				this.content.write(b,0,b.length);
-			}
-		}
-		String url = getBaseAddress() + path;
-		Exchange exchange = new Exchange();
-		exchange.setURL(url);
-		exchange.setMethod(method);
-		if (debug) 
-			System.err.println("HTTP REQUEST: " + method + " " + url);
-		if (headers == null)
-			headers = new HashMap<String, String>();
-		headers.put("Content-type", "application/json");
-		headers.put("Authorization", authorization);
-		for (String n : headers.keySet()) {
-			exchange.addRequestHeader(n, headers.get(n));
-			if (debug)
-				System.err.println("HTTP REQUEST header: " + n + " " + headers.get(n));
-		}
-		if (body != null) {
-			// exchange.setRequestContentSource(new
-			// ByteArrayInputStream(body.toString().getBytes()));
-			if (debug) System.err.println("HTTP REQUEST JSON body: " +  body.toString(2));
-			exchange.setRequestContent(new ByteArrayBuffer(body.toString(2).getBytes()));
-		}
-		try {
-			if (timeout != null && timeout > 0) {
-				exchange.setTimeout(timeout);
-			}
-			httpClient.send(exchange);
-			int exchangeState = -1;
-			if (debug) System.err.println("HTTP REQUEST timeout: " + timeout);
-			exchangeState = exchange.waitForDone();
-			if (logger.isDebugEnabled()) 
-				logger.debug("Exchange done: " + exchangeState);
-			if (debug) System.err.println("HTTP RESPONSE STATE: " + exchangeState + " " + exchange.code);
-			switch (exchange.code) {
-			case 200:
-			case 204:
-				break;
-			default:
-				throw new Jetty8ClientException("HTTP Exchanged Failed: URL: " + url + " state:" + exchangeState + " code:" + exchange.code
-						+ " msg:" + exchange.message);
-			}
-			if (debug) System.out.println("HTTP RESPONSE CONTENT: " + exchange.content);
-			if (exchange.content.size() == 0)
-				return null;
-			return exchange.content.toByteArray();
-		} catch (Jetty8ClientException e) {
-			throw e;
-		} catch (Exception e) {
-			 ManagementServerUtils.printStackTrace(e);
-			String body1 = body == null ? "NULL" : body.toString(2);
-			logger.error("http error: " + url + " body=" + body1 + " ", e);
-			throw new RuntimeException("http error: " + e, e);
-		}
-	}
-
-	public String getBaseAddress() {
-		return baseAddress;
-	}
-
-	public void setBaseAddress(String baseAddress) {
-		this.baseAddress = baseAddress;
-	}
-
-	public void setDebug(boolean debug) {
-		this.debug = debug;
-	}
-
-	public void httpBinaryTransaction(String path, String method,
-			HashMap<String, String> headers, InputStream i, int j) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void httpJsonTransaction(String path, String method,
-			HashMap<String, String> headers, InputStream i, int j) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	@Override
-	public String getRemote() {
-		return getBaseAddress();
-	}
-
-}
diff --git a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/Jetty8Server.java b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/Jetty8Server.java
index e9774ee..5566162 100644
--- a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/Jetty8Server.java
+++ b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/Jetty8Server.java
@@ -42,15 +42,22 @@ import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
 import org.eclipse.jetty.util.B64Code;
 import org.eclipse.jetty.util.StringUtil;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
-import org.openecomp.logger.EcompLogger;
+import org.openecomp.entity.EcompSubComponentInstance;
+import org.openecomp.logger.EcompException;
+import org.openecomp.logger.EcompMessageEnum;
+import org.openecomp.logger.StatusCodeEnum;
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.ncomp.sirius.manager.logging.ManagementServerMessageEnum;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
 import org.openecomp.ncomp.utils.PropertyUtil;
 import org.openecomp.ncomp.webservice.utils.JsonUtils;
 
 public class Jetty8Server {
 	public static final Logger logger = Logger.getLogger(Jetty8Server.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	Server server;
 	private SelectChannelConnector conn1;
 	private int actualport;
@@ -87,13 +94,20 @@ public class Jetty8Server {
 				logger.info("Authorization not valid");
 				return;
 			}
+			if (request.getRemoteHost() != null) ecomplogger.setRemoteHost(request.getRemoteHost());
+			if (userName != null) ecomplogger.setPartnerName(userName);
+			ecomplogger.startUnknownAuditEvent(contextPath);
 			String requestId = request.getHeader("X-ECOMP-RequestID");
 			if (requestId == null) {
 				ecomplogger.newRequestId();
+				ecomplogger.missingRequestId(request);
 			}
 			else {
-				ecomplogger.setRequestId(requestId);;
+				ecomplogger.setRequestId(requestId);
 			}
+			String clientVersion = request.getHeader("X-ECOMP-Client-Version");
+			if (clientVersion == null) clientVersion = "UNKNOWN";
+			ecomplogger.setInstanceId(EcompSubComponentInstance.getServerName() + ":" + props.getProperty("server.port") + contextPath);
 			String action = request.getHeader("action");
 			if (action == null) {
 				String method = request.getMethod();
@@ -104,13 +118,14 @@ public class Jetty8Server {
 			String contextPath1 = null;
 			IRequestHandler handler = null;
 			for (String prefix : handlerMap.keySet()) {
-				if (contextPath.startsWith(prefix)) {
+				if (contextPath.equals(prefix) || contextPath.startsWith(prefix + "/")) {
 					contextPath1 = contextPath.substring(prefix.length());
 					handler = handlerMap.get(prefix);
 				}
 			}
 			if (handler == null) {
 				logger.warn("request with no handler: " + contextPath);
+				handleError(jRequest,response,ManagementServerMessageEnum.MANAGEMENT_SERVER_WEB_REQUEST_WITHOUT_HANDLER,contextPath);
 				return;
 			}
 			try {
@@ -120,18 +135,16 @@ public class Jetty8Server {
 //					System.err.println(s); 
 //					JSONObject json = new JSONObject(new String(s.toByteArray()));
 					JSONObject json = JsonUtils.stream2json(request.getInputStream());
-					res = handler.handleJson(userName, action, contextPath1, json, req2context(contextPath, jRequest, userName));
-				} else
-					throw new ManagerException(HttpServletResponse.SC_BAD_REQUEST, "Cannot use content type: "
-							+ jRequest.getContentType());
-			} catch (ManagerException e) {
-				setResponseHeaders(response);
-				response.sendError(e.code, e.getMessage());
-				ManagementServerUtils.printStackTrace(e);
+					res = handler.handleJson(userName, action, contextPath1, json, req2context(contextPath, jRequest, userName), clientVersion);
+				} else {
+					handleError(jRequest,response,ManagementServerMessageEnum.MANAGEMENT_SERVER_WEB_REQUEST_UNSUPPORTED_CONTENT_TYPE,jRequest.getContentType());
+					return;
+				}
+			} catch (EcompException e) {
+				handleError(jRequest, response, e.msgEnum, e.args);
 				return;
 			} catch (Exception e) {
-				ManagementServerUtils.printStackTrace(e);
-				response.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
+				handleError(jRequest,response,ManagementServerMessageEnum.MANAGEMENT_SERVER_WEB_REQUEST_UNKNOWN_EXCEPTION,e.getMessage());
 				return;
 			}
 			if (res != null) {
@@ -141,15 +154,19 @@ public class Jetty8Server {
 					PrintWriter w = response.getWriter();
 					w.append(json1.toString(2));
 					w.close();
-					response.setStatus(200);
-					jRequest.setHandled(true);
-				} else
-					response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Unable to handle output object: "
-							+ res.getClass().getName());
-				return;
+				} else if (res instanceof JSONArray) {
+					JSONArray json1 = (JSONArray) res;
+					PrintWriter w = response.getWriter();
+					w.append(json1.toString(2));
+					w.close();	
+				} else {
+					handleError(jRequest,response,ManagementServerMessageEnum.MANAGEMENT_SERVER_WEB_REQUEST_UNKNOWN_RETURN_CLASS,res.getClass().getName());
+					return;
+				}
 			}
 			response.setStatus(HttpServletResponse.SC_OK);
-			jRequest.setHandled(true);
+			jRequest.setHandled(true);	
+			ecomplogger.recordAuditEventEnd();
 		}
 
 		private void setResponseHeaders(HttpServletResponse response) {
@@ -161,6 +178,26 @@ public class Jetty8Server {
 				}
 			}
 		}
+		
+		private void handleError(Request jRequest, HttpServletResponse response, EcompMessageEnum msg, String... args) throws IOException {
+			try {
+				ecomplogger.warn(msg, args);
+				ecomplogger.recordAuditEventEnd(StatusCodeEnum.ERROR, msg, args);
+				String s = EELFResourceManager.getIdentifier(msg);
+				// Assume s ends in something like 4015W
+				int httpErrorCode = 501;
+				try {
+					String error = s.substring(s.length()-5,s.length()-2);
+					httpErrorCode = Integer.parseInt(error);
+				} catch (Exception e) {
+				}
+				response.sendError(httpErrorCode, EELFResourceManager.format(msg,args));
+			} catch (Exception e) {
+				ManagementServerUtils.printStackTrace(e);
+				response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,e.getMessage());
+			}
+			jRequest.setHandled(true);
+		}
 
 		private JSONObject req2context(String contextPath, Request jRequest, String user) {
 			JSONObject c = new JSONObject();
@@ -195,10 +232,10 @@ public class Jetty8Server {
 				f.setTrustStore(props.getProperty("server.trustStore"));
 				f.setTrustStorePassword(props.getProperty("server.trustStorePassword"));
 				logger.info("HTTPS excluded protocols: " + Arrays.asList(f.getExcludeProtocols()));
-				f.addExcludeProtocols("SSLv1","SSLv2","SSLv3");
+				f.addExcludeProtocols("SSLv1", "SSLv2", "SSLv3");
 				logger.info("HTTPS excluded protocols after fix: " + Arrays.asList(f.getExcludeProtocols()));
 				SslSelectChannelConnector c = new SslSelectChannelConnector(f);
-				c.setPort(port); 
+				c.setPort(port);
 				c.setMaxIdleTime(30000);
 				server.addConnector(c);
 				conn1 = c;
@@ -221,19 +258,21 @@ public class Jetty8Server {
 				logger.info("Adding HTTP on secondary port: " + port);
 			}
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
 			ManagementServerUtils.printStackTrace(e);
 		}
 	}
-	
+
 	/**
-	 *	In unit testing, we want to start on an operating system selected port number, so we configure a port number of 0, and then use this to find out the real port number
+	 * In unit testing, we want to start on an operating system selected port
+	 * number, so we configure a port number of 0, and then use this to find out
+	 * the real port number
 	 */
 	public int getPort() {
-		return(actualport);
+		return (actualport);
 	}
+
 	/**
-	 *	In unit testing, we want to shut down the server
+	 * In unit testing, we want to shut down the server
 	 */
 	public void stop() {
 		try {
@@ -256,7 +295,6 @@ public class Jetty8Server {
 			actualport = conn1.getLocalPort();
 			server.join();
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
 			ManagementServerUtils.printStackTrace(e);
 		}
 	}
@@ -273,7 +311,7 @@ public class Jetty8Server {
 	class DummyRequestHandler implements IRequestHandler {
 		@Override
 		public Object handleJson(String userName, String action, String resourcePath, JSONObject json,
-				JSONObject context) {
+				JSONObject context, String clientVersion) {
 			logger.debug("handleJson: user=" + userName + " action=" + action + " path=" + resourcePath + " json="
 					+ json);
 			return null;
@@ -300,7 +338,6 @@ public class Jetty8Server {
 				actualport = conn1.getLocalPort();
 				server.join();
 			} catch (Exception e) {
-				// TODO Auto-generated catch block
 				ManagementServerUtils.printStackTrace(e);
 			}
 		}
@@ -334,7 +371,7 @@ public class Jetty8Server {
 		String pw2 = props.getProperty("server.user." + user);
 		boolean valid = pw.equals(JavaHttpClient.decryptPassword(pw2));
 		if (!valid)
-			logger.warn("Authorization: bad PW: " + user +"@" + r.getRemoteAddr() + " " + pw.substring(0, 2));
+			logger.warn("Authorization: bad PW: " + user + "@" + r.getRemoteAddr() + " " + pw.substring(0, 2));
 		return valid ? user : null;
 	}
 
diff --git a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/ManagementServer.java b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/ManagementServer.java
index cdddcf2..3fc8140 100644
--- a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/ManagementServer.java
+++ b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/ManagementServer.java
@@ -66,10 +66,10 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-
 import org.openecomp.entity.EcompComponent;
 import org.openecomp.entity.EcompSubComponent;
-import org.openecomp.entity.EcompSubComponentInstance;
+import org.openecomp.logger.EcompException;
+import org.openecomp.logger.GenericMessagesMessageEnum;
 import org.openecomp.ncomp.component.Api;
 import org.openecomp.ncomp.component.ApiRequestStatus;
 import org.openecomp.ncomp.component.ComponentClass;
@@ -78,21 +78,25 @@ import org.openecomp.ncomp.component.DroolsObjectChange;
 import org.openecomp.ncomp.core.HasOperationalState;
 import org.openecomp.ncomp.core.NamedEntity;
 import org.openecomp.ncomp.core.OperationalState;
-import org.openecomp.ncomp.core.function.Function;
 import org.openecomp.ncomp.sirius.manager.drools.DroolsRuntime;
+import org.openecomp.ncomp.sirius.manager.logging.ManagementServerMessageEnum;
+import org.openecomp.ncomp.sirius.manager.logging.ManagementServerOperationEnum;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
 import org.openecomp.ncomp.sirius.manager.logs.LogMessageManager;
 import org.openecomp.ncomp.sirius.manager.metrics.MetricManager;
 import org.openecomp.ncomp.sirius.manager.properties.PropertyManager;
 import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer;
 import org.openecomp.ncomp.sirius.manager.server.LoggerInfo;
+import org.openecomp.ncomp.sirius.manager.server.ServerFactory;
+import org.openecomp.ncomp.sirius.manager.server.VersionConfiguration;
 import org.openecomp.ncomp.utils.PropertyUtil;
 import org.openecomp.ncomp.utils.SortUtil;
-import org.openecomp.ncomp.utils.StringUtil;
 import org.openecomp.ncomp.webservice.utils.FileUtils;
 import org.openecomp.ncomp.webservice.utils.JsonUtils;
 
-public class ManagementServer implements IRequestHandler, ISwaggerHandler {
+public class ManagementServer implements IRequestHandler, ISiriusServer, ISwaggerHandler  {
 	public static final Logger logger = Logger.getLogger(ManagementServer.class);
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	private static final String PERSIST = "http://openecomp.org/sirius/persistence";
 	private Jetty8Client jettyClient;
 	private Properties props;
@@ -108,6 +112,9 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 	public MetricManager metrics;
 	public PropertyManager properties;
 	public boolean isSlave = false;
+	private static String version;
+	private static String buildVersion;
+	private static IVersionConverterHandler versionHandler;
 
 	public ManagementServer(EFactory eFactory, String eClassName, String directory, String propertyFileName) {
 		TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
@@ -130,6 +137,37 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 		// jettyClient = new Jetty8Client();
 	}
 
+	private void setupVersionHandler(String directory) {
+		VersionConfiguration v;
+		if (version != null) return;
+		System.err.println("VVVVVV setupVersionHandler: " + directory);
+		try {
+			v = (VersionConfiguration) loadObjectFromDirectory(ServerFactory.eINSTANCE, "VersionConfiguration", directory, false, null);
+		} catch (IOException e1) {
+			e1.printStackTrace();
+			return;
+		}
+		version = v.getVersion();
+		if (version == null) version = buildVersion;
+		if (v.getTranslationHandler() == null) {
+			versionHandler = new SimpleVersionHandler();
+			versionHandler.setconfiguration(v);
+			System.err.println("VVVVVV setupVersionHandler 1");
+			return;
+		}
+		try {
+			Class<?> c = Class.forName(v.getTranslationHandler());
+			Constructor<?> constructor = c.getConstructor();
+			versionHandler = (IVersionConverterHandler) constructor.newInstance();
+			versionHandler.setconfiguration(v);
+			System.err.println("VVVVVV setupVersionHandler 2: " + v.getTranslationHandler());
+		} catch (Throwable e) {
+			e.printStackTrace();
+			System.err.println("Unable to create instance of class: " + v.getTranslationHandler());
+			System.exit(3);
+		}
+	}
+
 	public ManagementServer() {
 		// TODO Auto-generated constructor stub
 	}
@@ -137,7 +175,7 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 	static AtomicLong requestId = new AtomicLong();
 
 	@Override
-	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context) {
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context, String clientVersion) {
 		logger.debug("handleJson: " + userName + " " + action + " " + resourcePath + " " + context.get("remoteIp"));
 		long start = new Date().getTime();
 		String reqId = Long.toString(start) + ":" + requestId.incrementAndGet();
@@ -154,14 +192,15 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 			r.put("context", context);
 			logger2.info(r.toString());
 		}
-		if (!pe.permit(userName, action, resourcePath)) {
-			handleJsonReportResult(reqId, start, null, "NOT_PERMITTED", logger2);
-			throw new RuntimeException("Action not permitted: " + userName + " " + action + " " + resourcePath);
+		if (!pe.permit(userName, action, resourcePath)) { 
+			handleJsonReportResult(reqId, start, null, "NOT_PERMITTED", logger2, clientVersion);
+			throw EcompException.create(ManagementServerMessageEnum.MANAGEMENT_SERVER_ACTION_FORBIDDEN, userName, action, resourcePath);
 		}
 		Subject subject = find(resourcePath);
 		if (action.equals("UPDATE")) {
+			ecomplogger.recordAuditEventStartIfNeeded(ManagementServerOperationEnum.MANAGEMENT_SERVER_UPDATE_RESOURCE,this,root);
 			if (subject == null || subject.o == null) {
-				throw new RuntimeException("Unable to find to update: " + resourcePath);
+				throw EcompException.create(ManagementServerMessageEnum.MANAGEMENT_SERVER_RESOURCE_DOES_NOT_EXIST,resourcePath);
 			}
 			boolean useNulls = false;
 			if (context != null && context.has("parameters")) {
@@ -169,21 +208,23 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 				useNulls = m.has("useNulls");
 			}
 			try {
+				json = translateJsonObject(json, clientVersion, version);
 				Object res = update(userName, subject, json, useNulls);
-				handleJsonReportResult(reqId, start, res, "OK", logger2);
+				handleJsonReportResult(reqId, start, res, "OK", logger2, clientVersion);
 				return res;
 			} catch (RuntimeException e) {
-				handleJsonReportResult(reqId, start, null, "ERROR", logger2);
+				handleJsonReportResult(reqId, start, null, "ERROR", logger2, clientVersion);
 				printStackTrace(e);
 				throw e;
 			}
 		}
 		if (action.equals("CREATE")) {
+			ecomplogger.recordAuditEventStartIfNeeded(ManagementServerOperationEnum.MANAGEMENT_SERVER_CREATE_RESOURCE, this, root);
 			String id = null;
 			if (subject != null) {
 				if (subject.ref == null || subject.ref.isMany()) {
-					handleJsonReportResult(reqId, start, null, "CREATE_ON_EXISTING_RESOURCE", logger2);
-					throw new RuntimeException("resource already exists: " + resourcePath);
+					handleJsonReportResult(reqId, start, null, "CREATE_ON_EXISTING_RESOURCE", logger2, clientVersion);
+					throw EcompException.create(ManagementServerMessageEnum.MANAGEMENT_SERVER_RESOURCE_EXIST,resourcePath);
 				}
 			} else {
 				int index = resourcePath.lastIndexOf("/");
@@ -197,19 +238,22 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 				else
 					json.put("name", id);
 			}
+			json = translateJsonObject(json, clientVersion, version);
 			Object res = create(subject, json, !json.has("$nosave"));
-			handleJsonReportResult(reqId, start, res, "OK", logger2);
+			handleJsonReportResult(reqId, start, res, "OK", logger2, clientVersion);
 			return res;
 		}
 		if (action.equals("DELETE")) {
+			ecomplogger.recordAuditEventStartIfNeeded(ManagementServerOperationEnum.MANAGEMENT_SERVER_DELETE_RESOURCE,this,root);
 			if (subject == null || subject.o == null) {
-				throw new RuntimeException("Unable to find to delete: " + resourcePath);
+				throw EcompException.create(ManagementServerMessageEnum.MANAGEMENT_SERVER_RESOURCE_DOES_NOT_EXIST,resourcePath);
 			}
 			Object res = delete(subject);
-			handleJsonReportResult(reqId, start, res, "OK", logger2);
+			handleJsonReportResult(reqId, start, res, "OK", logger2, clientVersion);
 			return res;
 		}
 		if (action.equals("LIST")) {
+			ecomplogger.recordAuditEventStartIfNeeded(ManagementServerOperationEnum.MANAGEMENT_SERVER_LIST_RESOURCE,this,root);
 			int levels = 1;
 			if (context != null && context.has("parameters")) {
 				JSONObject m = (JSONObject) context.get("parameters");
@@ -218,33 +262,33 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 				if (m.has("match")) {
 					JSONObject res = new JSONObject();
 					res.put("list", list2jsonArray(findAll(resourcePath)));
-					handleJsonReportResult(reqId, start, res, "OK", logger2);
+					handleJsonReportResult(reqId, start, res, "OK", logger2, clientVersion);
 					return res;
 				}
 				if (m.has("references")) {
 					boolean b = m.getBoolean("references");
 					JSONObject res = new JSONObject();
 					if (subject == null || subject.o == null) {
-						throw new RuntimeException("Unable to find object: " + resourcePath);
+						throw EcompException.create(ManagementServerMessageEnum.MANAGEMENT_SERVER_RESOURCE_DOES_NOT_EXIST,resourcePath);
 					}
 					res.put("list", subjectList2jsonArray(findReferences(root, subject.o, b)));
-					handleJsonReportResult(reqId, start, res, "OK", logger2);
+					handleJsonReportResult(reqId, start, res, "OK", logger2, clientVersion);
 					return res;
 				}
 			}
 			if (subject == null || subject.o == null) {
-				throw new RuntimeException("Unable to find to list: " + resourcePath);
+				throw EcompException.create(ManagementServerMessageEnum.MANAGEMENT_SERVER_RESOURCE_DOES_NOT_EXIST,resourcePath);
 			}
 			Object res = list(subject, levels);
-			handleJsonReportResult(reqId, start, res, "OK", logger2);
+			handleJsonReportResult(reqId, start, res, "OK", logger2, clientVersion);
 			return res;
 		}
 		if (subject == null || subject.o == null) {
-			throw new RuntimeException("Unable to find object for operation: " + resourcePath);
+			throw EcompException.create(ManagementServerMessageEnum.MANAGEMENT_SERVER_RESOURCE_DOES_NOT_EXIST,resourcePath);
 		}
 		Object res = operation(subject, action, json, context);
 		transformResult(subject,action,res);
-		handleJsonReportResult(reqId, start, res, "OK", logger2);
+		handleJsonReportResult(reqId, start, res, "OK", logger2, clientVersion);
 		return res;
 	}
 
@@ -298,7 +342,7 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 		return ManagementServerUtils.createLogger("requests-" + action, "INFO", "%d %5p %m%n", logdir);
 	}
 
-	private void handleJsonReportResult(String reqId, long start, Object res, String status, Logger logger2) {
+	private void handleJsonReportResult(String reqId, long start, Object res, String status, Logger logger2, String clientVersion) {
 		if (logger2.isInfoEnabled()) {
 			JSONObject r = new JSONObject();
 			long duration = new Date().getTime() - start;
@@ -307,13 +351,37 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 			r.put("status", status);
 			if (res instanceof JSONObject) {
 				JSONObject j = (JSONObject) res;
-				r.put("res", j);
+				r.put("res", translateJsonObject(j,version,clientVersion));
 			}
 			logger2.info(r.toString());
 		}
 	}
 
+	private JSONObject translateJsonObject(JSONObject json, String version1, String version2) {
+		// TODO Auto-generated method stub
+		if (json.has("$version")) {
+			String jsonVersion = json.getString("$version");
+			if (version1 == null) 
+				version1 = jsonVersion;
+			if (version1 != null && ! version1.equals(jsonVersion)) {
+				ecomplogger.warn(ManagementServerMessageEnum.MANAGEMENT_SERVER_JSON_VERSION_MISMATCH, jsonVersion, version1);
+				version1 = jsonVersion;
+			}
+		}
+		if (version1 == null) 
+			version1 = "UNKNOWN";
+		if (versionHandler != null) {
+			return versionHandler.translateJsonObject(json,version1,version2);
+		}
+		return json;
+	}
+
 	public void start() throws IOException {
+		String versionDirection = directory == null ? null : directory + "/configuration/version";
+		if (versionDirection != null) {
+			// need to setup version handler before main load
+			setupVersionHandler(versionDirection);
+		}
 		if (directory != null)
 			root = load(directory);
 		if (root instanceof IPolicyEngine) {
@@ -368,6 +436,8 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 				v = p.getProperty(kk).trim();
 				if (kk.startsWith("factory.")) {
 					try {
+						System.err.println("Loading runtime factory: " + v);
+
 						Class c = Class.forName(v);
 						if (v.endsWith("PackageImpl")) {
 							Method m = c.getMethod("init");
@@ -378,25 +448,10 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 							addFactory((EFactory) constructor.newInstance(server));
 						}
 						logger.info("added runtime factory: " + v);
-					} catch (NoSuchMethodException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (InstantiationException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (IllegalAccessException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (IllegalArgumentException e) {
-						// TODO Auto-generated catch block
+					} catch (Throwable e) {
+						System.err.println("Unable to load runtime factory: " + v + " " + e);
 						e.printStackTrace();
-					} catch (InvocationTargetException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (ClassNotFoundException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
+					}					
 				}
 			}
 		} catch (IOException e) {
@@ -419,17 +474,26 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 	private EObject loadObjectFromDirectory(EFactory f, String cName, String directory, boolean isRoot, List<Ref> refs)
 			throws IOException {
 		String jsonFile = directory + (isRoot ? "/ROOT.json" : ".json");
+		String yamlFile = directory + (isRoot ? "/ROOT.yaml" : ".yaml");
 		JSONObject json;
 		try {
 			File file = new File(jsonFile);
 			if (file.exists())
 				json = JsonUtils.file2json(jsonFile);
-			else
-				json = new JSONObject();
+			else {
+				file = new File(yamlFile);
+				if (file.exists()) {
+					json = JsonUtils.yaml2json(file);
+					System.err.println("yaml2json: " + json.toString(2));
+				} 
+				else
+					json = new JSONObject();
+			}
 		} catch (JSONException e) {
 			// printStackTrace(e,);
 			throw new RuntimeException("Invalid JSON: " + jsonFile + " " + e);
 		}
+		json = translateJsonObject(json, null, version);
 		EObject res;
 		try {
 			res = loadObjectFromJson(f, cName, directory, json, refs);
@@ -1785,33 +1849,18 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 				res.put("returns", oo == null ? null : attr2jsonValue(0, oo, op.getEType()));
 			}
 			return res;
+		} catch (EcompException e) {
+			e.printStackTrace();
+			throw e;
 		} catch (Exception e) {
-			JSONObject res = new JSONObject();
+			e.printStackTrace();
 			if (e instanceof InvocationTargetException && e.getCause() instanceof Exception) {
 				e = (Exception) e.getCause();
 			}
-			res.put("exception", e.toString());
-			// res.put("location", e.getStackTrace()[1].toString());
-			res.put("directory", props.get("user.dir"));
-			res.put("user", props.get("user.name"));
-			res.put("hostname", props.get("user.hostname"));
-			res.put("port", props.get("server.port"));
-			res.put("class", eClassName);
-			res.put("action", action);
-			res.put("request", json);
-			res.put("context", context);
-			if (e instanceof ManagementServerError) {
-				ManagementServerError ee = (ManagementServerError) e;
-				res.put("remote", ee.getJson());
-			} else
-				printStackTrace(e);
-			List<String> args = new ArrayList<String>();
-			for (EParameter p : op.getEParameters()) {
-				args.add(p.getEType().getName());
+			if (e instanceof EcompException) {
+				throw (EcompException) e;
 			}
-			logger.error(PropertyUtil.replaceForLogForcingProtection("operation " + action + "(" + StringUtil.join(args, ",") + ") failed requestId: "
-					+ context.getString("requestId") + " " + e));
-			throw new ManagerException(500, "operation failed: " + action + "\n" + res.toString(2));
+			throw EcompException.create(GenericMessagesMessageEnum.ECOMP_GENERAL_EXCEPTION, e, e.toString());
 		}
 	}
 
@@ -1958,6 +2007,7 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 		// above.
 		// String s = json.toString();
 		// if (s.equals(cache.get(fname))) return;
+		json.put("$version", version);	
 		try {
 			OutputStreamWriter w = FileUtils.filename2writer(fname + ".tmp");
 			w.append(json.toString(2));
@@ -2217,7 +2267,7 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 		}
 	}
 
-	public static JSONObject params2json(EOperation operation, Object[] params) {
+	public static JSONObject params2json(EOperation operation, Object[] params, String outVersion) {
 		if (params.length != operation.getEParameters().size()) {
 			String n = operation.getEContainingClass().getName() + "@" + operation.getName();
 			throw new RuntimeException("Wrong number of arguments for " + n + " got " + params.length + " expected "
@@ -2233,11 +2283,13 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 					List<Object> l = (List<Object>) params[i];
 					JSONArray a = new JSONArray();
 					for (Object oo : l) {
-						a.put(object2json(oo, 100, eClass, true));
+						JSONObject j = object2json(oo, 100, eClass, true);
+						a.put(versionHandler.translateJsonObject(j,version,outVersion));
 					}
 					json.put(p.getName(), a);
 				} else {
-					json.put(p.getName(), object2json(params[i], 100, eClass, true));
+					JSONObject j = object2json(params[i], 100, eClass, true);
+					json.put(p.getName(), versionHandler.translateJsonObject(j,version,outVersion));
 				}
 
 			} else {
@@ -2270,7 +2322,7 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 
 	static ManagementServer staticServer = new ManagementServer();
 
-	public static Object json2response(EOperation operation, JSONObject res) {
+	public static Object json2response(EOperation operation, JSONObject res, String inVersion) {
 		if (res == null)
 			return null;
 		if (res.length() == 0)
@@ -2282,11 +2334,15 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 					EList<EObject> l = new BasicEList<EObject>();
 					JSONArray a = res.getJSONArray("returns");
 					for (int i = 0; i < a.length(); i++) {
-						l.add(staticServer.json2ecore(eClass, a.getJSONObject(i)));
+						JSONObject j = a.getJSONObject(i);
+						j = versionHandler.translateJsonObject(j, inVersion, version);
+						l.add(staticServer.json2ecore(eClass, j));
 					}
 					return l;
 				} else {
-					return staticServer.json2ecore(eClass, res.getJSONObject("returns"));
+					JSONObject j = res.getJSONObject("returns");
+					j = versionHandler.translateJsonObject(j, inVersion, version);
+					return staticServer.json2ecore(eClass, j);
 				}
 			} else {
 				EDataType eType = (EDataType) operation.getEType();
@@ -2479,6 +2535,7 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 	}
 
 	public static void decryptPasswords(EObject o) {
+		if (o == null) return;
 		for (EAttribute attr : o.eClass().getEAllAttributes()) {
 			if (! attr.getEType().getName().equals("EString")) continue;
 			if (attr.isMany()) continue;
@@ -2501,6 +2558,12 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 		}
 	}
 
+	@Override
+	public ManagementServer getServer() {
+		return this;
+	}
+	
+
 	public JSONObject getSwaggerJson() {
 		try { 
 			SwaggerUtils swagger = new SwaggerUtils();
@@ -2525,4 +2588,18 @@ public class ManagementServer implements IRequestHandler, ISwaggerHandler {
 	public void updateSwagger(String path, SwaggerUtils swagger) {
 		swagger.addTag(path, "Server Configuration",root);
 	}
+
+	public JSONArray supportedVersions() {
+		JSONArray a = new JSONArray();
+		a.put(version);
+		return a;
+	}
+
+	public static String getBuildVersion() {
+		return buildVersion;
+	}
+
+	public static void setBuildVersion(String buildVersion) {
+		ManagementServer.buildVersion = buildVersion;
+	}
 }
diff --git a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/SimpleVersionHandler.java b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/SimpleVersionHandler.java
new file mode 100644
index 0000000..705aaa5
--- /dev/null
+++ b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/SimpleVersionHandler.java
@@ -0,0 +1,95 @@
+package org.openecomp.ncomp.sirius.manager;
+
+import java.util.Iterator;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.openecomp.ncomp.sirius.manager.server.AttributeTranslationStep;
+import org.openecomp.ncomp.sirius.manager.server.VersionConfiguration;
+import org.openecomp.ncomp.sirius.manager.server.VersionTranslation;
+import org.openecomp.ncomp.sirius.manager.server.VersionTranslationStep;
+
+public class SimpleVersionHandler implements IVersionConverterHandler {
+
+	private VersionConfiguration configuration;
+
+	public JSONObject translateJsonObject(JSONObject json, String version1, String version2) {
+		if (version1 != null && version1.equals(version2)) return json;
+		if (json.length() == 0) return json;
+//		System.err.println("VVVVVV: " + version1 + " -> " + version2);
+//		System.err.println("VVVVVV before: " + json.toString(2));
+		VersionTranslation v1 = findVersion(version1);
+		VersionTranslation v2 = findVersion(version2);
+		if (v1 != null && v2 != null) {
+			throw new RuntimeException("Unable to translate between 2 old versions");
+		}
+		Boolean toCurrent = null;
+		VersionTranslation v = null;
+		if (v1 != null && version2 != null && version2.equals(configuration.getVersion())) {
+			toCurrent = true;
+			v = v1;
+		}
+		if (v2 != null && version1 != null && version1.equals(configuration.getVersion())) {
+			toCurrent = false;
+			v = v2;
+		}
+		if (toCurrent == null) {
+			throw new RuntimeException("Unable to translate between versions: " + version1 + " -> " + version2);
+		}
+		for (VersionTranslationStep step : v.getSteps()) {
+			if (step instanceof AttributeTranslationStep) {
+				AttributeTranslationStep s = (AttributeTranslationStep) step;
+				if (toCurrent)
+					jsonStringReplace(json, s.getAttribute(), s.getOldValue(), s.getCurrentValue());
+				else
+					jsonStringReplace(json, s.getAttribute(), s.getCurrentValue(), s.getOldValue());
+			}
+
+		}
+//		System.err.println("VVVVVV after: " + json.toString(2));
+		return json;
+	}
+
+	private VersionTranslation findVersion(String version) {
+		for (VersionTranslation v : configuration.getSupportedVersions()) {
+			if (v.getName().equals(version))
+				return v;
+		}
+		return null;
+	}
+
+	private void jsonStringReplace(JSONObject json, String attr, String string1, String string2) {
+		for (Iterator<String> i = json.keys(); i.hasNext();) {
+			String key = (String) i.next();
+			Object o = json.get(key);
+			if (o instanceof String) {
+				json.put(key, ((String) o).replace(string1, string2));
+				// System.out.println("KKKKKKK:" + o + " " + json.get(key));
+			}
+			if (o instanceof JSONObject) {
+				jsonStringReplace((JSONObject) o, attr, string1, string2);
+			}
+			if (o instanceof JSONArray) {
+				jsonStringReplace((JSONArray) o, attr, string1, string2);
+			}
+		}
+	}
+
+	private void jsonStringReplace(JSONArray a, String attr, String string1, String string2) {
+		for (int i = 0; i < a.length(); i++) {
+			Object o = a.get(i);
+			if (o instanceof JSONObject) {
+				jsonStringReplace((JSONObject) o, attr, string1, string2);
+			}
+			if (o instanceof JSONArray) {
+				jsonStringReplace((JSONArray) o, attr, string1, string2);
+			}
+		}
+	}
+
+	@Override
+	public void setconfiguration(VersionConfiguration c) {
+		configuration = c;
+	}
+
+}
diff --git a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/SwaggerUtils.java b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/SwaggerUtils.java
index b4581b9..fb74ab5 100644
--- a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/SwaggerUtils.java
+++ b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/SwaggerUtils.java
@@ -99,14 +99,14 @@ public class SwaggerUtils {
 
 	private static void test2() {
 		SwaggerUtils u = new SwaggerUtils();
-		AbstractManagementServer s = ServerFactory.eINSTANCE.createAbstractManagementServer();
-		s.setConfiguration(ServerFactory.eINSTANCE.createAbstractManagementServerConfiguration());
-		s.setComponent(ComponentFactory.eINSTANCE.createComponent());
-		u.addTag("/foo/configuration", "The Config Tag");
-		u.addTag("/foo/component", "The Component Tag");
-		u.addTag("/foo", "The Foo Tag");
-		u.autoAdd("/foo", s.eClass(), 2);
-		System.out.println(u.toJson().toString(2));
+//		AbstractManagementServer s = ServerFactory.eINSTANCE.createAbstractManagementServer();
+//		s.setConfiguration(ServerFactory.eINSTANCE.createAbstractManagementServerConfiguration());
+//		s.setComponent(ComponentFactory.eINSTANCE.createComponent());
+//		u.addTag("/foo/configuration", "The Config Tag");
+//		u.addTag("/foo/component", "The Component Tag");
+//		u.addTag("/foo", "The Foo Tag");
+//		u.autoAdd("/foo", s.eClass(), 2);
+//		System.out.println(u.toJson().toString(2));
 	}
 
 	@SuppressWarnings("unused")
diff --git a/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/logging/NcompLogger.java b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/logging/NcompLogger.java
new file mode 100644
index 0000000..da9a696
--- /dev/null
+++ b/ncomp-sirius-manager-server/src/main/java/org/openecomp/ncomp/sirius/manager/logging/NcompLogger.java
@@ -0,0 +1,108 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ */
+	
+package org.openecomp.ncomp.sirius.manager.logging;
+
+import org.eclipse.emf.ecore.EObject;
+import org.slf4j.MDC;
+
+import org.openecomp.entity.EcompOperationEnum;
+import org.openecomp.entity.EcompSubComponentInstance;
+import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.EcompMessageEnum;
+import org.openecomp.logger.LogCategoryEnum;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.Stopwatch;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+
+public class NcompLogger extends EcompLogger {
+	public static final String UNKNOWN_SERVICE_NAME = "UnknownServiceName";
+
+	private NcompLogger() {
+		super();
+	}
+
+	public static synchronized NcompLogger getNcompLogger() {
+		return new NcompLogger();
+	}
+
+	public void setInstanceId(ISiriusServer s, EObject o) {
+		String port = s.getServer().getProps().getProperty("server.port");
+		String path = ManagementServer.object2ref(o);
+		setInstanceId(EcompSubComponentInstance.getServerName() + ":" + port + path);
+	}
+
+	public boolean recordAuditEventStartIfNeeded(EcompOperationEnum op, ISiriusServer s, EObject o) {
+		if (MDC.get(UNKNOWN_SERVICE_NAME) == null)
+			return false;
+		if (op.toString().endsWith("@getRequestLogger"))
+			return false;
+		MDC.remove(UNKNOWN_SERVICE_NAME);
+		setOperation(op);
+		setInstanceId(s, o);
+		recordAuditEventStart();
+		return true;
+	}
+
+	public void startUnknownAuditEvent(String contextPath) {
+		MDC.put(UNKNOWN_SERVICE_NAME, contextPath);
+	}
+
+	@Override
+	protected void recordMetricEventEnd(StatusCodeEnum statusCode, LogCategoryEnum logCategoryEnum,
+			String[] customFields, EcompMessageEnum msg, String... args) {
+		// if service name is not know we ignore
+		// assuming this is is the getRequestLogger case that we want to ignore.
+//		System.out.println("WWWWWW METRICS END 1: " + MDC.getCopyOfContextMap());
+		if (MDC.get(UNKNOWN_SERVICE_NAME) != null)
+			return;
+		super.recordMetricEventEnd(statusCode, logCategoryEnum, customFields, msg, args);
+//		System.out.println("WWWWWW METRICS END 2: " + MDC.getCopyOfContextMap());
+	}
+
+	@Override
+	public void setClassName() {
+		StackTraceElement[] l = Thread.currentThread().getStackTrace();
+		for (StackTraceElement x : l) {
+			if (x.getClassName().equals("java.lang.Thread"))
+				continue;
+			if (x.getClassName().equals("org.openecomp.logger.EcompLogger"))
+				continue;
+			if (x.getClassName().equals("org.openecomp.ncomp.sirius.manager.logging.NcompLogger"))
+				continue;
+			if (x.getClassName().equals("org.openecomp.ncomp.sirius.manager.JavaHttpClient"))
+				continue;
+			if (x.getClassName().equals("org.openecomp.logger.Stopwatch"))
+				continue;
+			if (x.getClassName().equals("org.openecomp.ncomp.sirius.manager.AbstractClient"))
+				continue;
+			MDC.put(CLASS_NAME, x.getClassName() + "@" + x.getMethodName() + ":" + x.getLineNumber());
+			return;
+		}
+	}
+
+	public boolean isTargetSelf() {
+		String t = Stopwatch.getTopTarget();
+		return t == null || t.startsWith("self");
+	}
+
+}
diff --git a/ncomp-sirius-manager-server/src/main/resources-gen/org/openecomp/ncomp/sirius/manager/logging/ManagementServer.properties b/ncomp-sirius-manager-server/src/main/resources-gen/org/openecomp/ncomp/sirius/manager/logging/ManagementServer.properties
new file mode 100644
index 0000000..a330e7c
--- /dev/null
+++ b/ncomp-sirius-manager-server/src/main/resources-gen/org/openecomp/ncomp/sirius/manager/logging/ManagementServer.properties
@@ -0,0 +1,54 @@
+
+MANAGEMENT_SERVER_WEB_REQUEST_WITHOUT_HANDLER=\
+  MANAGEMENT-SERVER-WEB-REQUEST-WITHOUT-HANDLER-4011E|\
+  No Handler {0}|\
+  Root cause need to be determined.|\
+  Web request that server did not understand.
+
+MANAGEMENT_SERVER_WEB_REQUEST_UNKNOWN_RETURN_CLASS=\
+  MANAGEMENT-SERVER-WEB-REQUEST-UNKNOWN-RETURN-CLASS-5011E|\
+  type={0}|\
+  Root cause need to be determined.|\
+  Web request handler cannot return the object created.
+
+MANAGEMENT_SERVER_WEB_REQUEST_UNSUPPORTED_CONTENT_TYPE=\
+  MANAGEMENT-SERVER-WEB-REQUEST-UNSUPPORTED-CONTENT-TYPE-4012E|\
+  type={0}|\
+  Root cause need to be determined.|\
+  Web request handler cannot support the requested content type.
+
+MANAGEMENT_SERVER_WEB_REQUEST_UNKNOWN_EXCEPTION=\
+  MANAGEMENT-SERVER-WEB-REQUEST-UNKNOWN-EXCEPTION-4012E|\
+  type={0}|\
+  Root cause need to be determined.|\
+  Web request handler got an unknown expection.
+
+MANAGEMENT_SERVER_RESOURCE_DOES_NOT_EXIST=\
+  MANAGEMENT-SERVER-RESOURCE-DOES-NOT-EXIST-4012E|\
+  No resource with path={0}|\
+  Root cause need to be determined.|\
+  No resource with this path exists in server.
+
+MANAGEMENT_SERVER_RESOURCE_EXIST=\
+  MANAGEMENT-SERVER-RESOURCE-EXIST-4012E|\
+  No resource with path={0}|\
+  Root cause need to be determined.|\
+  Resource with this path already exists in server.
+
+MANAGEMENT_SERVER_ACTION_FORBIDDEN=\
+  MANAGEMENT-SERVER-ACTION-FORBIDDEN-4030E|\
+  user={0} action={1} path={2}|\
+  Root cause need to be determined.|\
+  Action forbidden.
+
+MANAGEMENT_SERVER_UNKNOWN_SERVICE_FAILED=\
+  MANAGEMENT-SERVER-UNKNOWN-SERVICE-FAILED-4031W|\
+  exception={0} target={1}|\
+  Root cause need to be determined.|\
+  HTTP request to unknown service failed.
+
+MANAGEMENT_SERVER_JSON_VERSION_MISMATCH=\
+  MANAGEMENT-SERVER-JSON-VERSION-MISMATCH-4032W|\
+  real version={0} expected version={1}|\
+  Root cause need to be determined.|\
+  Expected JSON version is not the same as the actual version.
diff --git a/ncomp-sirius-manager-server/src/main/resources/ManagementServer.yaml b/ncomp-sirius-manager-server/src/main/resources/ManagementServer.yaml
new file mode 100644
index 0000000..32e2242
--- /dev/null
+++ b/ncomp-sirius-manager-server/src/main/resources/ManagementServer.yaml
@@ -0,0 +1,63 @@
+
+package-name: org.openecomp.ncomp.sirius.manager.logging
+java-root: src/main/java-gen
+resources-root: src/main/resources-gen
+
+messages:
+  MANAGEMENT-SERVER-WEB-REQUEST-WITHOUT-HANDLER:
+    errorCode: 4011E
+    messageFormat: No Handler {0}
+    resolution: Root cause need to be determined.
+    description: Web request that server did not understand.
+  MANAGEMENT-SERVER-WEB-REQUEST-UNKNOWN-RETURN-CLASS:
+    errorCode: 5011E
+    messageFormat: type={0}
+    resolution: Root cause need to be determined.
+    description: Web request handler cannot return the object created.
+  MANAGEMENT-SERVER-WEB-REQUEST-UNSUPPORTED-CONTENT-TYPE:
+    errorCode: 4012E
+    messageFormat: type={0}
+    resolution: Root cause need to be determined.
+    description: Web request handler cannot support the requested content type.
+  MANAGEMENT-SERVER-WEB-REQUEST-UNKNOWN-EXCEPTION:
+    errorCode: 4012E
+    messageFormat: type={0}
+    resolution: Root cause need to be determined.
+    description: Web request handler got an unknown expection.
+  MANAGEMENT-SERVER-RESOURCE-DOES-NOT-EXIST:
+    errorCode: 4012E
+    messageFormat: No resource with path={0}
+    resolution: Root cause need to be determined.
+    description: No resource with this path exists in server.  
+  MANAGEMENT-SERVER-RESOURCE-EXIST:
+    errorCode: 4012E
+    messageFormat: No resource with path={0}
+    resolution: Root cause need to be determined.
+    description: Resource with this path already exists in server.  
+  MANAGEMENT-SERVER-ACTION-FORBIDDEN:
+    errorCode: 4030E
+    messageFormat: user={0} action={1} path={2}
+    resolution: Root cause need to be determined.
+    description: Action forbidden.
+  MANAGEMENT-SERVER-UNKNOWN-SERVICE-FAILED:
+    errorCode: 4031W
+    messageFormat: exception={0} target={1}
+    resolution: Root cause need to be determined.
+    description: HTTP request to unknown service failed.
+  MANAGEMENT-SERVER-JSON-VERSION-MISMATCH:
+    errorCode: 4032W
+    messageFormat: real version={0} expected version={1}
+    resolution: Root cause need to be determined.
+    description: Expected JSON version is not the same as the actual version.
+            
+operations:
+  MANAGEMENT-SERVER-CREATE-RESOURCE:
+    description: Create object in management server
+  MANAGEMENT-SERVER-UPDATE-RESOURCE:
+    description: Update object in management server
+  MANAGEMENT-SERVER-LIST-RESOURCE:
+    description: List object in management server
+  MANAGEMENT-SERVER-DELETE-RESOURCE:
+    description: Delete object in management server    
+  MANAGEMENT-SERVER-UNKNOWN-SERVICE:
+    description: Connection to unknown service.
+\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 31fa2a1..58d92c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,7 @@
   <modules>
   	<module>ncomp-sirius-manager-base</module>
   	<module>ncomp-sirius-manager-drools</module>
+  	<module>ncomp-sirius-manager-camunda</module>
   	<module>ncomp-sirius-manager-model</module>
   	<module>ncomp-sirius-manager-generator</module>
author	Carsten Lund <lund@research.att.com>	2017-04-16 14:00:29 +0000
committer	Carsten Lund <lund@research.att.com>	2017-04-16 14:01:24 +0000
commit	3ec1de0d0dc87b0123dd0ec47b3c9f40f22bad24 (patch)
tree	033b72ee193ffa31e701f8fc14fa0968428d2b8f
parent	a3e9b9cea143816780eed14896ca5843402ee371 (diff)