[DCAE-15] Changes related to version 1.1

See Jira for details

Change-Id: Ic346dd5d5faf9816faa84eddb89f14654ea20156
Signed-off-by: Carsten Lund <lund@research.att.com>

52 files changed, 69 insertions, 51 deletions

diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuStats.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuStats.java
index fc256cf..d47e00e 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuStats.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuStats.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerCpuStats#getCpu_usage <em>Cpu usage</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerCpuStats#getSystem_cpu_usage <em>System cpu usage</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getContainerCpuStats()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuUsage.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuUsage.java
index e8e7b52..40340a8 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuUsage.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuUsage.java
@@ -52,13 +52,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerCpuUsage#getPercpu_usage <em>Percpu usage</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerCpuUsage#getUsage_in_usermode <em>Usage in usermode</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerCpuUsage#getTotal_usage <em>Total usage</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerCpuUsage#getUser_in_kernelmode <em>User in kernelmode</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getContainerCpuUsage()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryStats.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryStats.java
index 3a9f4fc..144e09e 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryStats.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryStats.java
@@ -72,6 +72,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerMemoryStats#getTotal_pgmajfault <em>Total pgmajfault</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerMemoryStats#getCache <em>Cache</em>}</li>
@@ -103,7 +104,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.docker.ContainerMemoryStats#getInactive_file <em>Inactive file</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerMemoryStats#getTotal_pgpgin <em>Total pgpgin</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getContainerMemoryStats()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryUsage.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryUsage.java
index 7687a95..3f5d5b6 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryUsage.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryUsage.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerMemoryUsage#getMemstats <em>Memstats</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerMemoryUsage#getMax_usage <em>Max usage</em>}</li>
@@ -39,7 +40,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.docker.ContainerMemoryUsage#getFailcnt <em>Failcnt</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerMemoryUsage#getLimit <em>Limit</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getContainerMemoryUsage()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerNetworkStats.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerNetworkStats.java
index 175eebd..908aa16 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerNetworkStats.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerNetworkStats.java
@@ -57,6 +57,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerNetworkStats#getIntf <em>Intf</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerNetworkStats#getRx_bytes <em>Rx bytes</em>}</li>
@@ -68,7 +69,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.docker.ContainerNetworkStats#getTx_errors <em>Tx errors</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerNetworkStats#getTx_packets <em>Tx packets</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getContainerNetworkStats()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerOptions.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerOptions.java
index 53b19d3..a89cb98 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerOptions.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerOptions.java
@@ -33,6 +33,7 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerOptions#getImageNm <em>Image Nm</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerOptions#getEnv <em>Env</em>}</li>
@@ -43,7 +44,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.openecomp.ncomp.docker.ContainerOptions#getPortBindings <em>Port Bindings</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerOptions#getAutoRestart <em>Auto Restart</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getContainerOptions()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerPortBindings.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerPortBindings.java
index fdc8e1b..99af5b7 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerPortBindings.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerPortBindings.java
@@ -32,12 +32,12 @@ import org.openecomp.ncomp.core.NamedEntity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerPortBindings#getContainerPort <em>Container Port</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerPortBindings#getProtocol <em>Protocol</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerPortBindings#getVmPort <em>Vm Port</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getContainerPortBindings()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerRestartPolicy.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerRestartPolicy.java
index 8f53d04..155c967 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerRestartPolicy.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerRestartPolicy.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerRestartPolicy#getNm <em>Nm</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.ContainerRestartPolicy#getMaxRetryCnt <em>Max Retry Cnt</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getContainerRestartPolicy()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActor.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActor.java
index 9fa100d..9d530d2 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActor.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActor.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerActor#getId <em>Id</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerActor#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerActor()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActorAttributes.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActorAttributes.java
index 940940e..f50c7f7 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActorAttributes.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActorAttributes.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerActorAttributes#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerActorAttributes()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerAdaptor.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerAdaptor.java
index ade8e11..9bbc893 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerAdaptor.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerAdaptor.java
@@ -33,10 +33,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerAdaptor#getDockerHosts <em>Docker Hosts</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerAdaptor()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainer.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainer.java
index 4b39dab..bf0112b 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainer.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainer.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.docker.DockerContainer#getId <em>Id</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerContainer#getNames <em>Names</em>}</li>
@@ -50,7 +51,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.openecomp.ncomp.docker.DockerContainer#getStats <em>Stats</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerContainer#getEvents <em>Events</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerContainer()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainerStats.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainerStats.java
index 8b29e89..dd93467 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainerStats.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainerStats.java
@@ -117,13 +117,13 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerContainerStats#getNetworks <em>Networks</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerContainerStats#getMemory <em>Memory</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerContainerStats#getCpu <em>Cpu</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerContainerStats#getLastRead <em>Last Read</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerContainerStats()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerCreateRequest.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerCreateRequest.java
index a52b691..2ce4216 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerCreateRequest.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerCreateRequest.java
@@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerCreateRequest#getHostname <em>Hostname</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerCreateRequest#getCmd <em>Cmd</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerCreateRequest()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerEvents.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerEvents.java
index ab810b1..e2ef275 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerEvents.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerEvents.java
@@ -32,6 +32,7 @@ import org.openecomp.ncomp.core.NamedEntity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerEvents#getStatus <em>Status</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerEvents#getId <em>Id</em>}</li>
@@ -41,7 +42,6 @@ import org.openecomp.ncomp.core.NamedEntity;
  *   <li>{@link org.openecomp.ncomp.docker.DockerEvents#getTime <em>Time</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerEvents#getTimenano <em>Timenano</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerEvents()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerHost.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerHost.java
index e18d4ff..efda428 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerHost.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerHost.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.docker.DockerHost#getUrl <em>Url</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerHost#getPollingFrequency <em>Polling Frequency</em>}</li>
@@ -42,7 +43,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.openecomp.ncomp.docker.DockerHost#getContainers <em>Containers</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerHost#getNetworks <em>Networks</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerHost()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerImage.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerImage.java
index d936a00..4ddf261 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerImage.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerImage.java
@@ -36,6 +36,7 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerImage#getId <em>Id</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerImage#getParentId <em>Parent Id</em>}</li>
@@ -46,7 +47,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.openecomp.ncomp.docker.DockerImage#getVirtualSize <em>Virtual Size</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerImage#getLabels <em>Labels</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerImage()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpam.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpam.java
index e0ab44e..018633a 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpam.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpam.java
@@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerIpam#getDriver <em>Driver</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerIpam#getConfig <em>Config</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerIpam()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpamConfig.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpamConfig.java
index 5083177..00543a5 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpamConfig.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpamConfig.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerIpamConfig#getSubnet <em>Subnet</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerIpamConfig()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerKeyPair.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerKeyPair.java
index 7c94c79..f93b310 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerKeyPair.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerKeyPair.java
@@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerKeyPair#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerKeyPair#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerKeyPair()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerMount.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerMount.java
index 610465e..6a99aa6 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerMount.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerMount.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerMount#getSource <em>Source</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerMount#getDestination <em>Destination</em>}</li>
@@ -39,7 +40,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.docker.DockerMount#getRW <em>RW</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerMount#getPropagation <em>Propagation</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerMount()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetwork.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetwork.java
index 1f0d8ef..8c017be 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetwork.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetwork.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.docker.DockerNetwork#getId <em>Id</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerNetwork#getScope <em>Scope</em>}</li>
@@ -42,7 +43,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.openecomp.ncomp.docker.DockerNetwork#getContainers <em>Containers</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerNetwork#getOptions <em>Options</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerNetwork()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetworkContainer.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetworkContainer.java
index e61d610..c08786a 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetworkContainer.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetworkContainer.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerNetworkContainer#getId <em>Id</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerNetworkContainer#getIPv4Address <em>IPv4 Address</em>}</li>
@@ -39,7 +40,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.ncomp.docker.DockerNetworkContainer#getEndpointID <em>Endpoint ID</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerNetworkContainer#getMacAddress <em>Mac Address</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerNetworkContainer()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPackage.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPackage.java
index 40057f0..57ec282 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPackage.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPackage.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.docker.DockerFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-docker-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp'"
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPort.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPort.java
index 233b549..5834a21 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPort.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPort.java
@@ -32,12 +32,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerPort#getPrivatePort <em>Private Port</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerPort#getPublicPort <em>Public Port</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerPort#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerPort()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerProcess.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerProcess.java
index a23711b..194c315 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerProcess.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerProcess.java
@@ -51,6 +51,7 @@ import java.util.Date;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.DockerProcess#getUser <em>User</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerProcess#getPid <em>Pid</em>}</li>
@@ -64,7 +65,6 @@ import java.util.Date;
  *   <li>{@link org.openecomp.ncomp.docker.DockerProcess#getTimeElapsed <em>Time Elapsed</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.DockerProcess#getCommand <em>Command</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.ncomp.docker.DockerPackage#getDockerProcess()
  * @model
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuStatsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuStatsImpl.java
index 0e377c0..d18a771 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuStatsImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuStatsImpl.java
@@ -42,11 +42,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerCpuStatsImpl#getCpu_usage <em>Cpu usage</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerCpuStatsImpl#getSystem_cpu_usage <em>System cpu usage</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuUsageImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuUsageImpl.java
index 213843b..e34d9cf 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuUsageImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuUsageImpl.java
@@ -45,13 +45,13 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerCpuUsageImpl#getPercpu_usage <em>Percpu usage</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerCpuUsageImpl#getUsage_in_usermode <em>Usage in usermode</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerCpuUsageImpl#getTotal_usage <em>Total usage</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerCpuUsageImpl#getUser_in_kernelmode <em>User in kernelmode</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryStatsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryStatsImpl.java
index 022022f..96e5ac9 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryStatsImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryStatsImpl.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.docker.impl.ContainerMemoryStatsImpl#getTotal_pgmajfault <em>Total pgmajfault</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerMemoryStatsImpl#getCache <em>Cache</em>}</li>
@@ -70,7 +71,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerMemoryStatsImpl#getInactive_file <em>Inactive file</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerMemoryStatsImpl#getTotal_pgpgin <em>Total pgpgin</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryUsageImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryUsageImpl.java
index 37d99af..3814d24 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryUsageImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryUsageImpl.java
@@ -42,6 +42,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerMemoryUsageImpl#getMemstats <em>Memstats</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerMemoryUsageImpl#getMax_usage <em>Max usage</em>}</li>
@@ -49,7 +50,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerMemoryUsageImpl#getFailcnt <em>Failcnt</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerMemoryUsageImpl#getLimit <em>Limit</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerNetworkStatsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerNetworkStatsImpl.java
index 6d112b7..b2c2e67 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerNetworkStatsImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerNetworkStatsImpl.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.docker.impl.ContainerNetworkStatsImpl#getIntf <em>Intf</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerNetworkStatsImpl#getRx_bytes <em>Rx bytes</em>}</li>
@@ -50,7 +51,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerNetworkStatsImpl#getTx_errors <em>Tx errors</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerNetworkStatsImpl#getTx_packets <em>Tx packets</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerOptionsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerOptionsImpl.java
index f4cac7f..602254b 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerOptionsImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerOptionsImpl.java
@@ -45,6 +45,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerOptionsImpl#getImageNm <em>Image Nm</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerOptionsImpl#getEnv <em>Env</em>}</li>
@@ -55,7 +56,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerOptionsImpl#getPortBindings <em>Port Bindings</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerOptionsImpl#getAutoRestart <em>Auto Restart</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerPortBindingsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerPortBindingsImpl.java
index 5e47609..4830157 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerPortBindingsImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerPortBindingsImpl.java
@@ -40,12 +40,12 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerPortBindingsImpl#getContainerPort <em>Container Port</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerPortBindingsImpl#getProtocol <em>Protocol</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerPortBindingsImpl#getVmPort <em>Vm Port</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerRestartPolicyImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerRestartPolicyImpl.java
index b52bd31..00fa287 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerRestartPolicyImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerRestartPolicyImpl.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.docker.impl.ContainerRestartPolicyImpl#getNm <em>Nm</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.ContainerRestartPolicyImpl#getMaxRetryCnt <em>Max Retry Cnt</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorAttributesImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorAttributesImpl.java
index 57cbae1..051928f 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorAttributesImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorAttributesImpl.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.docker.impl.DockerActorAttributesImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorImpl.java
index 92f702d..d976403 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorImpl.java
@@ -42,11 +42,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerActorImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerActorImpl#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerAdaptorImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerAdaptorImpl.java
index 4ec07ae..02e88ff 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerAdaptorImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerAdaptorImpl.java
@@ -43,10 +43,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerAdaptorImpl#getDockerHosts <em>Docker Hosts</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerImpl.java
index e053bfc..f77dec0 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerImpl.java
@@ -56,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.docker.impl.DockerContainerImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerContainerImpl#getNames <em>Names</em>}</li>
@@ -72,7 +73,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerContainerImpl#getStats <em>Stats</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerContainerImpl#getEvents <em>Events</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerStatsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerStatsImpl.java
index 2b67dee..7b9e975 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerStatsImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerStatsImpl.java
@@ -53,13 +53,13 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerContainerStatsImpl#getNetworks <em>Networks</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerContainerStatsImpl#getMemory <em>Memory</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerContainerStatsImpl#getCpu <em>Cpu</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerContainerStatsImpl#getLastRead <em>Last Read</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerCreateRequestImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerCreateRequestImpl.java
index 32a7ce7..10df325 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerCreateRequestImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerCreateRequestImpl.java
@@ -45,11 +45,11 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerCreateRequestImpl#getHostname <em>Hostname</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerCreateRequestImpl#getCmd <em>Cmd</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerEventsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerEventsImpl.java
index 6b4047b..62f5eb8 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerEventsImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerEventsImpl.java
@@ -43,6 +43,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerEventsImpl#getStatus <em>Status</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerEventsImpl#getId <em>Id</em>}</li>
@@ -52,7 +53,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerEventsImpl#getTime <em>Time</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerEventsImpl#getTimenano <em>Timenano</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerHostImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerHostImpl.java
index 7b787ef..7fed336 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerHostImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerHostImpl.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.docker.impl.DockerHostImpl#getUrl <em>Url</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerHostImpl#getPollingFrequency <em>Polling Frequency</em>}</li>
@@ -63,7 +64,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerHostImpl#getContainers <em>Containers</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerHostImpl#getNetworks <em>Networks</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerImageImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerImageImpl.java
index ad91660..a34d54a 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerImageImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerImageImpl.java
@@ -47,6 +47,7 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerImageImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerImageImpl#getParentId <em>Parent Id</em>}</li>
@@ -57,7 +58,6 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerImageImpl#getVirtualSize <em>Virtual Size</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerImageImpl#getLabels <em>Labels</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamConfigImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamConfigImpl.java
index 532b803..7af11dc 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamConfigImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamConfigImpl.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.docker.impl.DockerIpamConfigImpl#getSubnet <em>Subnet</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamImpl.java
index fb93731..4d8cd15 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamImpl.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.docker.impl.DockerIpamImpl#getDriver <em>Driver</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerIpamImpl#getConfig <em>Config</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerKeyPairImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerKeyPairImpl.java
index 83d62ea..607853f 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerKeyPairImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerKeyPairImpl.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.docker.impl.DockerKeyPairImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerKeyPairImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerMountImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerMountImpl.java
index 69c4d0e..30cc932 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerMountImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerMountImpl.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.docker.impl.DockerMountImpl#getSource <em>Source</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerMountImpl#getDestination <em>Destination</em>}</li>
@@ -46,7 +47,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerMountImpl#getRW <em>RW</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerMountImpl#getPropagation <em>Propagation</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkContainerImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkContainerImpl.java
index f9c110e..3a6a940 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkContainerImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkContainerImpl.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.docker.impl.DockerNetworkContainerImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerNetworkContainerImpl#getIPv4Address <em>IPv4 Address</em>}</li>
@@ -46,7 +47,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerNetworkContainerImpl#getEndpointID <em>Endpoint ID</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerNetworkContainerImpl#getMacAddress <em>Mac Address</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkImpl.java
index 4f1be74..5f96514 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkImpl.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.docker.impl.DockerNetworkImpl#getId <em>Id</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerNetworkImpl#getScope <em>Scope</em>}</li>
@@ -60,7 +61,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerNetworkImpl#getContainers <em>Containers</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerNetworkImpl#getOptions <em>Options</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerPortImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerPortImpl.java
index 8b998b7..88aa813 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerPortImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerPortImpl.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.docker.impl.DockerPortImpl#getPrivatePort <em>Private Port</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerPortImpl#getPublicPort <em>Public Port</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerPortImpl#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerProcessImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerProcessImpl.java
index 5402c48..b8e78d2 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerProcessImpl.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerProcessImpl.java
@@ -37,6 +37,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerProcessImpl#getUser <em>User</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerProcessImpl#getPid <em>Pid</em>}</li>
@@ -50,7 +51,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerProcessImpl#getTimeElapsed <em>Time Elapsed</em>}</li>
  *   <li>{@link org.openecomp.ncomp.docker.impl.DockerProcessImpl#getCommand <em>Command</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/util/DockerSwitch.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/util/DockerSwitch.java
index ca7f0cf..ca099e4 100644
--- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/util/DockerSwitch.java
+++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/util/DockerSwitch.java
@@ -69,7 +69,7 @@ public class DockerSwitch<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
 	 */