Init dcae.controller

Change-Id: I460f09494faa84b55d9c5d54112e098b0e74d007
Signed-off-by: lj1412 <lji@research.att.com>

115 files changed, 31542 insertions, 0 deletions

diff --git a/dcae-controller-core/dcae-controller-core-model/.classpath b/dcae-controller-core/dcae-controller-core-model/.classpath
new file mode 100644
index 0000000..17b1da0
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/.classpath
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry 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" path="src/main/xcore-gen"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/dcae-controller-core/dcae-controller-core-model/.gitignore b/dcae-controller-core/dcae-controller-core-model/.gitignore
new file mode 100644
index 0000000..09e3bc9
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/.gitignore
@@ -0,0 +1,2 @@
+/bin/
+/target/
diff --git a/dcae-controller-core/dcae-controller-core-model/.project b/dcae-controller-core/dcae-controller-core-model/.project
new file mode 100644
index 0000000..8e3ca28
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>dcae-controller-core-model</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+</projectDescription>
diff --git a/dcae-controller-core/dcae-controller-core-model/.settings/org.eclipse.jdt.core.prefs b/dcae-controller-core/dcae-controller-core-model/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..45a6e0e
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/dcae-controller-core/dcae-controller-core-model/.settings/org.eclipse.m2e.core.prefs b/dcae-controller-core/dcae-controller-core-model/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/dcae-controller-core/dcae-controller-core-model/LICENSE.txt b/dcae-controller-core/dcae-controller-core-model/LICENSE.txt
new file mode 100644
index 0000000..30471b5
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/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/dcae-controller-core/dcae-controller-core-model/META-INF/MANIFEST.MF b/dcae-controller-core/dcae-controller-core-model/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..97afb49
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/META-INF/MANIFEST.MF
@@ -0,0 +1,36 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: dcae-controller-core-model;singleton:=true
+Bundle-Version: 0.1.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.openecomp.dcae.controller.core.server,
+ org.openecomp.dcae.controller.core.server.impl,
+ org.openecomp.dcae.controller.core.server.util,
+ org.openecomp.dcae.controller.core.hypervisor,
+ org.openecomp.dcae.controller.core.hypervisor.impl,
+ org.openecomp.dcae.controller.core.hypervisor.util,
+ org.openecomp.dcae.controller.core.service,
+ org.openecomp.dcae.controller.core.service.impl,
+ org.openecomp.dcae.controller.core.service.util,
+ org.openecomp.dcae.controller.core.stream,
+ org.openecomp.dcae.controller.core.stream.impl,
+ org.openecomp.dcae.controller.core.stream.util,
+ org.openecomp.dcae.controller.core.manager,
+ org.openecomp.dcae.controller.core.manager.impl,
+ org.openecomp.dcae.controller.core.manager.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.emf.ecore.xcore.lib,
+ dcae-controller-core-model;visibility:=reexport,
+ 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-openstack-model;bundle-version="0.1.0";visibility:=reexport,
+ ncomp-sirius-manager-agent-model;bundle-version="0.1.0";visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/dcae-controller-core/dcae-controller-core-model/build.properties b/dcae-controller-core/dcae-controller-core-model/build.properties
new file mode 100644
index 0000000..6d35b6f
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/build.properties
@@ -0,0 +1,11 @@
+#
+
+bin.includes = .,\
+               src/main/xcore/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/main/xcore-gen/,\
+		src/main/xcore/
+output.. = target/classes/
diff --git a/dcae-controller-core/dcae-controller-core-model/plugin.properties b/dcae-controller-core/dcae-controller-core-model/plugin.properties
new file mode 100644
index 0000000..04852d2
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/plugin.properties
@@ -0,0 +1,4 @@
+#
+
+pluginName = Router Model
+providerName = www.example.org
diff --git a/dcae-controller-core/dcae-controller-core-model/plugin.xml b/dcae-controller-core/dcae-controller-core-model/plugin.xml
new file mode 100644
index 0000000..6b4da95
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/plugin.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated server -->
+      <package
+            uri="org.openecomp.dcae.controller.core.server"
+            class="org.openecomp.dcae.controller.core.server.ServerPackage"
+            genModel="src/main/xcore/server.xcore"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated hypervisor -->
+      <package
+            uri="org.openecomp.dcae.controller.core.hypervisor"
+            class="org.openecomp.dcae.controller.core.hypervisor.HypervisorPackage"
+            genModel="src/main/xcore/hypervisor.xcore"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated service -->
+      <package
+            uri="org.openecomp.dcae.controller.core.service"
+            class="org.openecomp.dcae.controller.core.service.ServicePackage"
+            genModel="src/main/xcore/service.xcore"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated stream -->
+      <package
+            uri="org.openecomp.dcae.controller.core.stream"
+            class="org.openecomp.dcae.controller.core.stream.StreamPackage"
+            genModel="src/main/xcore/stream.xcore"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated manager -->
+      <package
+            uri="org.openecomp.dcae.controller.core.manager"
+            class="org.openecomp.dcae.controller.core.manager.ManagerPackage"
+            genModel="src/main/xcore/manager.xcore"/>
+   </extension>
+
+</plugin>
diff --git a/dcae-controller-core/dcae-controller-core-model/pom.xml b/dcae-controller-core/dcae-controller-core-model/pom.xml
new file mode 100644
index 0000000..024ba7b
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/pom.xml
@@ -0,0 +1,28 @@
+<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.dcae.controller</groupId>
+  <artifactId>dcae-controller-core-model</artifactId>
+  <parent>
+  	<groupId>org.openecomp.ncomp.maven</groupId>
+  	<artifactId>ncomp-maven-xcore</artifactId>
+  	<version>0.1.0-SNAPSHOT</version>
+	<relativePath>../../../dcae-org.openecomp.ncomp.maven/ncomp-maven-xcore</relativePath>
+  </parent>
+  <dependencies>
+  	<dependency>
+  		<groupId>org.openecomp.ncomp.sirius.manager</groupId>
+  		<artifactId>ncomp-sirius-manager-model</artifactId>
+  		<version>${project.version}</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.openecomp.ncomp.sirius.manager</groupId>
+  		<artifactId>ncomp-sirius-manager-agent-model</artifactId>
+  		<version>${project.version}</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>org.openecomp.ncomp.openstack</groupId>
+  		<artifactId>ncomp-openstack-model</artifactId>
+  		<version>${project.version}</version>
+  	</dependency>
+  </dependencies>
+</project>
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/Hypervisor.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/Hypervisor.java
new file mode 100644
index 0000000..7185bdd
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/Hypervisor.java
@@ -0,0 +1,39 @@
+
+/*-
+ * ============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.dcae.controller.core.hypervisor;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Hypervisor</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.core.hypervisor.HypervisorPackage#getHypervisor()
+ * @model
+ * @generated
+ */
+public interface Hypervisor extends NamedEntity {
+} // Hypervisor
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/HypervisorFactory.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/HypervisorFactory.java
new file mode 100644
index 0000000..2d3cee1
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/HypervisorFactory.java
@@ -0,0 +1,63 @@
+
+/*-
+ * ============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.dcae.controller.core.hypervisor;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.hypervisor.HypervisorPackage
+ * @generated
+ */
+public interface HypervisorFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	HypervisorFactory eINSTANCE = org.openecomp.dcae.controller.core.hypervisor.impl.HypervisorFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Hypervisor</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Hypervisor</em>'.
+	 * @generated
+	 */
+	Hypervisor createHypervisor();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	HypervisorPackage getHypervisorPackage();
+
+} //HypervisorFactory
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/HypervisorPackage.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/HypervisorPackage.java
new file mode 100644
index 0000000..ffb9939
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/HypervisorPackage.java
@@ -0,0 +1,191 @@
+
+/*-
+ * ============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.dcae.controller.core.hypervisor;
+
+import org.openecomp.ncomp.core.CorePackage;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.hypervisor.HypervisorFactory
+ * @model kind="package"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-core-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.core'"
+ * @generated
+ */
+public interface HypervisorPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "hypervisor";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "org.openecomp.dcae.controller.core.hypervisor";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "hypervisor";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	HypervisorPackage eINSTANCE = org.openecomp.dcae.controller.core.hypervisor.impl.HypervisorPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.hypervisor.impl.HypervisorImpl <em>Hypervisor</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.hypervisor.impl.HypervisorImpl
+	 * @see org.openecomp.dcae.controller.core.hypervisor.impl.HypervisorPackageImpl#getHypervisor()
+	 * @generated
+	 */
+	int HYPERVISOR = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HYPERVISOR__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 HYPERVISOR__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 HYPERVISOR__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 HYPERVISOR__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The number of structural features of the '<em>Hypervisor</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HYPERVISOR_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Hypervisor</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HYPERVISOR_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.hypervisor.Hypervisor <em>Hypervisor</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Hypervisor</em>'.
+	 * @see org.openecomp.dcae.controller.core.hypervisor.Hypervisor
+	 * @generated
+	 */
+	EClass getHypervisor();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	HypervisorFactory getHypervisorFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.hypervisor.impl.HypervisorImpl <em>Hypervisor</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.hypervisor.impl.HypervisorImpl
+		 * @see org.openecomp.dcae.controller.core.hypervisor.impl.HypervisorPackageImpl#getHypervisor()
+		 * @generated
+		 */
+		EClass HYPERVISOR = eINSTANCE.getHypervisor();
+
+	}
+
+} //HypervisorPackage
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/impl/HypervisorFactoryImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/impl/HypervisorFactoryImpl.java
new file mode 100644
index 0000000..b99acb4
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/impl/HypervisorFactoryImpl.java
@@ -0,0 +1,116 @@
+
+/*-
+ * ============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.dcae.controller.core.hypervisor.impl;
+
+import org.openecomp.dcae.controller.core.hypervisor.*;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class HypervisorFactoryImpl extends EFactoryImpl implements HypervisorFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static HypervisorFactory init() {
+		try {
+			HypervisorFactory theHypervisorFactory = (HypervisorFactory)EPackage.Registry.INSTANCE.getEFactory(HypervisorPackage.eNS_URI);
+			if (theHypervisorFactory != null) {
+				return theHypervisorFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new HypervisorFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public HypervisorFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case HypervisorPackage.HYPERVISOR: return createHypervisor();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Hypervisor createHypervisor() {
+		HypervisorImpl hypervisor = new HypervisorImpl();
+		return hypervisor;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public HypervisorPackage getHypervisorPackage() {
+		return (HypervisorPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static HypervisorPackage getPackage() {
+		return HypervisorPackage.eINSTANCE;
+	}
+
+} //HypervisorFactoryImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/impl/HypervisorImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/impl/HypervisorImpl.java
new file mode 100644
index 0000000..eb1716b
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/impl/HypervisorImpl.java
@@ -0,0 +1,62 @@
+
+/*-
+ * ============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.dcae.controller.core.hypervisor.impl;
+
+import org.openecomp.dcae.controller.core.hypervisor.Hypervisor;
+import org.openecomp.dcae.controller.core.hypervisor.HypervisorPackage;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Hypervisor</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class HypervisorImpl extends NamedEntityImpl implements Hypervisor {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected HypervisorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return HypervisorPackage.Literals.HYPERVISOR;
+	}
+
+} //HypervisorImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/impl/HypervisorPackageImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/impl/HypervisorPackageImpl.java
new file mode 100644
index 0000000..6dc6967
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/impl/HypervisorPackageImpl.java
@@ -0,0 +1,195 @@
+
+/*-
+ * ============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.dcae.controller.core.hypervisor.impl;
+
+import org.openecomp.dcae.controller.core.hypervisor.Hypervisor;
+import org.openecomp.dcae.controller.core.hypervisor.HypervisorFactory;
+import org.openecomp.dcae.controller.core.hypervisor.HypervisorPackage;
+
+import org.openecomp.ncomp.core.CorePackage;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class HypervisorPackageImpl extends EPackageImpl implements HypervisorPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass hypervisorEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.openecomp.dcae.controller.core.hypervisor.HypervisorPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private HypervisorPackageImpl() {
+		super(eNS_URI, HypervisorFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link HypervisorPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static HypervisorPackage init() {
+		if (isInited) return (HypervisorPackage)EPackage.Registry.INSTANCE.getEPackage(HypervisorPackage.eNS_URI);
+
+		// Obtain or create and register package
+		HypervisorPackageImpl theHypervisorPackage = (HypervisorPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HypervisorPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HypervisorPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		CorePackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theHypervisorPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theHypervisorPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theHypervisorPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(HypervisorPackage.eNS_URI, theHypervisorPackage);
+		return theHypervisorPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getHypervisor() {
+		return hypervisorEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public HypervisorFactory getHypervisorFactory() {
+		return (HypervisorFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		hypervisorEClass = createEClass(HYPERVISOR);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		CorePackage theCorePackage = (CorePackage)EPackage.Registry.INSTANCE.getEPackage(CorePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		hypervisorEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(hypervisorEClass, Hypervisor.class, "Hypervisor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //HypervisorPackageImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/util/HypervisorAdapterFactory.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/util/HypervisorAdapterFactory.java
new file mode 100644
index 0000000..a7d175f
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/util/HypervisorAdapterFactory.java
@@ -0,0 +1,161 @@
+
+/*-
+ * ============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.dcae.controller.core.hypervisor.util;
+
+import org.openecomp.dcae.controller.core.hypervisor.*;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.hypervisor.HypervisorPackage
+ * @generated
+ */
+public class HypervisorAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static HypervisorPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public HypervisorAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = HypervisorPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected HypervisorSwitch<Adapter> modelSwitch =
+		new HypervisorSwitch<Adapter>() {
+			@Override
+			public Adapter caseHypervisor(Hypervisor object) {
+				return createHypervisorAdapter();
+			}
+			@Override
+			public Adapter caseNamedEntity(NamedEntity object) {
+				return createNamedEntityAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.hypervisor.Hypervisor <em>Hypervisor</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.dcae.controller.core.hypervisor.Hypervisor
+	 * @generated
+	 */
+	public Adapter createHypervisorAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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 the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //HypervisorAdapterFactory
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/util/HypervisorSwitch.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/util/HypervisorSwitch.java
new file mode 100644
index 0000000..990ad99
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/hypervisor/util/HypervisorSwitch.java
@@ -0,0 +1,149 @@
+
+/*-
+ * ============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.dcae.controller.core.hypervisor.util;
+
+import org.openecomp.dcae.controller.core.hypervisor.*;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.hypervisor.HypervisorPackage
+ * @generated
+ */
+public class HypervisorSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static HypervisorPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public HypervisorSwitch() {
+		if (modelPackage == null) {
+			modelPackage = HypervisorPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @parameter ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case HypervisorPackage.HYPERVISOR: {
+				Hypervisor hypervisor = (Hypervisor)theEObject;
+				T result = caseHypervisor(hypervisor);
+				if (result == null) result = caseNamedEntity(hypervisor);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Hypervisor</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>Hypervisor</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseHypervisor(Hypervisor object) {
+		return null;
+	}
+
+	/**
+	 * 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>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //HypervisorSwitch
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/DcaeManager.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/DcaeManager.java
new file mode 100644
index 0000000..a1f6c81
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/DcaeManager.java
@@ -0,0 +1,131 @@
+
+/*-
+ * ============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.dcae.controller.core.manager;
+
+import org.openecomp.dcae.controller.core.service.HealthTestResponse;
+import org.openecomp.dcae.controller.core.stream.DcaeStream;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Manager</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.manager.DcaeManager#getInputStreams <em>Input Streams</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.manager.DcaeManager#getOutputStreams <em>Output Streams</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.manager.ManagerPackage#getDcaeManager()
+ * @model abstract="true"
+ * @generated
+ */
+public interface DcaeManager extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Input Streams</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.core.stream.DcaeStream}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Input Streams</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>Input Streams</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.core.manager.ManagerPackage#getDcaeManager_InputStreams()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<DcaeStream> getInputStreams();
+
+	/**
+	 * Returns the value of the '<em><b>Output Streams</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.core.stream.DcaeStream}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Output Streams</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>Output Streams</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.core.manager.ManagerPackage#getDcaeManager_OutputStreams()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<DcaeStream> getOutputStreams();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model unique="false"
+	 * @generated
+	 */
+	HealthTestResponse test();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	void suspend();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	void resume();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model unique="false"
+	 * @generated
+	 */
+	String publicKey();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	void configurationChanged();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model inputStreamsUnique="false" inputStreamsMany="true" outputStreamsUnique="false" outputStreamsMany="true"
+	 * @generated
+	 */
+	void updateStreams(EList<DcaeStream> inputStreams, EList<DcaeStream> outputStreams);
+
+} // DcaeManager
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/ManagerFactory.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/ManagerFactory.java
new file mode 100644
index 0000000..346e923
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/ManagerFactory.java
@@ -0,0 +1,54 @@
+
+/*-
+ * ============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.dcae.controller.core.manager;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.manager.ManagerPackage
+ * @generated
+ */
+public interface ManagerFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ManagerFactory eINSTANCE = org.openecomp.dcae.controller.core.manager.impl.ManagerFactoryImpl.init();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	ManagerPackage getManagerPackage();
+
+} //ManagerFactory
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/ManagerPackage.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/ManagerPackage.java
new file mode 100644
index 0000000..46a5821
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/ManagerPackage.java
@@ -0,0 +1,374 @@
+
+/*-
+ * ============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.dcae.controller.core.manager;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.manager.ManagerFactory
+ * @model kind="package"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-core-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.core'"
+ *        annotation="http://www.eclipse.org/emf/2011/Xcore ecomp='http://openecomp.org'"
+ * @generated
+ */
+public interface ManagerPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "manager";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "org.openecomp.dcae.controller.core.manager";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "manager";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ManagerPackage eINSTANCE = org.openecomp.dcae.controller.core.manager.impl.ManagerPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.manager.impl.DcaeManagerImpl <em>Dcae Manager</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.manager.impl.DcaeManagerImpl
+	 * @see org.openecomp.dcae.controller.core.manager.impl.ManagerPackageImpl#getDcaeManager()
+	 * @generated
+	 */
+	int DCAE_MANAGER = 0;
+
+	/**
+	 * The feature id for the '<em><b>Input Streams</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_MANAGER__INPUT_STREAMS = 0;
+
+	/**
+	 * The feature id for the '<em><b>Output Streams</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_MANAGER__OUTPUT_STREAMS = 1;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Manager</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_MANAGER_FEATURE_COUNT = 2;
+
+	/**
+	 * The operation id for the '<em>Test</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_MANAGER___TEST = 0;
+
+	/**
+	 * The operation id for the '<em>Suspend</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_MANAGER___SUSPEND = 1;
+
+	/**
+	 * The operation id for the '<em>Resume</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_MANAGER___RESUME = 2;
+
+	/**
+	 * The operation id for the '<em>Public Key</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_MANAGER___PUBLIC_KEY = 3;
+
+	/**
+	 * The operation id for the '<em>Configuration Changed</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_MANAGER___CONFIGURATION_CHANGED = 4;
+
+	/**
+	 * The operation id for the '<em>Update Streams</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_MANAGER___UPDATE_STREAMS__ELIST_ELIST = 5;
+
+	/**
+	 * The number of operations of the '<em>Dcae Manager</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_MANAGER_OPERATION_COUNT = 6;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.manager.DcaeManager <em>Dcae Manager</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Manager</em>'.
+	 * @see org.openecomp.dcae.controller.core.manager.DcaeManager
+	 * @generated
+	 */
+	EClass getDcaeManager();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.core.manager.DcaeManager#getInputStreams <em>Input Streams</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Input Streams</em>'.
+	 * @see org.openecomp.dcae.controller.core.manager.DcaeManager#getInputStreams()
+	 * @see #getDcaeManager()
+	 * @generated
+	 */
+	EReference getDcaeManager_InputStreams();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.core.manager.DcaeManager#getOutputStreams <em>Output Streams</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Output Streams</em>'.
+	 * @see org.openecomp.dcae.controller.core.manager.DcaeManager#getOutputStreams()
+	 * @see #getDcaeManager()
+	 * @generated
+	 */
+	EReference getDcaeManager_OutputStreams();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.manager.DcaeManager#test() <em>Test</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Test</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.manager.DcaeManager#test()
+	 * @generated
+	 */
+	EOperation getDcaeManager__Test();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.manager.DcaeManager#suspend() <em>Suspend</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Suspend</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.manager.DcaeManager#suspend()
+	 * @generated
+	 */
+	EOperation getDcaeManager__Suspend();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.manager.DcaeManager#resume() <em>Resume</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Resume</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.manager.DcaeManager#resume()
+	 * @generated
+	 */
+	EOperation getDcaeManager__Resume();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.manager.DcaeManager#publicKey() <em>Public Key</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Public Key</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.manager.DcaeManager#publicKey()
+	 * @generated
+	 */
+	EOperation getDcaeManager__PublicKey();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.manager.DcaeManager#configurationChanged() <em>Configuration Changed</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Configuration Changed</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.manager.DcaeManager#configurationChanged()
+	 * @generated
+	 */
+	EOperation getDcaeManager__ConfigurationChanged();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.manager.DcaeManager#updateStreams(org.eclipse.emf.common.util.EList, org.eclipse.emf.common.util.EList) <em>Update Streams</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Update Streams</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.manager.DcaeManager#updateStreams(org.eclipse.emf.common.util.EList, org.eclipse.emf.common.util.EList)
+	 * @generated
+	 */
+	EOperation getDcaeManager__UpdateStreams__EList_EList();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	ManagerFactory getManagerFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.manager.impl.DcaeManagerImpl <em>Dcae Manager</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.manager.impl.DcaeManagerImpl
+		 * @see org.openecomp.dcae.controller.core.manager.impl.ManagerPackageImpl#getDcaeManager()
+		 * @generated
+		 */
+		EClass DCAE_MANAGER = eINSTANCE.getDcaeManager();
+
+		/**
+		 * The meta object literal for the '<em><b>Input Streams</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_MANAGER__INPUT_STREAMS = eINSTANCE.getDcaeManager_InputStreams();
+
+		/**
+		 * The meta object literal for the '<em><b>Output Streams</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_MANAGER__OUTPUT_STREAMS = eINSTANCE.getDcaeManager_OutputStreams();
+
+		/**
+		 * The meta object literal for the '<em><b>Test</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_MANAGER___TEST = eINSTANCE.getDcaeManager__Test();
+
+		/**
+		 * The meta object literal for the '<em><b>Suspend</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_MANAGER___SUSPEND = eINSTANCE.getDcaeManager__Suspend();
+
+		/**
+		 * The meta object literal for the '<em><b>Resume</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_MANAGER___RESUME = eINSTANCE.getDcaeManager__Resume();
+
+		/**
+		 * The meta object literal for the '<em><b>Public Key</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_MANAGER___PUBLIC_KEY = eINSTANCE.getDcaeManager__PublicKey();
+
+		/**
+		 * The meta object literal for the '<em><b>Configuration Changed</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_MANAGER___CONFIGURATION_CHANGED = eINSTANCE.getDcaeManager__ConfigurationChanged();
+
+		/**
+		 * The meta object literal for the '<em><b>Update Streams</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_MANAGER___UPDATE_STREAMS__ELIST_ELIST = eINSTANCE.getDcaeManager__UpdateStreams__EList_EList();
+
+	}
+
+} //ManagerPackage
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/impl/DcaeManagerImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/impl/DcaeManagerImpl.java
new file mode 100644
index 0000000..1ed926b
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/impl/DcaeManagerImpl.java
@@ -0,0 +1,308 @@
+
+/*-
+ * ============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.dcae.controller.core.manager.impl;
+
+import org.openecomp.dcae.controller.core.manager.DcaeManager;
+import org.openecomp.dcae.controller.core.manager.ManagerPackage;
+
+import org.openecomp.dcae.controller.core.service.HealthTestResponse;
+import org.openecomp.dcae.controller.core.stream.DcaeStream;
+
+import java.lang.reflect.InvocationTargetException;
+
+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.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Manager</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.manager.impl.DcaeManagerImpl#getInputStreams <em>Input Streams</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.manager.impl.DcaeManagerImpl#getOutputStreams <em>Output Streams</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class DcaeManagerImpl extends MinimalEObjectImpl.Container implements DcaeManager {
+	/**
+	 * The cached value of the '{@link #getInputStreams() <em>Input Streams</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getInputStreams()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<DcaeStream> inputStreams;
+
+	/**
+	 * The cached value of the '{@link #getOutputStreams() <em>Output Streams</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOutputStreams()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<DcaeStream> outputStreams;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeManagerImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ManagerPackage.Literals.DCAE_MANAGER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<DcaeStream> getInputStreams() {
+		if (inputStreams == null) {
+			inputStreams = new EObjectContainmentEList<DcaeStream>(DcaeStream.class, this, ManagerPackage.DCAE_MANAGER__INPUT_STREAMS);
+		}
+		return inputStreams;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<DcaeStream> getOutputStreams() {
+		if (outputStreams == null) {
+			outputStreams = new EObjectContainmentEList<DcaeStream>(DcaeStream.class, this, ManagerPackage.DCAE_MANAGER__OUTPUT_STREAMS);
+		}
+		return outputStreams;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public HealthTestResponse test() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void suspend() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void resume() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String publicKey() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void configurationChanged() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void updateStreams(EList<DcaeStream> inputStreams, EList<DcaeStream> outputStreams) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ManagerPackage.DCAE_MANAGER__INPUT_STREAMS:
+				return ((InternalEList<?>)getInputStreams()).basicRemove(otherEnd, msgs);
+			case ManagerPackage.DCAE_MANAGER__OUTPUT_STREAMS:
+				return ((InternalEList<?>)getOutputStreams()).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 ManagerPackage.DCAE_MANAGER__INPUT_STREAMS:
+				return getInputStreams();
+			case ManagerPackage.DCAE_MANAGER__OUTPUT_STREAMS:
+				return getOutputStreams();
+		}
+		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 ManagerPackage.DCAE_MANAGER__INPUT_STREAMS:
+				getInputStreams().clear();
+				getInputStreams().addAll((Collection<? extends DcaeStream>)newValue);
+				return;
+			case ManagerPackage.DCAE_MANAGER__OUTPUT_STREAMS:
+				getOutputStreams().clear();
+				getOutputStreams().addAll((Collection<? extends DcaeStream>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ManagerPackage.DCAE_MANAGER__INPUT_STREAMS:
+				getInputStreams().clear();
+				return;
+			case ManagerPackage.DCAE_MANAGER__OUTPUT_STREAMS:
+				getOutputStreams().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ManagerPackage.DCAE_MANAGER__INPUT_STREAMS:
+				return inputStreams != null && !inputStreams.isEmpty();
+			case ManagerPackage.DCAE_MANAGER__OUTPUT_STREAMS:
+				return outputStreams != null && !outputStreams.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case ManagerPackage.DCAE_MANAGER___TEST:
+				return test();
+			case ManagerPackage.DCAE_MANAGER___SUSPEND:
+				suspend();
+				return null;
+			case ManagerPackage.DCAE_MANAGER___RESUME:
+				resume();
+				return null;
+			case ManagerPackage.DCAE_MANAGER___PUBLIC_KEY:
+				return publicKey();
+			case ManagerPackage.DCAE_MANAGER___CONFIGURATION_CHANGED:
+				configurationChanged();
+				return null;
+			case ManagerPackage.DCAE_MANAGER___UPDATE_STREAMS__ELIST_ELIST:
+				updateStreams((EList<DcaeStream>)arguments.get(0), (EList<DcaeStream>)arguments.get(1));
+				return null;
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+
+} //DcaeManagerImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/impl/ManagerFactoryImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/impl/ManagerFactoryImpl.java
new file mode 100644
index 0000000..f9aaeaf
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/impl/ManagerFactoryImpl.java
@@ -0,0 +1,105 @@
+
+/*-
+ * ============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.dcae.controller.core.manager.impl;
+
+import org.openecomp.dcae.controller.core.manager.*;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ManagerFactoryImpl extends EFactoryImpl implements ManagerFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static ManagerFactory init() {
+		try {
+			ManagerFactory theManagerFactory = (ManagerFactory)EPackage.Registry.INSTANCE.getEFactory(ManagerPackage.eNS_URI);
+			if (theManagerFactory != null) {
+				return theManagerFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new ManagerFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ManagerFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ManagerPackage getManagerPackage() {
+		return (ManagerPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static ManagerPackage getPackage() {
+		return ManagerPackage.eINSTANCE;
+	}
+
+} //ManagerFactoryImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/impl/ManagerPackageImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/impl/ManagerPackageImpl.java
new file mode 100644
index 0000000..c2bc26b
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/impl/ManagerPackageImpl.java
@@ -0,0 +1,316 @@
+
+/*-
+ * ============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.dcae.controller.core.manager.impl;
+
+import org.openecomp.dcae.controller.core.manager.DcaeManager;
+import org.openecomp.dcae.controller.core.manager.ManagerFactory;
+import org.openecomp.dcae.controller.core.manager.ManagerPackage;
+
+import org.openecomp.dcae.controller.core.service.ServicePackage;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ManagerPackageImpl extends EPackageImpl implements ManagerPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeManagerEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.openecomp.dcae.controller.core.manager.ManagerPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private ManagerPackageImpl() {
+		super(eNS_URI, ManagerFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link ManagerPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static ManagerPackage init() {
+		if (isInited) return (ManagerPackage)EPackage.Registry.INSTANCE.getEPackage(ManagerPackage.eNS_URI);
+
+		// Obtain or create and register package
+		ManagerPackageImpl theManagerPackage = (ManagerPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ManagerPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ManagerPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		ServicePackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theManagerPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theManagerPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theManagerPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(ManagerPackage.eNS_URI, theManagerPackage);
+		return theManagerPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeManager() {
+		return dcaeManagerEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeManager_InputStreams() {
+		return (EReference)dcaeManagerEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeManager_OutputStreams() {
+		return (EReference)dcaeManagerEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeManager__Test() {
+		return dcaeManagerEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeManager__Suspend() {
+		return dcaeManagerEClass.getEOperations().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeManager__Resume() {
+		return dcaeManagerEClass.getEOperations().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeManager__PublicKey() {
+		return dcaeManagerEClass.getEOperations().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeManager__ConfigurationChanged() {
+		return dcaeManagerEClass.getEOperations().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeManager__UpdateStreams__EList_EList() {
+		return dcaeManagerEClass.getEOperations().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ManagerFactory getManagerFactory() {
+		return (ManagerFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		dcaeManagerEClass = createEClass(DCAE_MANAGER);
+		createEReference(dcaeManagerEClass, DCAE_MANAGER__INPUT_STREAMS);
+		createEReference(dcaeManagerEClass, DCAE_MANAGER__OUTPUT_STREAMS);
+		createEOperation(dcaeManagerEClass, DCAE_MANAGER___TEST);
+		createEOperation(dcaeManagerEClass, DCAE_MANAGER___SUSPEND);
+		createEOperation(dcaeManagerEClass, DCAE_MANAGER___RESUME);
+		createEOperation(dcaeManagerEClass, DCAE_MANAGER___PUBLIC_KEY);
+		createEOperation(dcaeManagerEClass, DCAE_MANAGER___CONFIGURATION_CHANGED);
+		createEOperation(dcaeManagerEClass, DCAE_MANAGER___UPDATE_STREAMS__ELIST_ELIST);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		StreamPackage theStreamPackage = (StreamPackage)EPackage.Registry.INSTANCE.getEPackage(StreamPackage.eNS_URI);
+		ServicePackage theServicePackage = (ServicePackage)EPackage.Registry.INSTANCE.getEPackage(ServicePackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(dcaeManagerEClass, DcaeManager.class, "DcaeManager", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getDcaeManager_InputStreams(), theStreamPackage.getDcaeStream(), null, "inputStreams", null, 0, -1, DcaeManager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDcaeManager_OutputStreams(), theStreamPackage.getDcaeStream(), null, "outputStreams", null, 0, -1, DcaeManager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEOperation(getDcaeManager__Test(), theServicePackage.getHealthTestResponse(), "test", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		initEOperation(getDcaeManager__Suspend(), null, "suspend", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		initEOperation(getDcaeManager__Resume(), null, "resume", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		initEOperation(getDcaeManager__PublicKey(), theEcorePackage.getEString(), "publicKey", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		initEOperation(getDcaeManager__ConfigurationChanged(), null, "configurationChanged", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		EOperation op = initEOperation(getDcaeManager__UpdateStreams__EList_EList(), null, "updateStreams", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theStreamPackage.getDcaeStream(), "inputStreams", 0, -1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theStreamPackage.getDcaeStream(), "outputStreams", 0, -1, !IS_UNIQUE, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+
+		// Create annotations
+		// http://www.eclipse.org/emf/2011/Xcore
+		createXcoreAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2011/Xcore</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createXcoreAnnotations() {
+		String source = "http://www.eclipse.org/emf/2011/Xcore";	
+		addAnnotation
+		  (this, 
+		   source, 
+		   new String[] {
+			 "ecomp", "http://openecomp.org"
+		   });
+	}
+
+} //ManagerPackageImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/util/ManagerAdapterFactory.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/util/ManagerAdapterFactory.java
new file mode 100644
index 0000000..9f0c9b2
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/util/ManagerAdapterFactory.java
@@ -0,0 +1,141 @@
+
+/*-
+ * ============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.dcae.controller.core.manager.util;
+
+import org.openecomp.dcae.controller.core.manager.*;
+
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.manager.ManagerPackage
+ * @generated
+ */
+public class ManagerAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ManagerPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ManagerAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = ManagerPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ManagerSwitch<Adapter> modelSwitch =
+		new ManagerSwitch<Adapter>() {
+			@Override
+			public Adapter caseDcaeManager(DcaeManager object) {
+				return createDcaeManagerAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.manager.DcaeManager <em>Dcae Manager</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.dcae.controller.core.manager.DcaeManager
+	 * @generated
+	 */
+	public Adapter createDcaeManagerAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //ManagerAdapterFactory
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/util/ManagerSwitch.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/util/ManagerSwitch.java
new file mode 100644
index 0000000..81ff606
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/manager/util/ManagerSwitch.java
@@ -0,0 +1,131 @@
+
+/*-
+ * ============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.dcae.controller.core.manager.util;
+
+import org.openecomp.dcae.controller.core.manager.*;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.manager.ManagerPackage
+ * @generated
+ */
+public class ManagerSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ManagerPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ManagerSwitch() {
+		if (modelPackage == null) {
+			modelPackage = ManagerPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @parameter ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case ManagerPackage.DCAE_MANAGER: {
+				DcaeManager dcaeManager = (DcaeManager)theEObject;
+				T result = caseDcaeManager(dcaeManager);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Manager</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>Dcae Manager</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeManager(DcaeManager object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //ManagerSwitch
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/ControllerCoreServer.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/ControllerCoreServer.java
new file mode 100644
index 0000000..e53eb88
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/ControllerCoreServer.java
@@ -0,0 +1,40 @@
+
+/*-
+ * ============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.dcae.controller.core.server;
+
+import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer;
+import org.openecomp.ncomp.sirius.manager.server.SouthBoundApiWithProxy;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Controller Core Server</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.core.server.ServerPackage#getControllerCoreServer()
+ * @model
+ * @generated
+ */
+public interface ControllerCoreServer extends SouthBoundApiWithProxy, AbstractManagementServer {
+} // ControllerCoreServer
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/DcaeBasicServer.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/DcaeBasicServer.java
new file mode 100644
index 0000000..5c1beb3
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/DcaeBasicServer.java
@@ -0,0 +1,331 @@
+
+/*-
+ * ============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.dcae.controller.core.server;
+
+import org.openecomp.ncomp.core.HasOperationalState;
+import org.openecomp.ncomp.core.NamedEntity;
+import org.openecomp.ncomp.core.logs.LogMessageContainer;
+import org.openecomp.ncomp.core.types.metrics.DateMetricAttribute;
+import org.openecomp.ncomp.openstack.compute.Server;
+import org.openecomp.ncomp.openstack.core.VirtualMachineType;
+import org.openecomp.ncomp.openstack.location.Hypervisor;
+import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdServer;
+import org.openecomp.ncomp.sirius.manager.properties.Module;
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Basic Server</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getPrivateIp <em>Private Ip</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getPublicIp <em>Public Ip</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getCollectd <em>Collectd</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getModules <em>Modules</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getNetworks <em>Networks</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getLastUpdate <em>Last Update</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#isUsingMonitoringAgent <em>Using Monitoring Agent</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getServer <em>Server</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getHypervisor <em>Hypervisor</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getVmType <em>Vm Type</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getCertificatePassword <em>Certificate Password</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer()
+ * @model
+ * @generated
+ */
+public interface DcaeBasicServer extends NamedEntity, HasOperationalState, LogMessageContainer {
+	/**
+	 * Returns the value of the '<em><b>Private Ip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Private Ip</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Private Ip</em>' attribute.
+	 * @see #setPrivateIp(String)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_PrivateIp()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getPrivateIp();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getPrivateIp <em>Private Ip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Private Ip</em>' attribute.
+	 * @see #getPrivateIp()
+	 * @generated
+	 */
+	void setPrivateIp(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Public Ip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Public Ip</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Public Ip</em>' attribute.
+	 * @see #setPublicIp(String)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_PublicIp()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getPublicIp();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getPublicIp <em>Public Ip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Public Ip</em>' attribute.
+	 * @see #getPublicIp()
+	 * @generated
+	 */
+	void setPublicIp(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Collectd</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Collectd</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>Collectd</em>' containment reference.
+	 * @see #setCollectd(CollectdServer)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_Collectd()
+	 * @model containment="true"
+	 * @generated
+	 */
+	CollectdServer getCollectd();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getCollectd <em>Collectd</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Collectd</em>' containment reference.
+	 * @see #getCollectd()
+	 * @generated
+	 */
+	void setCollectd(CollectdServer value);
+
+	/**
+	 * Returns the value of the '<em><b>Modules</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.ncomp.sirius.manager.properties.Module}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Modules</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>Modules</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_Modules()
+	 * @model containment="true" ordered="false"
+	 * @generated
+	 */
+	EList<Module> getModules();
+
+	/**
+	 * Returns the value of the '<em><b>Networks</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Networks</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>Networks</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_Networks()
+	 * @model containment="true" ordered="false"
+	 * @generated
+	 */
+	EList<DcaeBasicServerNetwork> getNetworks();
+
+	/**
+	 * Returns the value of the '<em><b>Last Update</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Last Update</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Last Update</em>' attribute.
+	 * @see #setLastUpdate(DateMetricAttribute)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_LastUpdate()
+	 * @model unique="false" dataType="org.openecomp.ncomp.core.DateMetricAttribute" transient="true"
+	 * @generated
+	 */
+	DateMetricAttribute getLastUpdate();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getLastUpdate <em>Last Update</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Last Update</em>' attribute.
+	 * @see #getLastUpdate()
+	 * @generated
+	 */
+	void setLastUpdate(DateMetricAttribute value);
+
+	/**
+	 * Returns the value of the '<em><b>Using Monitoring Agent</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Using Monitoring Agent</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Using Monitoring Agent</em>' attribute.
+	 * @see #setUsingMonitoringAgent(boolean)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_UsingMonitoringAgent()
+	 * @model default="true" unique="false"
+	 * @generated
+	 */
+	boolean isUsingMonitoringAgent();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#isUsingMonitoringAgent <em>Using Monitoring Agent</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Using Monitoring Agent</em>' attribute.
+	 * @see #isUsingMonitoringAgent()
+	 * @generated
+	 */
+	void setUsingMonitoringAgent(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Server</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Server</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Server</em>' reference.
+	 * @see #setServer(Server)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_Server()
+	 * @model
+	 * @generated
+	 */
+	Server getServer();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getServer <em>Server</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Server</em>' reference.
+	 * @see #getServer()
+	 * @generated
+	 */
+	void setServer(Server value);
+
+	/**
+	 * Returns the value of the '<em><b>Hypervisor</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Hypervisor</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Hypervisor</em>' reference.
+	 * @see #setHypervisor(Hypervisor)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_Hypervisor()
+	 * @model
+	 * @generated
+	 */
+	Hypervisor getHypervisor();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getHypervisor <em>Hypervisor</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Hypervisor</em>' reference.
+	 * @see #getHypervisor()
+	 * @generated
+	 */
+	void setHypervisor(Hypervisor value);
+
+	/**
+	 * Returns the value of the '<em><b>Vm Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Vm Type</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Vm Type</em>' reference.
+	 * @see #setVmType(VirtualMachineType)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_VmType()
+	 * @model
+	 * @generated
+	 */
+	VirtualMachineType getVmType();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getVmType <em>Vm Type</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Vm Type</em>' reference.
+	 * @see #getVmType()
+	 * @generated
+	 */
+	void setVmType(VirtualMachineType value);
+
+	/**
+	 * Returns the value of the '<em><b>Certificate Password</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Certificate Password</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Certificate Password</em>' attribute.
+	 * @see #setCertificatePassword(String)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_CertificatePassword()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getCertificatePassword();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getCertificatePassword <em>Certificate Password</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Certificate Password</em>' attribute.
+	 * @see #getCertificatePassword()
+	 * @generated
+	 */
+	void setCertificatePassword(String value);
+
+} // DcaeBasicServer
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/DcaeBasicServerNetwork.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/DcaeBasicServerNetwork.java
new file mode 100644
index 0000000..2b699cb
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/DcaeBasicServerNetwork.java
@@ -0,0 +1,98 @@
+
+/*-
+ * ============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.dcae.controller.core.server;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Basic Server Network</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork#getIp <em>Ip</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork#getDnsName <em>Dns Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServerNetwork()
+ * @model
+ * @generated
+ */
+public interface DcaeBasicServerNetwork extends NamedEntity {
+	/**
+	 * Returns the value of the '<em><b>Ip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Ip</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Ip</em>' attribute.
+	 * @see #setIp(String)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServerNetwork_Ip()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getIp();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork#getIp <em>Ip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Ip</em>' attribute.
+	 * @see #getIp()
+	 * @generated
+	 */
+	void setIp(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dns Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dns Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dns Name</em>' attribute.
+	 * @see #setDnsName(String)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServerNetwork_DnsName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDnsName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork#getDnsName <em>Dns Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dns Name</em>' attribute.
+	 * @see #getDnsName()
+	 * @generated
+	 */
+	void setDnsName(String value);
+
+} // DcaeBasicServerNetwork
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/ServerFactory.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/ServerFactory.java
new file mode 100644
index 0000000..7740d44
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/ServerFactory.java
@@ -0,0 +1,72 @@
+
+/*-
+ * ============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.dcae.controller.core.server;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.server.ServerPackage
+ * @generated
+ */
+public interface ServerFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ServerFactory eINSTANCE = org.openecomp.dcae.controller.core.server.impl.ServerFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Dcae Basic Server</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dcae Basic Server</em>'.
+	 * @generated
+	 */
+	DcaeBasicServer createDcaeBasicServer();
+
+	/**
+	 * Returns a new object of class '<em>Dcae Basic Server Network</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dcae Basic Server Network</em>'.
+	 * @generated
+	 */
+	DcaeBasicServerNetwork createDcaeBasicServerNetwork();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	ServerPackage getServerPackage();
+
+} //ServerFactory
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/ServerPackage.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/ServerPackage.java
new file mode 100644
index 0000000..31ca18d
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/ServerPackage.java
@@ -0,0 +1,663 @@
+
+/*-
+ * ============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.dcae.controller.core.server;
+
+import org.openecomp.ncomp.core.CorePackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.server.ServerFactory
+ * @model kind="package"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-core-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.core'"
+ * @generated
+ */
+public interface ServerPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "server";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "org.openecomp.dcae.controller.core.server";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "server";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ServerPackage eINSTANCE = org.openecomp.dcae.controller.core.server.impl.ServerPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl <em>Dcae Basic Server</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl
+	 * @see org.openecomp.dcae.controller.core.server.impl.ServerPackageImpl#getDcaeBasicServer()
+	 * @generated
+	 */
+	int DCAE_BASIC_SERVER = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__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 DCAE_BASIC_SERVER__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 DCAE_BASIC_SERVER__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 DCAE_BASIC_SERVER__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Operational State</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__OPERATIONAL_STATE = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Log Message Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__LOG_MESSAGE_CONFIGURATION = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Log Message Categories</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__LOG_MESSAGE_CATEGORIES = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Log Message Stats</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__LOG_MESSAGE_STATS = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Private Ip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__PRIVATE_IP = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Public Ip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__PUBLIC_IP = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Collectd</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__COLLECTD = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Modules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__MODULES = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Networks</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__NETWORKS = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Last Update</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__LAST_UPDATE = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Using Monitoring Agent</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__USING_MONITORING_AGENT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 10;
+
+	/**
+	 * The feature id for the '<em><b>Server</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__SERVER = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 11;
+
+	/**
+	 * The feature id for the '<em><b>Hypervisor</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__HYPERVISOR = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 12;
+
+	/**
+	 * The feature id for the '<em><b>Vm Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__VM_TYPE = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 13;
+
+	/**
+	 * The feature id for the '<em><b>Certificate Password</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 14;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Basic Server</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 15;
+
+	/**
+	 * The number of operations of the '<em>Dcae Basic Server</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerNetworkImpl <em>Dcae Basic Server Network</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerNetworkImpl
+	 * @see org.openecomp.dcae.controller.core.server.impl.ServerPackageImpl#getDcaeBasicServerNetwork()
+	 * @generated
+	 */
+	int DCAE_BASIC_SERVER_NETWORK = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER_NETWORK__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 DCAE_BASIC_SERVER_NETWORK__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 DCAE_BASIC_SERVER_NETWORK__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 DCAE_BASIC_SERVER_NETWORK__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Ip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER_NETWORK__IP = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Dns Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER_NETWORK__DNS_NAME = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Basic Server Network</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER_NETWORK_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Dcae Basic Server Network</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER_NETWORK_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer <em>Dcae Basic Server</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Basic Server</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer
+	 * @generated
+	 */
+	EClass getDcaeBasicServer();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getPrivateIp <em>Private Ip</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Private Ip</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#getPrivateIp()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EAttribute getDcaeBasicServer_PrivateIp();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getPublicIp <em>Public Ip</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Public Ip</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#getPublicIp()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EAttribute getDcaeBasicServer_PublicIp();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getCollectd <em>Collectd</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Collectd</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#getCollectd()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EReference getDcaeBasicServer_Collectd();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getModules <em>Modules</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Modules</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#getModules()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EReference getDcaeBasicServer_Modules();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getNetworks <em>Networks</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Networks</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#getNetworks()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EReference getDcaeBasicServer_Networks();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getLastUpdate <em>Last Update</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Last Update</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#getLastUpdate()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EAttribute getDcaeBasicServer_LastUpdate();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#isUsingMonitoringAgent <em>Using Monitoring Agent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Using Monitoring Agent</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#isUsingMonitoringAgent()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EAttribute getDcaeBasicServer_UsingMonitoringAgent();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getServer <em>Server</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Server</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#getServer()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EReference getDcaeBasicServer_Server();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getHypervisor <em>Hypervisor</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Hypervisor</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#getHypervisor()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EReference getDcaeBasicServer_Hypervisor();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getVmType <em>Vm Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Vm Type</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#getVmType()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EReference getDcaeBasicServer_VmType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getCertificatePassword <em>Certificate Password</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Certificate Password</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#getCertificatePassword()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EAttribute getDcaeBasicServer_CertificatePassword();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork <em>Dcae Basic Server Network</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Basic Server Network</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork
+	 * @generated
+	 */
+	EClass getDcaeBasicServerNetwork();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork#getIp <em>Ip</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Ip</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork#getIp()
+	 * @see #getDcaeBasicServerNetwork()
+	 * @generated
+	 */
+	EAttribute getDcaeBasicServerNetwork_Ip();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork#getDnsName <em>Dns Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dns Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork#getDnsName()
+	 * @see #getDcaeBasicServerNetwork()
+	 * @generated
+	 */
+	EAttribute getDcaeBasicServerNetwork_DnsName();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	ServerFactory getServerFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl <em>Dcae Basic Server</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl
+		 * @see org.openecomp.dcae.controller.core.server.impl.ServerPackageImpl#getDcaeBasicServer()
+		 * @generated
+		 */
+		EClass DCAE_BASIC_SERVER = eINSTANCE.getDcaeBasicServer();
+		/**
+		 * The meta object literal for the '<em><b>Private Ip</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_BASIC_SERVER__PRIVATE_IP = eINSTANCE.getDcaeBasicServer_PrivateIp();
+		/**
+		 * The meta object literal for the '<em><b>Public Ip</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_BASIC_SERVER__PUBLIC_IP = eINSTANCE.getDcaeBasicServer_PublicIp();
+		/**
+		 * The meta object literal for the '<em><b>Collectd</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_BASIC_SERVER__COLLECTD = eINSTANCE.getDcaeBasicServer_Collectd();
+		/**
+		 * The meta object literal for the '<em><b>Modules</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_BASIC_SERVER__MODULES = eINSTANCE.getDcaeBasicServer_Modules();
+		/**
+		 * The meta object literal for the '<em><b>Networks</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_BASIC_SERVER__NETWORKS = eINSTANCE.getDcaeBasicServer_Networks();
+		/**
+		 * The meta object literal for the '<em><b>Last Update</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_BASIC_SERVER__LAST_UPDATE = eINSTANCE.getDcaeBasicServer_LastUpdate();
+		/**
+		 * The meta object literal for the '<em><b>Using Monitoring Agent</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_BASIC_SERVER__USING_MONITORING_AGENT = eINSTANCE.getDcaeBasicServer_UsingMonitoringAgent();
+		/**
+		 * The meta object literal for the '<em><b>Server</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_BASIC_SERVER__SERVER = eINSTANCE.getDcaeBasicServer_Server();
+		/**
+		 * The meta object literal for the '<em><b>Hypervisor</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_BASIC_SERVER__HYPERVISOR = eINSTANCE.getDcaeBasicServer_Hypervisor();
+		/**
+		 * The meta object literal for the '<em><b>Vm Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_BASIC_SERVER__VM_TYPE = eINSTANCE.getDcaeBasicServer_VmType();
+		/**
+		 * The meta object literal for the '<em><b>Certificate Password</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD = eINSTANCE.getDcaeBasicServer_CertificatePassword();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerNetworkImpl <em>Dcae Basic Server Network</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerNetworkImpl
+		 * @see org.openecomp.dcae.controller.core.server.impl.ServerPackageImpl#getDcaeBasicServerNetwork()
+		 * @generated
+		 */
+		EClass DCAE_BASIC_SERVER_NETWORK = eINSTANCE.getDcaeBasicServerNetwork();
+		/**
+		 * The meta object literal for the '<em><b>Ip</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_BASIC_SERVER_NETWORK__IP = eINSTANCE.getDcaeBasicServerNetwork_Ip();
+		/**
+		 * The meta object literal for the '<em><b>Dns Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_BASIC_SERVER_NETWORK__DNS_NAME = eINSTANCE.getDcaeBasicServerNetwork_DnsName();
+
+	}
+
+} //ServerPackage
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/DcaeBasicServerImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/DcaeBasicServerImpl.java
new file mode 100644
index 0000000..3da755c
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/DcaeBasicServerImpl.java
@@ -0,0 +1,989 @@
+
+/*-
+ * ============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.dcae.controller.core.server.impl;
+
+import org.openecomp.dcae.controller.core.server.DcaeBasicServer;
+import org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork;
+import org.openecomp.dcae.controller.core.server.ServerPackage;
+import org.openecomp.ncomp.core.CorePackage;
+import org.openecomp.ncomp.core.HasOperationalState;
+import org.openecomp.ncomp.core.OperationalState;
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+import org.openecomp.ncomp.core.logs.LogMessageCategory;
+import org.openecomp.ncomp.core.logs.LogMessageContainer;
+import org.openecomp.ncomp.core.logs.LogMessageContainerConfiguration;
+import org.openecomp.ncomp.core.logs.LogMessageStats;
+import org.openecomp.ncomp.core.logs.LogsPackage;
+import org.openecomp.ncomp.core.types.metrics.DateMetricAttribute;
+import org.openecomp.ncomp.openstack.compute.Server;
+import org.openecomp.ncomp.openstack.core.VirtualMachineType;
+import org.openecomp.ncomp.openstack.location.Hypervisor;
+import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdServer;
+import org.openecomp.ncomp.sirius.manager.properties.Module;
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Basic Server</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getOperationalState <em>Operational State</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getLogMessageConfiguration <em>Log Message Configuration</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getLogMessageCategories <em>Log Message Categories</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getLogMessageStats <em>Log Message Stats</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getPrivateIp <em>Private Ip</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getPublicIp <em>Public Ip</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getCollectd <em>Collectd</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getModules <em>Modules</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getNetworks <em>Networks</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getLastUpdate <em>Last Update</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#isUsingMonitoringAgent <em>Using Monitoring Agent</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getServer <em>Server</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getHypervisor <em>Hypervisor</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getVmType <em>Vm Type</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getCertificatePassword <em>Certificate Password</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DcaeBasicServerImpl extends NamedEntityImpl implements DcaeBasicServer {
+	/**
+	 * The default value of the '{@link #getOperationalState() <em>Operational State</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOperationalState()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final OperationalState OPERATIONAL_STATE_EDEFAULT = OperationalState.OPERATIONAL;
+
+	/**
+	 * The cached value of the '{@link #getOperationalState() <em>Operational State</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOperationalState()
+	 * @generated
+	 * @ordered
+	 */
+	protected OperationalState operationalState = OPERATIONAL_STATE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getLogMessageConfiguration() <em>Log Message Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLogMessageConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected LogMessageContainerConfiguration logMessageConfiguration;
+
+	/**
+	 * The cached value of the '{@link #getLogMessageCategories() <em>Log Message Categories</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLogMessageCategories()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<LogMessageCategory> logMessageCategories;
+
+	/**
+	 * The cached value of the '{@link #getLogMessageStats() <em>Log Message Stats</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLogMessageStats()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<LogMessageStats> logMessageStats;
+
+	/**
+	 * The default value of the '{@link #getPrivateIp() <em>Private Ip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPrivateIp()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String PRIVATE_IP_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPrivateIp() <em>Private Ip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPrivateIp()
+	 * @generated
+	 * @ordered
+	 */
+	protected String privateIp = PRIVATE_IP_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPublicIp() <em>Public Ip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPublicIp()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String PUBLIC_IP_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPublicIp() <em>Public Ip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPublicIp()
+	 * @generated
+	 * @ordered
+	 */
+	protected String publicIp = PUBLIC_IP_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getCollectd() <em>Collectd</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCollectd()
+	 * @generated
+	 * @ordered
+	 */
+	protected CollectdServer collectd;
+
+	/**
+	 * The cached value of the '{@link #getModules() <em>Modules</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getModules()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Module> modules;
+
+	/**
+	 * The cached value of the '{@link #getNetworks() <em>Networks</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNetworks()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<DcaeBasicServerNetwork> networks;
+
+	/**
+	 * The default value of the '{@link #getLastUpdate() <em>Last Update</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastUpdate()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final DateMetricAttribute LAST_UPDATE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLastUpdate() <em>Last Update</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastUpdate()
+	 * @generated
+	 * @ordered
+	 */
+	protected DateMetricAttribute lastUpdate = LAST_UPDATE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isUsingMonitoringAgent() <em>Using Monitoring Agent</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isUsingMonitoringAgent()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean USING_MONITORING_AGENT_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isUsingMonitoringAgent() <em>Using Monitoring Agent</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isUsingMonitoringAgent()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean usingMonitoringAgent = USING_MONITORING_AGENT_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getServer() <em>Server</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServer()
+	 * @generated
+	 * @ordered
+	 */
+	protected Server server;
+
+	/**
+	 * The cached value of the '{@link #getHypervisor() <em>Hypervisor</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHypervisor()
+	 * @generated
+	 * @ordered
+	 */
+	protected Hypervisor hypervisor;
+
+	/**
+	 * The cached value of the '{@link #getVmType() <em>Vm Type</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVmType()
+	 * @generated
+	 * @ordered
+	 */
+	protected VirtualMachineType vmType;
+
+	/**
+	 * The default value of the '{@link #getCertificatePassword() <em>Certificate Password</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCertificatePassword()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CERTIFICATE_PASSWORD_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getCertificatePassword() <em>Certificate Password</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCertificatePassword()
+	 * @generated
+	 * @ordered
+	 */
+	protected String certificatePassword = CERTIFICATE_PASSWORD_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeBasicServerImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServerPackage.Literals.DCAE_BASIC_SERVER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OperationalState getOperationalState() {
+		return operationalState;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOperationalState(OperationalState newOperationalState) {
+		OperationalState oldOperationalState = operationalState;
+		operationalState = newOperationalState == null ? OPERATIONAL_STATE_EDEFAULT : newOperationalState;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__OPERATIONAL_STATE, oldOperationalState, operationalState));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public LogMessageContainerConfiguration getLogMessageConfiguration() {
+		return logMessageConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLogMessageConfiguration(LogMessageContainerConfiguration newLogMessageConfiguration, NotificationChain msgs) {
+		LogMessageContainerConfiguration oldLogMessageConfiguration = logMessageConfiguration;
+		logMessageConfiguration = newLogMessageConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CONFIGURATION, oldLogMessageConfiguration, newLogMessageConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLogMessageConfiguration(LogMessageContainerConfiguration newLogMessageConfiguration) {
+		if (newLogMessageConfiguration != logMessageConfiguration) {
+			NotificationChain msgs = null;
+			if (logMessageConfiguration != null)
+				msgs = ((InternalEObject)logMessageConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CONFIGURATION, null, msgs);
+			if (newLogMessageConfiguration != null)
+				msgs = ((InternalEObject)newLogMessageConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CONFIGURATION, null, msgs);
+			msgs = basicSetLogMessageConfiguration(newLogMessageConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CONFIGURATION, newLogMessageConfiguration, newLogMessageConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<LogMessageCategory> getLogMessageCategories() {
+		if (logMessageCategories == null) {
+			logMessageCategories = new EObjectContainmentEList<LogMessageCategory>(LogMessageCategory.class, this, ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CATEGORIES);
+		}
+		return logMessageCategories;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<LogMessageStats> getLogMessageStats() {
+		if (logMessageStats == null) {
+			logMessageStats = new EObjectContainmentEList<LogMessageStats>(LogMessageStats.class, this, ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_STATS);
+		}
+		return logMessageStats;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPrivateIp() {
+		return privateIp;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPrivateIp(String newPrivateIp) {
+		String oldPrivateIp = privateIp;
+		privateIp = newPrivateIp;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__PRIVATE_IP, oldPrivateIp, privateIp));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPublicIp() {
+		return publicIp;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPublicIp(String newPublicIp) {
+		String oldPublicIp = publicIp;
+		publicIp = newPublicIp;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__PUBLIC_IP, oldPublicIp, publicIp));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CollectdServer getCollectd() {
+		return collectd;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCollectd(CollectdServer newCollectd, NotificationChain msgs) {
+		CollectdServer oldCollectd = collectd;
+		collectd = newCollectd;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__COLLECTD, oldCollectd, newCollectd);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCollectd(CollectdServer newCollectd) {
+		if (newCollectd != collectd) {
+			NotificationChain msgs = null;
+			if (collectd != null)
+				msgs = ((InternalEObject)collectd).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ServerPackage.DCAE_BASIC_SERVER__COLLECTD, null, msgs);
+			if (newCollectd != null)
+				msgs = ((InternalEObject)newCollectd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ServerPackage.DCAE_BASIC_SERVER__COLLECTD, null, msgs);
+			msgs = basicSetCollectd(newCollectd, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__COLLECTD, newCollectd, newCollectd));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<Module> getModules() {
+		if (modules == null) {
+			modules = new EObjectContainmentEList<Module>(Module.class, this, ServerPackage.DCAE_BASIC_SERVER__MODULES);
+		}
+		return modules;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<DcaeBasicServerNetwork> getNetworks() {
+		if (networks == null) {
+			networks = new EObjectContainmentEList<DcaeBasicServerNetwork>(DcaeBasicServerNetwork.class, this, ServerPackage.DCAE_BASIC_SERVER__NETWORKS);
+		}
+		return networks;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DateMetricAttribute getLastUpdate() {
+		return lastUpdate;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLastUpdate(DateMetricAttribute newLastUpdate) {
+		DateMetricAttribute oldLastUpdate = lastUpdate;
+		lastUpdate = newLastUpdate;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__LAST_UPDATE, oldLastUpdate, lastUpdate));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isUsingMonitoringAgent() {
+		return usingMonitoringAgent;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUsingMonitoringAgent(boolean newUsingMonitoringAgent) {
+		boolean oldUsingMonitoringAgent = usingMonitoringAgent;
+		usingMonitoringAgent = newUsingMonitoringAgent;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__USING_MONITORING_AGENT, oldUsingMonitoringAgent, usingMonitoringAgent));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Server getServer() {
+		if (server != null && server.eIsProxy()) {
+			InternalEObject oldServer = (InternalEObject)server;
+			server = (Server)eResolveProxy(oldServer);
+			if (server != oldServer) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ServerPackage.DCAE_BASIC_SERVER__SERVER, oldServer, server));
+			}
+		}
+		return server;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Server basicGetServer() {
+		return server;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServer(Server newServer) {
+		Server oldServer = server;
+		server = newServer;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__SERVER, oldServer, server));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Hypervisor getHypervisor() {
+		if (hypervisor != null && hypervisor.eIsProxy()) {
+			InternalEObject oldHypervisor = (InternalEObject)hypervisor;
+			hypervisor = (Hypervisor)eResolveProxy(oldHypervisor);
+			if (hypervisor != oldHypervisor) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ServerPackage.DCAE_BASIC_SERVER__HYPERVISOR, oldHypervisor, hypervisor));
+			}
+		}
+		return hypervisor;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Hypervisor basicGetHypervisor() {
+		return hypervisor;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHypervisor(Hypervisor newHypervisor) {
+		Hypervisor oldHypervisor = hypervisor;
+		hypervisor = newHypervisor;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__HYPERVISOR, oldHypervisor, hypervisor));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public VirtualMachineType getVmType() {
+		if (vmType != null && vmType.eIsProxy()) {
+			InternalEObject oldVmType = (InternalEObject)vmType;
+			vmType = (VirtualMachineType)eResolveProxy(oldVmType);
+			if (vmType != oldVmType) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ServerPackage.DCAE_BASIC_SERVER__VM_TYPE, oldVmType, vmType));
+			}
+		}
+		return vmType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public VirtualMachineType basicGetVmType() {
+		return vmType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVmType(VirtualMachineType newVmType) {
+		VirtualMachineType oldVmType = vmType;
+		vmType = newVmType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__VM_TYPE, oldVmType, vmType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getCertificatePassword() {
+		return certificatePassword;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCertificatePassword(String newCertificatePassword) {
+		String oldCertificatePassword = certificatePassword;
+		certificatePassword = newCertificatePassword;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD, oldCertificatePassword, certificatePassword));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CONFIGURATION:
+				return basicSetLogMessageConfiguration(null, msgs);
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CATEGORIES:
+				return ((InternalEList<?>)getLogMessageCategories()).basicRemove(otherEnd, msgs);
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_STATS:
+				return ((InternalEList<?>)getLogMessageStats()).basicRemove(otherEnd, msgs);
+			case ServerPackage.DCAE_BASIC_SERVER__COLLECTD:
+				return basicSetCollectd(null, msgs);
+			case ServerPackage.DCAE_BASIC_SERVER__MODULES:
+				return ((InternalEList<?>)getModules()).basicRemove(otherEnd, msgs);
+			case ServerPackage.DCAE_BASIC_SERVER__NETWORKS:
+				return ((InternalEList<?>)getNetworks()).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.DCAE_BASIC_SERVER__OPERATIONAL_STATE:
+				return getOperationalState();
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CONFIGURATION:
+				return getLogMessageConfiguration();
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CATEGORIES:
+				return getLogMessageCategories();
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_STATS:
+				return getLogMessageStats();
+			case ServerPackage.DCAE_BASIC_SERVER__PRIVATE_IP:
+				return getPrivateIp();
+			case ServerPackage.DCAE_BASIC_SERVER__PUBLIC_IP:
+				return getPublicIp();
+			case ServerPackage.DCAE_BASIC_SERVER__COLLECTD:
+				return getCollectd();
+			case ServerPackage.DCAE_BASIC_SERVER__MODULES:
+				return getModules();
+			case ServerPackage.DCAE_BASIC_SERVER__NETWORKS:
+				return getNetworks();
+			case ServerPackage.DCAE_BASIC_SERVER__LAST_UPDATE:
+				return getLastUpdate();
+			case ServerPackage.DCAE_BASIC_SERVER__USING_MONITORING_AGENT:
+				return isUsingMonitoringAgent();
+			case ServerPackage.DCAE_BASIC_SERVER__SERVER:
+				if (resolve) return getServer();
+				return basicGetServer();
+			case ServerPackage.DCAE_BASIC_SERVER__HYPERVISOR:
+				if (resolve) return getHypervisor();
+				return basicGetHypervisor();
+			case ServerPackage.DCAE_BASIC_SERVER__VM_TYPE:
+				if (resolve) return getVmType();
+				return basicGetVmType();
+			case ServerPackage.DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD:
+				return getCertificatePassword();
+		}
+		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.DCAE_BASIC_SERVER__OPERATIONAL_STATE:
+				setOperationalState((OperationalState)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CONFIGURATION:
+				setLogMessageConfiguration((LogMessageContainerConfiguration)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CATEGORIES:
+				getLogMessageCategories().clear();
+				getLogMessageCategories().addAll((Collection<? extends LogMessageCategory>)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_STATS:
+				getLogMessageStats().clear();
+				getLogMessageStats().addAll((Collection<? extends LogMessageStats>)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__PRIVATE_IP:
+				setPrivateIp((String)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__PUBLIC_IP:
+				setPublicIp((String)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__COLLECTD:
+				setCollectd((CollectdServer)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__MODULES:
+				getModules().clear();
+				getModules().addAll((Collection<? extends Module>)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__NETWORKS:
+				getNetworks().clear();
+				getNetworks().addAll((Collection<? extends DcaeBasicServerNetwork>)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__LAST_UPDATE:
+				setLastUpdate((DateMetricAttribute)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__USING_MONITORING_AGENT:
+				setUsingMonitoringAgent((Boolean)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__SERVER:
+				setServer((Server)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__HYPERVISOR:
+				setHypervisor((Hypervisor)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__VM_TYPE:
+				setVmType((VirtualMachineType)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD:
+				setCertificatePassword((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ServerPackage.DCAE_BASIC_SERVER__OPERATIONAL_STATE:
+				setOperationalState(OPERATIONAL_STATE_EDEFAULT);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CONFIGURATION:
+				setLogMessageConfiguration((LogMessageContainerConfiguration)null);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CATEGORIES:
+				getLogMessageCategories().clear();
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_STATS:
+				getLogMessageStats().clear();
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__PRIVATE_IP:
+				setPrivateIp(PRIVATE_IP_EDEFAULT);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__PUBLIC_IP:
+				setPublicIp(PUBLIC_IP_EDEFAULT);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__COLLECTD:
+				setCollectd((CollectdServer)null);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__MODULES:
+				getModules().clear();
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__NETWORKS:
+				getNetworks().clear();
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__LAST_UPDATE:
+				setLastUpdate(LAST_UPDATE_EDEFAULT);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__USING_MONITORING_AGENT:
+				setUsingMonitoringAgent(USING_MONITORING_AGENT_EDEFAULT);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__SERVER:
+				setServer((Server)null);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__HYPERVISOR:
+				setHypervisor((Hypervisor)null);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__VM_TYPE:
+				setVmType((VirtualMachineType)null);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD:
+				setCertificatePassword(CERTIFICATE_PASSWORD_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ServerPackage.DCAE_BASIC_SERVER__OPERATIONAL_STATE:
+				return operationalState != OPERATIONAL_STATE_EDEFAULT;
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CONFIGURATION:
+				return logMessageConfiguration != null;
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CATEGORIES:
+				return logMessageCategories != null && !logMessageCategories.isEmpty();
+			case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_STATS:
+				return logMessageStats != null && !logMessageStats.isEmpty();
+			case ServerPackage.DCAE_BASIC_SERVER__PRIVATE_IP:
+				return PRIVATE_IP_EDEFAULT == null ? privateIp != null : !PRIVATE_IP_EDEFAULT.equals(privateIp);
+			case ServerPackage.DCAE_BASIC_SERVER__PUBLIC_IP:
+				return PUBLIC_IP_EDEFAULT == null ? publicIp != null : !PUBLIC_IP_EDEFAULT.equals(publicIp);
+			case ServerPackage.DCAE_BASIC_SERVER__COLLECTD:
+				return collectd != null;
+			case ServerPackage.DCAE_BASIC_SERVER__MODULES:
+				return modules != null && !modules.isEmpty();
+			case ServerPackage.DCAE_BASIC_SERVER__NETWORKS:
+				return networks != null && !networks.isEmpty();
+			case ServerPackage.DCAE_BASIC_SERVER__LAST_UPDATE:
+				return LAST_UPDATE_EDEFAULT == null ? lastUpdate != null : !LAST_UPDATE_EDEFAULT.equals(lastUpdate);
+			case ServerPackage.DCAE_BASIC_SERVER__USING_MONITORING_AGENT:
+				return usingMonitoringAgent != USING_MONITORING_AGENT_EDEFAULT;
+			case ServerPackage.DCAE_BASIC_SERVER__SERVER:
+				return server != null;
+			case ServerPackage.DCAE_BASIC_SERVER__HYPERVISOR:
+				return hypervisor != null;
+			case ServerPackage.DCAE_BASIC_SERVER__VM_TYPE:
+				return vmType != null;
+			case ServerPackage.DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD:
+				return CERTIFICATE_PASSWORD_EDEFAULT == null ? certificatePassword != null : !CERTIFICATE_PASSWORD_EDEFAULT.equals(certificatePassword);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == HasOperationalState.class) {
+			switch (derivedFeatureID) {
+				case ServerPackage.DCAE_BASIC_SERVER__OPERATIONAL_STATE: return CorePackage.HAS_OPERATIONAL_STATE__OPERATIONAL_STATE;
+				default: return -1;
+			}
+		}
+		if (baseClass == LogMessageContainer.class) {
+			switch (derivedFeatureID) {
+				case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CONFIGURATION: return LogsPackage.LOG_MESSAGE_CONTAINER__LOG_MESSAGE_CONFIGURATION;
+				case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CATEGORIES: return LogsPackage.LOG_MESSAGE_CONTAINER__LOG_MESSAGE_CATEGORIES;
+				case ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_STATS: return LogsPackage.LOG_MESSAGE_CONTAINER__LOG_MESSAGE_STATS;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == HasOperationalState.class) {
+			switch (baseFeatureID) {
+				case CorePackage.HAS_OPERATIONAL_STATE__OPERATIONAL_STATE: return ServerPackage.DCAE_BASIC_SERVER__OPERATIONAL_STATE;
+				default: return -1;
+			}
+		}
+		if (baseClass == LogMessageContainer.class) {
+			switch (baseFeatureID) {
+				case LogsPackage.LOG_MESSAGE_CONTAINER__LOG_MESSAGE_CONFIGURATION: return ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CONFIGURATION;
+				case LogsPackage.LOG_MESSAGE_CONTAINER__LOG_MESSAGE_CATEGORIES: return ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_CATEGORIES;
+				case LogsPackage.LOG_MESSAGE_CONTAINER__LOG_MESSAGE_STATS: return ServerPackage.DCAE_BASIC_SERVER__LOG_MESSAGE_STATS;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (operationalState: ");
+		result.append(operationalState);
+		result.append(", privateIp: ");
+		result.append(privateIp);
+		result.append(", publicIp: ");
+		result.append(publicIp);
+		result.append(", lastUpdate: ");
+		result.append(lastUpdate);
+		result.append(", usingMonitoringAgent: ");
+		result.append(usingMonitoringAgent);
+		result.append(", certificatePassword: ");
+		result.append(certificatePassword);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DcaeBasicServerImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/DcaeBasicServerNetworkImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/DcaeBasicServerNetworkImpl.java
new file mode 100644
index 0000000..7c25664
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/DcaeBasicServerNetworkImpl.java
@@ -0,0 +1,239 @@
+
+/*-
+ * ============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.dcae.controller.core.server.impl;
+
+import org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork;
+import org.openecomp.dcae.controller.core.server.ServerPackage;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Basic Server Network</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerNetworkImpl#getIp <em>Ip</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerNetworkImpl#getDnsName <em>Dns Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DcaeBasicServerNetworkImpl extends NamedEntityImpl implements DcaeBasicServerNetwork {
+	/**
+	 * The default value of the '{@link #getIp() <em>Ip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIp()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String IP_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getIp() <em>Ip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIp()
+	 * @generated
+	 * @ordered
+	 */
+	protected String ip = IP_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDnsName() <em>Dns Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDnsName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DNS_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDnsName() <em>Dns Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDnsName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dnsName = DNS_NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeBasicServerNetworkImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServerPackage.Literals.DCAE_BASIC_SERVER_NETWORK;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getIp() {
+		return ip;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setIp(String newIp) {
+		String oldIp = ip;
+		ip = newIp;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER_NETWORK__IP, oldIp, ip));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDnsName() {
+		return dnsName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDnsName(String newDnsName) {
+		String oldDnsName = dnsName;
+		dnsName = newDnsName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER_NETWORK__DNS_NAME, oldDnsName, dnsName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ServerPackage.DCAE_BASIC_SERVER_NETWORK__IP:
+				return getIp();
+			case ServerPackage.DCAE_BASIC_SERVER_NETWORK__DNS_NAME:
+				return getDnsName();
+		}
+		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.DCAE_BASIC_SERVER_NETWORK__IP:
+				setIp((String)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER_NETWORK__DNS_NAME:
+				setDnsName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ServerPackage.DCAE_BASIC_SERVER_NETWORK__IP:
+				setIp(IP_EDEFAULT);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER_NETWORK__DNS_NAME:
+				setDnsName(DNS_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ServerPackage.DCAE_BASIC_SERVER_NETWORK__IP:
+				return IP_EDEFAULT == null ? ip != null : !IP_EDEFAULT.equals(ip);
+			case ServerPackage.DCAE_BASIC_SERVER_NETWORK__DNS_NAME:
+				return DNS_NAME_EDEFAULT == null ? dnsName != null : !DNS_NAME_EDEFAULT.equals(dnsName);
+		}
+		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(" (ip: ");
+		result.append(ip);
+		result.append(", dnsName: ");
+		result.append(dnsName);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DcaeBasicServerNetworkImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/ServerFactoryImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/ServerFactoryImpl.java
new file mode 100644
index 0000000..d265222
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/ServerFactoryImpl.java
@@ -0,0 +1,127 @@
+
+/*-
+ * ============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.dcae.controller.core.server.impl;
+
+import org.openecomp.dcae.controller.core.server.*;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ServerFactoryImpl extends EFactoryImpl implements ServerFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static ServerFactory init() {
+		try {
+			ServerFactory theServerFactory = (ServerFactory)EPackage.Registry.INSTANCE.getEFactory(ServerPackage.eNS_URI);
+			if (theServerFactory != null) {
+				return theServerFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new ServerFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServerFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case ServerPackage.DCAE_BASIC_SERVER: return createDcaeBasicServer();
+			case ServerPackage.DCAE_BASIC_SERVER_NETWORK: return createDcaeBasicServerNetwork();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeBasicServer createDcaeBasicServer() {
+		DcaeBasicServerImpl dcaeBasicServer = new DcaeBasicServerImpl();
+		return dcaeBasicServer;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeBasicServerNetwork createDcaeBasicServerNetwork() {
+		DcaeBasicServerNetworkImpl dcaeBasicServerNetwork = new DcaeBasicServerNetworkImpl();
+		return dcaeBasicServerNetwork;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServerPackage getServerPackage() {
+		return (ServerPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static ServerPackage getPackage() {
+		return ServerPackage.eINSTANCE;
+	}
+
+} //ServerFactoryImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/ServerPackageImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/ServerPackageImpl.java
new file mode 100644
index 0000000..1ed91e4
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/ServerPackageImpl.java
@@ -0,0 +1,374 @@
+
+/*-
+ * ============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.dcae.controller.core.server.impl;
+
+import org.openecomp.dcae.controller.core.server.DcaeBasicServer;
+import org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork;
+import org.openecomp.dcae.controller.core.server.ServerFactory;
+import org.openecomp.dcae.controller.core.server.ServerPackage;
+import org.openecomp.ncomp.core.CorePackage;
+import org.openecomp.ncomp.core.logs.LogsPackage;
+import org.openecomp.ncomp.openstack.compute.ComputePackage;
+import org.openecomp.ncomp.openstack.location.LocationPackage;
+import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdPackage;
+import org.openecomp.ncomp.sirius.manager.properties.PropertiesPackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ServerPackageImpl extends EPackageImpl implements ServerPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeBasicServerEClass = null;
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeBasicServerNetworkEClass = null;
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private ServerPackageImpl() {
+		super(eNS_URI, ServerFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link ServerPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static ServerPackage init() {
+		if (isInited) return (ServerPackage)EPackage.Registry.INSTANCE.getEPackage(ServerPackage.eNS_URI);
+
+		// Obtain or create and register package
+		ServerPackageImpl theServerPackage = (ServerPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ServerPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ServerPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		CollectdPackage.eINSTANCE.eClass();
+		PropertiesPackage.eINSTANCE.eClass();
+		LocationPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theServerPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theServerPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theServerPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(ServerPackage.eNS_URI, theServerPackage);
+		return theServerPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeBasicServer() {
+		return dcaeBasicServerEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeBasicServer_PrivateIp() {
+		return (EAttribute)dcaeBasicServerEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeBasicServer_PublicIp() {
+		return (EAttribute)dcaeBasicServerEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeBasicServer_Collectd() {
+		return (EReference)dcaeBasicServerEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeBasicServer_Modules() {
+		return (EReference)dcaeBasicServerEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeBasicServer_Networks() {
+		return (EReference)dcaeBasicServerEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeBasicServer_LastUpdate() {
+		return (EAttribute)dcaeBasicServerEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeBasicServer_UsingMonitoringAgent() {
+		return (EAttribute)dcaeBasicServerEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeBasicServer_Server() {
+		return (EReference)dcaeBasicServerEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeBasicServer_Hypervisor() {
+		return (EReference)dcaeBasicServerEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeBasicServer_VmType() {
+		return (EReference)dcaeBasicServerEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeBasicServer_CertificatePassword() {
+		return (EAttribute)dcaeBasicServerEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeBasicServerNetwork() {
+		return dcaeBasicServerNetworkEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeBasicServerNetwork_Ip() {
+		return (EAttribute)dcaeBasicServerNetworkEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeBasicServerNetwork_DnsName() {
+		return (EAttribute)dcaeBasicServerNetworkEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServerFactory getServerFactory() {
+		return (ServerFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		dcaeBasicServerEClass = createEClass(DCAE_BASIC_SERVER);
+		createEAttribute(dcaeBasicServerEClass, DCAE_BASIC_SERVER__PRIVATE_IP);
+		createEAttribute(dcaeBasicServerEClass, DCAE_BASIC_SERVER__PUBLIC_IP);
+		createEReference(dcaeBasicServerEClass, DCAE_BASIC_SERVER__COLLECTD);
+		createEReference(dcaeBasicServerEClass, DCAE_BASIC_SERVER__MODULES);
+		createEReference(dcaeBasicServerEClass, DCAE_BASIC_SERVER__NETWORKS);
+		createEAttribute(dcaeBasicServerEClass, DCAE_BASIC_SERVER__LAST_UPDATE);
+		createEAttribute(dcaeBasicServerEClass, DCAE_BASIC_SERVER__USING_MONITORING_AGENT);
+		createEReference(dcaeBasicServerEClass, DCAE_BASIC_SERVER__SERVER);
+		createEReference(dcaeBasicServerEClass, DCAE_BASIC_SERVER__HYPERVISOR);
+		createEReference(dcaeBasicServerEClass, DCAE_BASIC_SERVER__VM_TYPE);
+		createEAttribute(dcaeBasicServerEClass, DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD);
+
+		dcaeBasicServerNetworkEClass = createEClass(DCAE_BASIC_SERVER_NETWORK);
+		createEAttribute(dcaeBasicServerNetworkEClass, DCAE_BASIC_SERVER_NETWORK__IP);
+		createEAttribute(dcaeBasicServerNetworkEClass, DCAE_BASIC_SERVER_NETWORK__DNS_NAME);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		CorePackage theCorePackage = (CorePackage)EPackage.Registry.INSTANCE.getEPackage(CorePackage.eNS_URI);
+		LogsPackage theLogsPackage = (LogsPackage)EPackage.Registry.INSTANCE.getEPackage(LogsPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		CollectdPackage theCollectdPackage = (CollectdPackage)EPackage.Registry.INSTANCE.getEPackage(CollectdPackage.eNS_URI);
+		PropertiesPackage thePropertiesPackage = (PropertiesPackage)EPackage.Registry.INSTANCE.getEPackage(PropertiesPackage.eNS_URI);
+		ComputePackage theComputePackage = (ComputePackage)EPackage.Registry.INSTANCE.getEPackage(ComputePackage.eNS_URI);
+		LocationPackage theLocationPackage = (LocationPackage)EPackage.Registry.INSTANCE.getEPackage(LocationPackage.eNS_URI);
+		org.openecomp.ncomp.openstack.core.CorePackage theCorePackage_1 = (org.openecomp.ncomp.openstack.core.CorePackage)EPackage.Registry.INSTANCE.getEPackage(org.openecomp.ncomp.openstack.core.CorePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		dcaeBasicServerEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		dcaeBasicServerEClass.getESuperTypes().add(theCorePackage.getHasOperationalState());
+		dcaeBasicServerEClass.getESuperTypes().add(theLogsPackage.getLogMessageContainer());
+		dcaeBasicServerNetworkEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(dcaeBasicServerEClass, DcaeBasicServer.class, "DcaeBasicServer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDcaeBasicServer_PrivateIp(), theEcorePackage.getEString(), "privateIp", null, 0, 1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeBasicServer_PublicIp(), theEcorePackage.getEString(), "publicIp", null, 0, 1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDcaeBasicServer_Collectd(), theCollectdPackage.getCollectdServer(), null, "collectd", null, 0, 1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDcaeBasicServer_Modules(), thePropertiesPackage.getModule(), null, "modules", null, 0, -1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getDcaeBasicServer_Networks(), this.getDcaeBasicServerNetwork(), null, "networks", null, 0, -1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getDcaeBasicServer_LastUpdate(), theCorePackage.getDateMetricAttribute(), "lastUpdate", null, 0, 1, DcaeBasicServer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeBasicServer_UsingMonitoringAgent(), theEcorePackage.getEBoolean(), "usingMonitoringAgent", "true", 0, 1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDcaeBasicServer_Server(), theComputePackage.getServer(), null, "server", null, 0, 1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDcaeBasicServer_Hypervisor(), theLocationPackage.getHypervisor(), null, "hypervisor", null, 0, 1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDcaeBasicServer_VmType(), theCorePackage_1.getVirtualMachineType(), null, "vmType", null, 0, 1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeBasicServer_CertificatePassword(), theEcorePackage.getEString(), "certificatePassword", null, 0, 1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(dcaeBasicServerNetworkEClass, DcaeBasicServerNetwork.class, "DcaeBasicServerNetwork", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDcaeBasicServerNetwork_Ip(), theEcorePackage.getEString(), "ip", null, 0, 1, DcaeBasicServerNetwork.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeBasicServerNetwork_DnsName(), theEcorePackage.getEString(), "dnsName", null, 0, 1, DcaeBasicServerNetwork.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //ServerPackageImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/util/ServerAdapterFactory.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/util/ServerAdapterFactory.java
new file mode 100644
index 0000000..a448cca
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/util/ServerAdapterFactory.java
@@ -0,0 +1,213 @@
+
+/*-
+ * ============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.dcae.controller.core.server.util;
+
+import org.openecomp.dcae.controller.core.server.*;
+import org.openecomp.ncomp.core.HasOperationalState;
+import org.openecomp.ncomp.core.NamedEntity;
+import org.openecomp.ncomp.core.logs.LogMessageContainer;
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.server.ServerPackage
+ * @generated
+ */
+public class ServerAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ServerPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServerAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = ServerPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ServerSwitch<Adapter> modelSwitch =
+		new ServerSwitch<Adapter>() {
+			@Override
+			public Adapter caseDcaeBasicServer(DcaeBasicServer object) {
+				return createDcaeBasicServerAdapter();
+			}
+			@Override
+			public Adapter caseDcaeBasicServerNetwork(DcaeBasicServerNetwork object) {
+				return createDcaeBasicServerNetworkAdapter();
+			}
+			@Override
+			public Adapter caseNamedEntity(NamedEntity object) {
+				return createNamedEntityAdapter();
+			}
+			@Override
+			public Adapter caseHasOperationalState(HasOperationalState object) {
+				return createHasOperationalStateAdapter();
+			}
+			@Override
+			public Adapter caseLogMessageContainer(LogMessageContainer object) {
+				return createLogMessageContainerAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer <em>Dcae Basic Server</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.dcae.controller.core.server.DcaeBasicServer
+	 * @generated
+	 */
+	public Adapter createDcaeBasicServerAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork <em>Dcae Basic Server Network</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.dcae.controller.core.server.DcaeBasicServerNetwork
+	 * @generated
+	 */
+	public Adapter createDcaeBasicServerNetworkAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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.core.HasOperationalState <em>Has Operational State</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.HasOperationalState
+	 * @generated
+	 */
+	public Adapter createHasOperationalStateAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.ncomp.core.logs.LogMessageContainer <em>Log Message Container</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.logs.LogMessageContainer
+	 * @generated
+	 */
+	public Adapter createLogMessageContainerAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //ServerAdapterFactory
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/util/ServerSwitch.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/util/ServerSwitch.java
new file mode 100644
index 0000000..964f0cb
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/util/ServerSwitch.java
@@ -0,0 +1,202 @@
+
+/*-
+ * ============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.dcae.controller.core.server.util;
+
+import org.openecomp.dcae.controller.core.server.*;
+import org.openecomp.ncomp.core.HasOperationalState;
+import org.openecomp.ncomp.core.NamedEntity;
+import org.openecomp.ncomp.core.logs.LogMessageContainer;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.server.ServerPackage
+ * @generated
+ */
+public class ServerSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ServerPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServerSwitch() {
+		if (modelPackage == null) {
+			modelPackage = ServerPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @parameter ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case ServerPackage.DCAE_BASIC_SERVER: {
+				DcaeBasicServer dcaeBasicServer = (DcaeBasicServer)theEObject;
+				T result = caseDcaeBasicServer(dcaeBasicServer);
+				if (result == null) result = caseNamedEntity(dcaeBasicServer);
+				if (result == null) result = caseHasOperationalState(dcaeBasicServer);
+				if (result == null) result = caseLogMessageContainer(dcaeBasicServer);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ServerPackage.DCAE_BASIC_SERVER_NETWORK: {
+				DcaeBasicServerNetwork dcaeBasicServerNetwork = (DcaeBasicServerNetwork)theEObject;
+				T result = caseDcaeBasicServerNetwork(dcaeBasicServerNetwork);
+				if (result == null) result = caseNamedEntity(dcaeBasicServerNetwork);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Basic Server</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>Dcae Basic Server</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeBasicServer(DcaeBasicServer object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Basic Server Network</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>Dcae Basic Server Network</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeBasicServerNetwork(DcaeBasicServerNetwork object) {
+		return null;
+	}
+
+	/**
+	 * 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>Has Operational State</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>Has Operational State</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseHasOperationalState(HasOperationalState object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Log Message Container</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>Log Message Container</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseLogMessageContainer(LogMessageContainer object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //ServerSwitch
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeLocation.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeLocation.java
new file mode 100644
index 0000000..25ea31c
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeLocation.java
@@ -0,0 +1,99 @@
+
+/*-
+ * ============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.dcae.controller.core.service;
+
+import org.openecomp.ncomp.openstack.location.OpenStackProject;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Location</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaeLocation#getLocationType <em>Location Type</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaeLocation#getOpenstackProject <em>Openstack Project</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeLocation()
+ * @model
+ * @generated
+ */
+public interface DcaeLocation extends DcaeServiceContainer {
+
+	/**
+	 * Returns the value of the '<em><b>Location Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Location Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Location Type</em>' attribute.
+	 * @see #setLocationType(String)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeLocation_LocationType()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getLocationType();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaeLocation#getLocationType <em>Location Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Location Type</em>' attribute.
+	 * @see #getLocationType()
+	 * @generated
+	 */
+	void setLocationType(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Openstack Project</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Openstack Project</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Openstack Project</em>' reference.
+	 * @see #setOpenstackProject(OpenStackProject)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeLocation_OpenstackProject()
+	 * @model
+	 * @generated
+	 */
+	OpenStackProject getOpenstackProject();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaeLocation#getOpenstackProject <em>Openstack Project</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Openstack Project</em>' reference.
+	 * @see #getOpenstackProject()
+	 * @generated
+	 */
+	void setOpenstackProject(OpenStackProject value);
+} // DcaeLocation
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaePolicyEntity.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaePolicyEntity.java
new file mode 100644
index 0000000..3bbb77e
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaePolicyEntity.java
@@ -0,0 +1,240 @@
+
+/*-
+ * ============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.dcae.controller.core.service;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Policy Entity</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyName <em>Policy Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyDescription <em>Policy Description</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyConfigName <em>Policy Config Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyTemplateVersion <em>Policy Template Version</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyVersion <em>Policy Version</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyPriority <em>Policy Priority</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyScope <em>Policy Scope</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaePolicyEntity()
+ * @model abstract="true"
+ * @generated
+ */
+public interface DcaePolicyEntity extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Policy Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Policy Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Policy Name</em>' attribute.
+	 * @see #setPolicyName(String)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaePolicyEntity_PolicyName()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org/cdap destination='namespace-prefs::${path}.policyName'"
+	 * @generated
+	 */
+	String getPolicyName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyName <em>Policy Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Policy Name</em>' attribute.
+	 * @see #getPolicyName()
+	 * @generated
+	 */
+	void setPolicyName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Policy Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Policy Description</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Policy Description</em>' attribute.
+	 * @see #setPolicyDescription(String)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaePolicyEntity_PolicyDescription()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org/cdap destination='namespace-prefs::${path}.policyDescription'"
+	 * @generated
+	 */
+	String getPolicyDescription();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyDescription <em>Policy Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Policy Description</em>' attribute.
+	 * @see #getPolicyDescription()
+	 * @generated
+	 */
+	void setPolicyDescription(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Policy Config Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Policy Config Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Policy Config Name</em>' attribute.
+	 * @see #setPolicyConfigName(String)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaePolicyEntity_PolicyConfigName()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org/cdap destination='namespace-prefs::${path}.policyConfigName'"
+	 * @generated
+	 */
+	String getPolicyConfigName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyConfigName <em>Policy Config Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Policy Config Name</em>' attribute.
+	 * @see #getPolicyConfigName()
+	 * @generated
+	 */
+	void setPolicyConfigName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Policy Template Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Policy Template 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>Policy Template Version</em>' attribute.
+	 * @see #setPolicyTemplateVersion(String)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaePolicyEntity_PolicyTemplateVersion()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org/cdap destination='namespace-prefs::${path}.policyTemplateVersion'"
+	 * @generated
+	 */
+	String getPolicyTemplateVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyTemplateVersion <em>Policy Template Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Policy Template Version</em>' attribute.
+	 * @see #getPolicyTemplateVersion()
+	 * @generated
+	 */
+	void setPolicyTemplateVersion(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Policy Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Policy 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>Policy Version</em>' attribute.
+	 * @see #setPolicyVersion(String)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaePolicyEntity_PolicyVersion()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org/cdap destination='namespace-prefs::${path}.policyVersion'"
+	 * @generated
+	 */
+	String getPolicyVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyVersion <em>Policy Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Policy Version</em>' attribute.
+	 * @see #getPolicyVersion()
+	 * @generated
+	 */
+	void setPolicyVersion(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Policy Priority</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Policy Priority</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Policy Priority</em>' attribute.
+	 * @see #setPolicyPriority(String)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaePolicyEntity_PolicyPriority()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org/cdap destination='namespace-prefs::${path}.policyPriority'"
+	 * @generated
+	 */
+	String getPolicyPriority();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyPriority <em>Policy Priority</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Policy Priority</em>' attribute.
+	 * @see #getPolicyPriority()
+	 * @generated
+	 */
+	void setPolicyPriority(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Policy Scope</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Policy Scope</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Policy Scope</em>' attribute.
+	 * @see #setPolicyScope(String)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaePolicyEntity_PolicyScope()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org/cdap destination='namespace-prefs::${path}.policyScope'"
+	 * @generated
+	 */
+	String getPolicyScope();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyScope <em>Policy Scope</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Policy Scope</em>' attribute.
+	 * @see #getPolicyScope()
+	 * @generated
+	 */
+	void setPolicyScope(String value);
+
+} // DcaePolicyEntity
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeService.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeService.java
new file mode 100644
index 0000000..9f4941f
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeService.java
@@ -0,0 +1,129 @@
+
+/*-
+ * ============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.dcae.controller.core.service;
+
+import org.openecomp.ncomp.core.NamedEntity;
+import org.eclipse.emf.ecore.EObject;
+import org.json.JSONObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Service</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeService()
+ * @model abstract="true"
+ * @generated
+ */
+public interface DcaeService extends NamedEntity {
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model instanceNameUnique="false" containerPathUnique="false"
+	 * @generated
+	 */
+	void deploy(String instanceName, String containerPath);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model instanceNameUnique="false"
+	 * @generated
+	 */
+	void undeploy(String instanceName);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model unique="false" instanceNameUnique="false"
+	 * @generated
+	 */
+	HealthTestResponse test(String instanceName);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model instanceNameUnique="false"
+	 * @generated
+	 */
+	void suspend(String instanceName);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model instanceNameUnique="false"
+	 * @generated
+	 */
+	void resume(String instanceName);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model instanceNameUnique="false"
+	 * @generated
+	 */
+	void pushManagerConfiguration(String instanceName);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model instanceNameUnique="false"
+	 * @generated
+	 */
+	void pollManagerConfiguration(String instanceName);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model unique="false" instanceNameUnique="false"
+	 * @generated
+	 */
+	EObject managerConfiguration(String instanceName);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model dataType="org.openecomp.ncomp.core.JsonObject" unique="false" instanceNameUnique="false" operationUnique="false" parametersDataType="org.openecomp.ncomp.core.JsonObject" parametersUnique="false"
+	 * @generated
+	 */
+	JSONObject managerOperation(String instanceName, String operation, JSONObject parameters);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model instanceNameUnique="false"
+	 * @generated
+	 */
+	void updateConfigurationFromPolicy(String instanceName);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	void runHealthTests();
+} // DcaeService
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeServiceContainer.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeServiceContainer.java
new file mode 100644
index 0000000..def3b75
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeServiceContainer.java
@@ -0,0 +1,65 @@
+
+/*-
+ * ============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.dcae.controller.core.service;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Service Container</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaeServiceContainer#getInstances <em>Instances</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeServiceContainer()
+ * @model abstract="true"
+ * @generated
+ */
+public interface DcaeServiceContainer extends NamedEntity {
+	/**
+	 * Returns the value of the '<em><b>Instances</b></em>' reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance}.
+	 * It is bidirectional and its opposite is '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getServiceContainer <em>Service Container</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Instances</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>Instances</em>' reference list.
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeServiceContainer_Instances()
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getServiceContainer
+	 * @model opposite="serviceContainer"
+	 * @generated
+	 */
+	EList<DcaeServiceInstance> getInstances();
+
+} // DcaeServiceContainer
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeServiceDescriptor.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeServiceDescriptor.java
new file mode 100644
index 0000000..dc920ac
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeServiceDescriptor.java
@@ -0,0 +1,125 @@
+
+/*-
+ * ============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.dcae.controller.core.service;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Service Descriptor</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor#getGroupId <em>Group Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor#getArtifact <em>Artifact</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor#getVersion <em>Version</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeServiceDescriptor()
+ * @model
+ * @generated
+ */
+public interface DcaeServiceDescriptor extends NamedEntity {
+	/**
+	 * Returns the value of the '<em><b>Group Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Group Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Group Id</em>' attribute.
+	 * @see #setGroupId(String)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeServiceDescriptor_GroupId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getGroupId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor#getGroupId <em>Group Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Group Id</em>' attribute.
+	 * @see #getGroupId()
+	 * @generated
+	 */
+	void setGroupId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Artifact</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Artifact</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Artifact</em>' attribute.
+	 * @see #setArtifact(String)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeServiceDescriptor_Artifact()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getArtifact();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor#getArtifact <em>Artifact</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Artifact</em>' attribute.
+	 * @see #getArtifact()
+	 * @generated
+	 */
+	void setArtifact(String value);
+
+	/**
+	 * 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.dcae.controller.core.service.ServicePackage#getDcaeServiceDescriptor_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor#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);
+
+} // DcaeServiceDescriptor
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeServiceInstance.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeServiceInstance.java
new file mode 100644
index 0000000..2475f84
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/DcaeServiceInstance.java
@@ -0,0 +1,229 @@
+
+/*-
+ * ============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.dcae.controller.core.service;
+
+import org.openecomp.dcae.controller.core.stream.DcaeStream;
+import org.openecomp.ncomp.core.DeploymentStatus;
+import org.openecomp.ncomp.core.NamedEntity;
+import org.openecomp.ncomp.core.types.metrics.DateMetricAttribute;
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Service Instance</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getServiceContainer <em>Service Container</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getStatus <em>Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getInputStreams <em>Input Streams</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getOutputStreams <em>Output Streams</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getLastHealthTest <em>Last Health Test</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getHealthTestStatus <em>Health Test Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getHealthTestMessageCode <em>Health Test Message Code</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeServiceInstance()
+ * @model abstract="true"
+ * @generated
+ */
+public interface DcaeServiceInstance extends NamedEntity {
+	/**
+	 * Returns the value of the '<em><b>Service Container</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link org.openecomp.dcae.controller.core.service.DcaeServiceContainer#getInstances <em>Instances</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service Container</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Service Container</em>' reference.
+	 * @see #setServiceContainer(DcaeServiceContainer)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeServiceInstance_ServiceContainer()
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceContainer#getInstances
+	 * @model opposite="instances"
+	 *        annotation="http://openecomp.org type='operational'"
+	 * @generated
+	 */
+	DcaeServiceContainer getServiceContainer();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getServiceContainer <em>Service Container</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service Container</em>' reference.
+	 * @see #getServiceContainer()
+	 * @generated
+	 */
+	void setServiceContainer(DcaeServiceContainer value);
+
+	/**
+	 * Returns the value of the '<em><b>Status</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.openecomp.ncomp.core.DeploymentStatus}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Status</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Status</em>' attribute.
+	 * @see org.openecomp.ncomp.core.DeploymentStatus
+	 * @see #setStatus(DeploymentStatus)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeServiceInstance_Status()
+	 * @model unique="false"
+	 *        annotation="http://openecomp.org type='operational'"
+	 * @generated
+	 */
+	DeploymentStatus getStatus();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getStatus <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Status</em>' attribute.
+	 * @see org.openecomp.ncomp.core.DeploymentStatus
+	 * @see #getStatus()
+	 * @generated
+	 */
+	void setStatus(DeploymentStatus value);
+
+	/**
+	 * Returns the value of the '<em><b>Input Streams</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.core.stream.DcaeStream}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Input Streams</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Input Streams</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeServiceInstance_InputStreams()
+	 * @model containment="true"
+	 *        annotation="http://openecomp.org type='service'"
+	 * @generated
+	 */
+	EList<DcaeStream> getInputStreams();
+
+	/**
+	 * Returns the value of the '<em><b>Output Streams</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.core.stream.DcaeStream}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Output Streams</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Output Streams</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeServiceInstance_OutputStreams()
+	 * @model containment="true"
+	 *        annotation="http://openecomp.org type='service'"
+	 * @generated
+	 */
+	EList<DcaeStream> getOutputStreams();
+
+	/**
+	 * Returns the value of the '<em><b>Last Health Test</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Last Health Test</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Last Health Test</em>' attribute.
+	 * @see #setLastHealthTest(DateMetricAttribute)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeServiceInstance_LastHealthTest()
+	 * @model unique="false" dataType="org.openecomp.ncomp.core.DateMetricAttribute" transient="true"
+	 * @generated
+	 */
+	DateMetricAttribute getLastHealthTest();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getLastHealthTest <em>Last Health Test</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Last Health Test</em>' attribute.
+	 * @see #getLastHealthTest()
+	 * @generated
+	 */
+	void setLastHealthTest(DateMetricAttribute value);
+
+	/**
+	 * Returns the value of the '<em><b>Health Test Status</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.openecomp.dcae.controller.core.service.HealthTestStatus}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Health Test Status</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Health Test Status</em>' attribute.
+	 * @see org.openecomp.dcae.controller.core.service.HealthTestStatus
+	 * @see #setHealthTestStatus(HealthTestStatus)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeServiceInstance_HealthTestStatus()
+	 * @model unique="false"
+	 * @generated
+	 */
+	HealthTestStatus getHealthTestStatus();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getHealthTestStatus <em>Health Test Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Health Test Status</em>' attribute.
+	 * @see org.openecomp.dcae.controller.core.service.HealthTestStatus
+	 * @see #getHealthTestStatus()
+	 * @generated
+	 */
+	void setHealthTestStatus(HealthTestStatus value);
+
+	/**
+	 * Returns the value of the '<em><b>Health Test Message Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Health Test Message Code</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Health Test Message Code</em>' attribute.
+	 * @see #setHealthTestMessageCode(String)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getDcaeServiceInstance_HealthTestMessageCode()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getHealthTestMessageCode();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getHealthTestMessageCode <em>Health Test Message Code</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Health Test Message Code</em>' attribute.
+	 * @see #getHealthTestMessageCode()
+	 * @generated
+	 */
+	void setHealthTestMessageCode(String value);
+
+} // DcaeServiceInstance
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/HealthTestResponse.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/HealthTestResponse.java
new file mode 100644
index 0000000..0eaab17
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/HealthTestResponse.java
@@ -0,0 +1,101 @@
+
+/*-
+ * ============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.dcae.controller.core.service;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Healt Test Response</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.HealthTestResponse#getStatus <em>Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.HealthTestResponse#getMessageCode <em>Message Code</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.service.ServicePackage#getHealthTestResponse()
+ * @model
+ * @generated
+ */
+public interface HealthTestResponse extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Status</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.openecomp.dcae.controller.core.service.HealthTestStatus}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Status</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Status</em>' attribute.
+	 * @see org.openecomp.dcae.controller.core.service.HealthTestStatus
+	 * @see #setStatus(HealthTestStatus)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getHealthTestResponse_Status()
+	 * @model unique="false"
+	 * @generated
+	 */
+	HealthTestStatus getStatus();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.HealthTestResponse#getStatus <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Status</em>' attribute.
+	 * @see org.openecomp.dcae.controller.core.service.HealthTestStatus
+	 * @see #getStatus()
+	 * @generated
+	 */
+	void setStatus(HealthTestStatus value);
+
+	/**
+	 * Returns the value of the '<em><b>Message Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Message Code</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Message Code</em>' attribute.
+	 * @see #setMessageCode(String)
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#getHealthTestResponse_MessageCode()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getMessageCode();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.service.HealthTestResponse#getMessageCode <em>Message Code</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Message Code</em>' attribute.
+	 * @see #getMessageCode()
+	 * @generated
+	 */
+	void setMessageCode(String value);
+
+} // HealtTestResponse
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/HealthTestStatus.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/HealthTestStatus.java
new file mode 100644
index 0000000..be353a2
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/HealthTestStatus.java
@@ -0,0 +1,254 @@
+
+/*-
+ * ============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.dcae.controller.core.service;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Health Test Status</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.service.ServicePackage#getHealthTestStatus()
+ * @model
+ * @generated
+ */
+public enum HealthTestStatus implements Enumerator {
+	/**
+	 * The '<em><b>GREEN</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #GREEN_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	GREEN(0, "GREEN", "GREEN"),
+
+	/**
+	 * The '<em><b>YELLOW</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #YELLOW_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	YELLOW(0, "YELLOW", "YELLOW"),
+
+	/**
+	 * The '<em><b>RED</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #RED_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	RED(0, "RED", "RED");
+
+	/**
+	 * The '<em><b>GREEN</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>GREEN</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #GREEN
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int GREEN_VALUE = 0;
+
+	/**
+	 * The '<em><b>YELLOW</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>YELLOW</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #YELLOW
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int YELLOW_VALUE = 0;
+
+	/**
+	 * The '<em><b>RED</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>RED</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #RED
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int RED_VALUE = 0;
+
+	/**
+	 * An array of all the '<em><b>Health Test Status</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final HealthTestStatus[] VALUES_ARRAY =
+		new HealthTestStatus[] {
+			GREEN,
+			YELLOW,
+			RED,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Health Test Status</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<HealthTestStatus> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Health Test Status</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static HealthTestStatus get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			HealthTestStatus result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Health Test Status</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static HealthTestStatus getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			HealthTestStatus result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Health Test Status</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static HealthTestStatus get(int value) {
+		switch (value) {
+			case GREEN_VALUE: return GREEN;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private HealthTestStatus(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //HealthTestStatus
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/ServiceFactory.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/ServiceFactory.java
new file mode 100644
index 0000000..2ad75f5
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/ServiceFactory.java
@@ -0,0 +1,81 @@
+
+/*-
+ * ============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.dcae.controller.core.service;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.service.ServicePackage
+ * @generated
+ */
+public interface ServiceFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ServiceFactory eINSTANCE = org.openecomp.dcae.controller.core.service.impl.ServiceFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Dcae Location</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dcae Location</em>'.
+	 * @generated
+	 */
+	DcaeLocation createDcaeLocation();
+
+	/**
+	 * Returns a new object of class '<em>Dcae Service Descriptor</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dcae Service Descriptor</em>'.
+	 * @generated
+	 */
+	DcaeServiceDescriptor createDcaeServiceDescriptor();
+
+	/**
+	 * Returns a new object of class '<em>Health Test Response</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Health Test Response</em>'.
+	 * @generated
+	 */
+	HealthTestResponse createHealthTestResponse();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	ServicePackage getServicePackage();
+
+} //ServiceFactory
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/ServicePackage.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/ServicePackage.java
new file mode 100644
index 0000000..74f5786
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/ServicePackage.java
@@ -0,0 +1,1579 @@
+
+/*-
+ * ============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.dcae.controller.core.service;
+
+import org.openecomp.ncomp.core.CorePackage;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.service.ServiceFactory
+ * @model kind="package"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-core-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.core'"
+ *        annotation="http://www.eclipse.org/emf/2011/Xcore ecomp='http://openecomp.org' cdap='http://openecomp.org/cdap'"
+ * @generated
+ */
+public interface ServicePackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "service";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "org.openecomp.dcae.controller.core.service";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "service";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ServicePackage eINSTANCE = org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceImpl <em>Dcae Service</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.service.impl.DcaeServiceImpl
+	 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getDcaeService()
+	 * @generated
+	 */
+	int DCAE_SERVICE = 1;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceContainerImpl <em>Dcae Service Container</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.service.impl.DcaeServiceContainerImpl
+	 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getDcaeServiceContainer()
+	 * @generated
+	 */
+	int DCAE_SERVICE_CONTAINER = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_CONTAINER__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 DCAE_SERVICE_CONTAINER__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 DCAE_SERVICE_CONTAINER__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 DCAE_SERVICE_CONTAINER__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Instances</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_CONTAINER__INSTANCES = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Service Container</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_CONTAINER_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Dcae Service Container</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_CONTAINER_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE__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 DCAE_SERVICE__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 DCAE_SERVICE__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 DCAE_SERVICE__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Service</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Deploy</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE___DEPLOY__STRING_STRING = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Undeploy</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE___UNDEPLOY__STRING = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 1;
+
+	/**
+	 * The operation id for the '<em>Test</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE___TEST__STRING = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Suspend</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE___SUSPEND__STRING = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 3;
+
+	/**
+	 * The operation id for the '<em>Resume</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE___RESUME__STRING = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 4;
+
+	/**
+	 * The operation id for the '<em>Push Manager Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE___PUSH_MANAGER_CONFIGURATION__STRING = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 5;
+
+	/**
+	 * The operation id for the '<em>Poll Manager Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE___POLL_MANAGER_CONFIGURATION__STRING = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 6;
+
+	/**
+	 * The operation id for the '<em>Manager Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE___MANAGER_CONFIGURATION__STRING = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 7;
+
+	/**
+	 * The operation id for the '<em>Manager Operation</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE___MANAGER_OPERATION__STRING_STRING_JSONOBJECT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 8;
+
+	/**
+	 * The operation id for the '<em>Update Configuration From Policy</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE___UPDATE_CONFIGURATION_FROM_POLICY__STRING = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 9;
+
+	/**
+	 * The operation id for the '<em>Run Health Tests</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE___RUN_HEALTH_TESTS = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 10;
+
+	/**
+	 * The number of operations of the '<em>Dcae Service</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 11;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceInstanceImpl <em>Dcae Service Instance</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.service.impl.DcaeServiceInstanceImpl
+	 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getDcaeServiceInstance()
+	 * @generated
+	 */
+	int DCAE_SERVICE_INSTANCE = 2;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_INSTANCE__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 DCAE_SERVICE_INSTANCE__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 DCAE_SERVICE_INSTANCE__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 DCAE_SERVICE_INSTANCE__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Service Container</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_INSTANCE__STATUS = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Input Streams</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_INSTANCE__INPUT_STREAMS = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Output Streams</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_INSTANCE__OUTPUT_STREAMS = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Last Health Test</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_INSTANCE__LAST_HEALTH_TEST = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Health Test Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_INSTANCE__HEALTH_TEST_STATUS = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Health Test Message Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_INSTANCE__HEALTH_TEST_MESSAGE_CODE = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 6;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Service Instance</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_INSTANCE_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 7;
+
+	/**
+	 * The number of operations of the '<em>Dcae Service Instance</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_INSTANCE_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.service.impl.DcaeLocationImpl <em>Dcae Location</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.service.impl.DcaeLocationImpl
+	 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getDcaeLocation()
+	 * @generated
+	 */
+	int DCAE_LOCATION = 3;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_LOCATION__NAME = DCAE_SERVICE_CONTAINER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_LOCATION__LAST_POLLED = DCAE_SERVICE_CONTAINER__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_LOCATION__LAST_CHANGED = DCAE_SERVICE_CONTAINER__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_LOCATION__CREATED = DCAE_SERVICE_CONTAINER__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Instances</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_LOCATION__INSTANCES = DCAE_SERVICE_CONTAINER__INSTANCES;
+
+	/**
+	 * The feature id for the '<em><b>Location Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_LOCATION__LOCATION_TYPE = DCAE_SERVICE_CONTAINER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Openstack Project</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_LOCATION__OPENSTACK_PROJECT = DCAE_SERVICE_CONTAINER_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Location</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_LOCATION_FEATURE_COUNT = DCAE_SERVICE_CONTAINER_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Dcae Location</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_LOCATION_OPERATION_COUNT = DCAE_SERVICE_CONTAINER_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceDescriptorImpl <em>Dcae Service Descriptor</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.service.impl.DcaeServiceDescriptorImpl
+	 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getDcaeServiceDescriptor()
+	 * @generated
+	 */
+	int DCAE_SERVICE_DESCRIPTOR = 4;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_DESCRIPTOR__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 DCAE_SERVICE_DESCRIPTOR__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 DCAE_SERVICE_DESCRIPTOR__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 DCAE_SERVICE_DESCRIPTOR__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Group Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_DESCRIPTOR__GROUP_ID = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Artifact</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_DESCRIPTOR__ARTIFACT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_DESCRIPTOR__VERSION = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Service Descriptor</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_DESCRIPTOR_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Dcae Service Descriptor</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_SERVICE_DESCRIPTOR_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.service.impl.HealthTestResponseImpl <em>Health Test Response</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.service.impl.HealthTestResponseImpl
+	 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getHealthTestResponse()
+	 * @generated
+	 */
+	int HEALTH_TEST_RESPONSE = 5;
+
+	/**
+	 * The feature id for the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_TEST_RESPONSE__STATUS = 0;
+
+	/**
+	 * The feature id for the '<em><b>Message Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_TEST_RESPONSE__MESSAGE_CODE = 1;
+
+	/**
+	 * The number of structural features of the '<em>Health Test Response</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_TEST_RESPONSE_FEATURE_COUNT = 2;
+
+	/**
+	 * The number of operations of the '<em>Health Test Response</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int HEALTH_TEST_RESPONSE_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.service.impl.DcaePolicyEntityImpl <em>Dcae Policy Entity</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.service.impl.DcaePolicyEntityImpl
+	 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getDcaePolicyEntity()
+	 * @generated
+	 */
+	int DCAE_POLICY_ENTITY = 6;
+
+	/**
+	 * The feature id for the '<em><b>Policy Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_POLICY_ENTITY__POLICY_NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Policy Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_POLICY_ENTITY__POLICY_DESCRIPTION = 1;
+
+	/**
+	 * The feature id for the '<em><b>Policy Config Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_POLICY_ENTITY__POLICY_CONFIG_NAME = 2;
+
+	/**
+	 * The feature id for the '<em><b>Policy Template Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_POLICY_ENTITY__POLICY_TEMPLATE_VERSION = 3;
+
+	/**
+	 * The feature id for the '<em><b>Policy Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_POLICY_ENTITY__POLICY_VERSION = 4;
+
+	/**
+	 * The feature id for the '<em><b>Policy Priority</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_POLICY_ENTITY__POLICY_PRIORITY = 5;
+
+	/**
+	 * The feature id for the '<em><b>Policy Scope</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_POLICY_ENTITY__POLICY_SCOPE = 6;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Policy Entity</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_POLICY_ENTITY_FEATURE_COUNT = 7;
+
+	/**
+	 * The number of operations of the '<em>Dcae Policy Entity</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_POLICY_ENTITY_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.service.HealthTestStatus <em>Health Test Status</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.service.HealthTestStatus
+	 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getHealthTestStatus()
+	 * @generated
+	 */
+	int HEALTH_TEST_STATUS = 7;
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.service.DcaeService <em>Dcae Service</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Service</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeService
+	 * @generated
+	 */
+	EClass getDcaeService();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.service.DcaeService#deploy(java.lang.String, java.lang.String) <em>Deploy</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Deploy</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeService#deploy(java.lang.String, java.lang.String)
+	 * @generated
+	 */
+	EOperation getDcaeService__Deploy__String_String();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.service.DcaeService#undeploy(java.lang.String) <em>Undeploy</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Undeploy</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeService#undeploy(java.lang.String)
+	 * @generated
+	 */
+	EOperation getDcaeService__Undeploy__String();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.service.DcaeService#test(java.lang.String) <em>Test</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Test</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeService#test(java.lang.String)
+	 * @generated
+	 */
+	EOperation getDcaeService__Test__String();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.service.DcaeService#suspend(java.lang.String) <em>Suspend</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Suspend</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeService#suspend(java.lang.String)
+	 * @generated
+	 */
+	EOperation getDcaeService__Suspend__String();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.service.DcaeService#resume(java.lang.String) <em>Resume</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Resume</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeService#resume(java.lang.String)
+	 * @generated
+	 */
+	EOperation getDcaeService__Resume__String();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.service.DcaeService#pushManagerConfiguration(java.lang.String) <em>Push Manager Configuration</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Push Manager Configuration</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeService#pushManagerConfiguration(java.lang.String)
+	 * @generated
+	 */
+	EOperation getDcaeService__PushManagerConfiguration__String();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.service.DcaeService#pollManagerConfiguration(java.lang.String) <em>Poll Manager Configuration</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Poll Manager Configuration</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeService#pollManagerConfiguration(java.lang.String)
+	 * @generated
+	 */
+	EOperation getDcaeService__PollManagerConfiguration__String();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.service.DcaeService#managerConfiguration(java.lang.String) <em>Manager Configuration</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Manager Configuration</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeService#managerConfiguration(java.lang.String)
+	 * @generated
+	 */
+	EOperation getDcaeService__ManagerConfiguration__String();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.service.DcaeService#managerOperation(java.lang.String, java.lang.String, org.json.JSONObject) <em>Manager Operation</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Manager Operation</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeService#managerOperation(java.lang.String, java.lang.String, org.json.JSONObject)
+	 * @generated
+	 */
+	EOperation getDcaeService__ManagerOperation__String_String_JSONObject();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.service.DcaeService#updateConfigurationFromPolicy(java.lang.String) <em>Update Configuration From Policy</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Update Configuration From Policy</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeService#updateConfigurationFromPolicy(java.lang.String)
+	 * @generated
+	 */
+	EOperation getDcaeService__UpdateConfigurationFromPolicy__String();
+
+	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.core.service.DcaeService#runHealthTests() <em>Run Health Tests</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Run Health Tests</em>' operation.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeService#runHealthTests()
+	 * @generated
+	 */
+	EOperation getDcaeService__RunHealthTests();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.service.DcaeServiceContainer <em>Dcae Service Container</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Service Container</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceContainer
+	 * @generated
+	 */
+	EClass getDcaeServiceContainer();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.openecomp.dcae.controller.core.service.DcaeServiceContainer#getInstances <em>Instances</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Instances</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceContainer#getInstances()
+	 * @see #getDcaeServiceContainer()
+	 * @generated
+	 */
+	EReference getDcaeServiceContainer_Instances();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance <em>Dcae Service Instance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Service Instance</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceInstance
+	 * @generated
+	 */
+	EClass getDcaeServiceInstance();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getServiceContainer <em>Service Container</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Service Container</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getServiceContainer()
+	 * @see #getDcaeServiceInstance()
+	 * @generated
+	 */
+	EReference getDcaeServiceInstance_ServiceContainer();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getStatus <em>Status</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Status</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getStatus()
+	 * @see #getDcaeServiceInstance()
+	 * @generated
+	 */
+	EAttribute getDcaeServiceInstance_Status();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getInputStreams <em>Input Streams</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Input Streams</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getInputStreams()
+	 * @see #getDcaeServiceInstance()
+	 * @generated
+	 */
+	EReference getDcaeServiceInstance_InputStreams();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getOutputStreams <em>Output Streams</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Output Streams</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getOutputStreams()
+	 * @see #getDcaeServiceInstance()
+	 * @generated
+	 */
+	EReference getDcaeServiceInstance_OutputStreams();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getLastHealthTest <em>Last Health Test</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Last Health Test</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getLastHealthTest()
+	 * @see #getDcaeServiceInstance()
+	 * @generated
+	 */
+	EAttribute getDcaeServiceInstance_LastHealthTest();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getHealthTestStatus <em>Health Test Status</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Health Test Status</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getHealthTestStatus()
+	 * @see #getDcaeServiceInstance()
+	 * @generated
+	 */
+	EAttribute getDcaeServiceInstance_HealthTestStatus();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getHealthTestMessageCode <em>Health Test Message Code</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Health Test Message Code</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceInstance#getHealthTestMessageCode()
+	 * @see #getDcaeServiceInstance()
+	 * @generated
+	 */
+	EAttribute getDcaeServiceInstance_HealthTestMessageCode();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.service.DcaeLocation <em>Dcae Location</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Location</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeLocation
+	 * @generated
+	 */
+	EClass getDcaeLocation();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaeLocation#getLocationType <em>Location Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Location Type</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeLocation#getLocationType()
+	 * @see #getDcaeLocation()
+	 * @generated
+	 */
+	EAttribute getDcaeLocation_LocationType();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.openecomp.dcae.controller.core.service.DcaeLocation#getOpenstackProject <em>Openstack Project</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Openstack Project</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeLocation#getOpenstackProject()
+	 * @see #getDcaeLocation()
+	 * @generated
+	 */
+	EReference getDcaeLocation_OpenstackProject();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor <em>Dcae Service Descriptor</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Service Descriptor</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor
+	 * @generated
+	 */
+	EClass getDcaeServiceDescriptor();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor#getGroupId <em>Group Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Group Id</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor#getGroupId()
+	 * @see #getDcaeServiceDescriptor()
+	 * @generated
+	 */
+	EAttribute getDcaeServiceDescriptor_GroupId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor#getArtifact <em>Artifact</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Artifact</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor#getArtifact()
+	 * @see #getDcaeServiceDescriptor()
+	 * @generated
+	 */
+	EAttribute getDcaeServiceDescriptor_Artifact();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor#getVersion <em>Version</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Version</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor#getVersion()
+	 * @see #getDcaeServiceDescriptor()
+	 * @generated
+	 */
+	EAttribute getDcaeServiceDescriptor_Version();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.service.HealthTestResponse <em>Health Test Response</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Health Test Response</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.HealthTestResponse
+	 * @generated
+	 */
+	EClass getHealthTestResponse();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.HealthTestResponse#getStatus <em>Status</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Status</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.HealthTestResponse#getStatus()
+	 * @see #getHealthTestResponse()
+	 * @generated
+	 */
+	EAttribute getHealthTestResponse_Status();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.HealthTestResponse#getMessageCode <em>Message Code</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Message Code</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.HealthTestResponse#getMessageCode()
+	 * @see #getHealthTestResponse()
+	 * @generated
+	 */
+	EAttribute getHealthTestResponse_MessageCode();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity <em>Dcae Policy Entity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Policy Entity</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaePolicyEntity
+	 * @generated
+	 */
+	EClass getDcaePolicyEntity();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyName <em>Policy Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Policy Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyName()
+	 * @see #getDcaePolicyEntity()
+	 * @generated
+	 */
+	EAttribute getDcaePolicyEntity_PolicyName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyDescription <em>Policy Description</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Policy Description</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyDescription()
+	 * @see #getDcaePolicyEntity()
+	 * @generated
+	 */
+	EAttribute getDcaePolicyEntity_PolicyDescription();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyConfigName <em>Policy Config Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Policy Config Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyConfigName()
+	 * @see #getDcaePolicyEntity()
+	 * @generated
+	 */
+	EAttribute getDcaePolicyEntity_PolicyConfigName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyTemplateVersion <em>Policy Template Version</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Policy Template Version</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyTemplateVersion()
+	 * @see #getDcaePolicyEntity()
+	 * @generated
+	 */
+	EAttribute getDcaePolicyEntity_PolicyTemplateVersion();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyVersion <em>Policy Version</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Policy Version</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyVersion()
+	 * @see #getDcaePolicyEntity()
+	 * @generated
+	 */
+	EAttribute getDcaePolicyEntity_PolicyVersion();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyPriority <em>Policy Priority</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Policy Priority</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyPriority()
+	 * @see #getDcaePolicyEntity()
+	 * @generated
+	 */
+	EAttribute getDcaePolicyEntity_PolicyPriority();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyScope <em>Policy Scope</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Policy Scope</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.DcaePolicyEntity#getPolicyScope()
+	 * @see #getDcaePolicyEntity()
+	 * @generated
+	 */
+	EAttribute getDcaePolicyEntity_PolicyScope();
+
+	/**
+	 * Returns the meta object for enum '{@link org.openecomp.dcae.controller.core.service.HealthTestStatus <em>Health Test Status</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Health Test Status</em>'.
+	 * @see org.openecomp.dcae.controller.core.service.HealthTestStatus
+	 * @generated
+	 */
+	EEnum getHealthTestStatus();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	ServiceFactory getServiceFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceImpl <em>Dcae Service</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.service.impl.DcaeServiceImpl
+		 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getDcaeService()
+		 * @generated
+		 */
+		EClass DCAE_SERVICE = eINSTANCE.getDcaeService();
+
+		/**
+		 * The meta object literal for the '<em><b>Deploy</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_SERVICE___DEPLOY__STRING_STRING = eINSTANCE.getDcaeService__Deploy__String_String();
+
+		/**
+		 * The meta object literal for the '<em><b>Undeploy</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_SERVICE___UNDEPLOY__STRING = eINSTANCE.getDcaeService__Undeploy__String();
+
+		/**
+		 * The meta object literal for the '<em><b>Test</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_SERVICE___TEST__STRING = eINSTANCE.getDcaeService__Test__String();
+
+		/**
+		 * The meta object literal for the '<em><b>Suspend</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_SERVICE___SUSPEND__STRING = eINSTANCE.getDcaeService__Suspend__String();
+
+		/**
+		 * The meta object literal for the '<em><b>Resume</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_SERVICE___RESUME__STRING = eINSTANCE.getDcaeService__Resume__String();
+
+		/**
+		 * The meta object literal for the '<em><b>Push Manager Configuration</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_SERVICE___PUSH_MANAGER_CONFIGURATION__STRING = eINSTANCE.getDcaeService__PushManagerConfiguration__String();
+
+		/**
+		 * The meta object literal for the '<em><b>Poll Manager Configuration</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_SERVICE___POLL_MANAGER_CONFIGURATION__STRING = eINSTANCE.getDcaeService__PollManagerConfiguration__String();
+
+		/**
+		 * The meta object literal for the '<em><b>Manager Configuration</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_SERVICE___MANAGER_CONFIGURATION__STRING = eINSTANCE.getDcaeService__ManagerConfiguration__String();
+
+		/**
+		 * The meta object literal for the '<em><b>Manager Operation</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_SERVICE___MANAGER_OPERATION__STRING_STRING_JSONOBJECT = eINSTANCE.getDcaeService__ManagerOperation__String_String_JSONObject();
+
+		/**
+		 * The meta object literal for the '<em><b>Update Configuration From Policy</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_SERVICE___UPDATE_CONFIGURATION_FROM_POLICY__STRING = eINSTANCE.getDcaeService__UpdateConfigurationFromPolicy__String();
+
+		/**
+		 * The meta object literal for the '<em><b>Run Health Tests</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_SERVICE___RUN_HEALTH_TESTS = eINSTANCE.getDcaeService__RunHealthTests();
+
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceContainerImpl <em>Dcae Service Container</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.service.impl.DcaeServiceContainerImpl
+		 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getDcaeServiceContainer()
+		 * @generated
+		 */
+		EClass DCAE_SERVICE_CONTAINER = eINSTANCE.getDcaeServiceContainer();
+
+		/**
+		 * The meta object literal for the '<em><b>Instances</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_SERVICE_CONTAINER__INSTANCES = eINSTANCE.getDcaeServiceContainer_Instances();
+
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceInstanceImpl <em>Dcae Service Instance</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.service.impl.DcaeServiceInstanceImpl
+		 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getDcaeServiceInstance()
+		 * @generated
+		 */
+		EClass DCAE_SERVICE_INSTANCE = eINSTANCE.getDcaeServiceInstance();
+
+		/**
+		 * The meta object literal for the '<em><b>Service Container</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER = eINSTANCE.getDcaeServiceInstance_ServiceContainer();
+
+		/**
+		 * The meta object literal for the '<em><b>Status</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_SERVICE_INSTANCE__STATUS = eINSTANCE.getDcaeServiceInstance_Status();
+
+		/**
+		 * The meta object literal for the '<em><b>Input Streams</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_SERVICE_INSTANCE__INPUT_STREAMS = eINSTANCE.getDcaeServiceInstance_InputStreams();
+
+		/**
+		 * The meta object literal for the '<em><b>Output Streams</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_SERVICE_INSTANCE__OUTPUT_STREAMS = eINSTANCE.getDcaeServiceInstance_OutputStreams();
+
+		/**
+		 * The meta object literal for the '<em><b>Last Health Test</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_SERVICE_INSTANCE__LAST_HEALTH_TEST = eINSTANCE.getDcaeServiceInstance_LastHealthTest();
+
+		/**
+		 * The meta object literal for the '<em><b>Health Test Status</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_SERVICE_INSTANCE__HEALTH_TEST_STATUS = eINSTANCE.getDcaeServiceInstance_HealthTestStatus();
+
+		/**
+		 * The meta object literal for the '<em><b>Health Test Message Code</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_SERVICE_INSTANCE__HEALTH_TEST_MESSAGE_CODE = eINSTANCE.getDcaeServiceInstance_HealthTestMessageCode();
+
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.service.impl.DcaeLocationImpl <em>Dcae Location</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.service.impl.DcaeLocationImpl
+		 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getDcaeLocation()
+		 * @generated
+		 */
+		EClass DCAE_LOCATION = eINSTANCE.getDcaeLocation();
+
+		/**
+		 * The meta object literal for the '<em><b>Location Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_LOCATION__LOCATION_TYPE = eINSTANCE.getDcaeLocation_LocationType();
+
+		/**
+		 * The meta object literal for the '<em><b>Openstack Project</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_LOCATION__OPENSTACK_PROJECT = eINSTANCE.getDcaeLocation_OpenstackProject();
+
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceDescriptorImpl <em>Dcae Service Descriptor</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.service.impl.DcaeServiceDescriptorImpl
+		 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getDcaeServiceDescriptor()
+		 * @generated
+		 */
+		EClass DCAE_SERVICE_DESCRIPTOR = eINSTANCE.getDcaeServiceDescriptor();
+
+		/**
+		 * The meta object literal for the '<em><b>Group Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_SERVICE_DESCRIPTOR__GROUP_ID = eINSTANCE.getDcaeServiceDescriptor_GroupId();
+
+		/**
+		 * The meta object literal for the '<em><b>Artifact</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_SERVICE_DESCRIPTOR__ARTIFACT = eINSTANCE.getDcaeServiceDescriptor_Artifact();
+
+		/**
+		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_SERVICE_DESCRIPTOR__VERSION = eINSTANCE.getDcaeServiceDescriptor_Version();
+
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.service.impl.HealthTestResponseImpl <em>Health Test Response</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.service.impl.HealthTestResponseImpl
+		 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getHealthTestResponse()
+		 * @generated
+		 */
+		EClass HEALTH_TEST_RESPONSE = eINSTANCE.getHealthTestResponse();
+
+		/**
+		 * The meta object literal for the '<em><b>Status</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute HEALTH_TEST_RESPONSE__STATUS = eINSTANCE.getHealthTestResponse_Status();
+
+		/**
+		 * The meta object literal for the '<em><b>Message Code</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute HEALTH_TEST_RESPONSE__MESSAGE_CODE = eINSTANCE.getHealthTestResponse_MessageCode();
+
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.service.impl.DcaePolicyEntityImpl <em>Dcae Policy Entity</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.service.impl.DcaePolicyEntityImpl
+		 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getDcaePolicyEntity()
+		 * @generated
+		 */
+		EClass DCAE_POLICY_ENTITY = eINSTANCE.getDcaePolicyEntity();
+
+		/**
+		 * The meta object literal for the '<em><b>Policy Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_POLICY_ENTITY__POLICY_NAME = eINSTANCE.getDcaePolicyEntity_PolicyName();
+
+		/**
+		 * The meta object literal for the '<em><b>Policy Description</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_POLICY_ENTITY__POLICY_DESCRIPTION = eINSTANCE.getDcaePolicyEntity_PolicyDescription();
+
+		/**
+		 * The meta object literal for the '<em><b>Policy Config Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_POLICY_ENTITY__POLICY_CONFIG_NAME = eINSTANCE.getDcaePolicyEntity_PolicyConfigName();
+
+		/**
+		 * The meta object literal for the '<em><b>Policy Template Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_POLICY_ENTITY__POLICY_TEMPLATE_VERSION = eINSTANCE.getDcaePolicyEntity_PolicyTemplateVersion();
+
+		/**
+		 * The meta object literal for the '<em><b>Policy Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_POLICY_ENTITY__POLICY_VERSION = eINSTANCE.getDcaePolicyEntity_PolicyVersion();
+
+		/**
+		 * The meta object literal for the '<em><b>Policy Priority</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_POLICY_ENTITY__POLICY_PRIORITY = eINSTANCE.getDcaePolicyEntity_PolicyPriority();
+
+		/**
+		 * The meta object literal for the '<em><b>Policy Scope</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_POLICY_ENTITY__POLICY_SCOPE = eINSTANCE.getDcaePolicyEntity_PolicyScope();
+
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.service.HealthTestStatus <em>Health Test Status</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.service.HealthTestStatus
+		 * @see org.openecomp.dcae.controller.core.service.impl.ServicePackageImpl#getHealthTestStatus()
+		 * @generated
+		 */
+		EEnum HEALTH_TEST_STATUS = eINSTANCE.getHealthTestStatus();
+
+	}
+
+} //ServicePackage
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/User.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/User.java
new file mode 100644
index 0000000..0e7db04
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/User.java
@@ -0,0 +1,39 @@
+
+/*-
+ * ============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.dcae.controller.core.service;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>User</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.core.service.ServicePackage#getUser()
+ * @model
+ * @generated
+ */
+public interface User extends NamedEntity {
+} // User
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeLocationImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeLocationImpl.java
new file mode 100644
index 0000000..553af71
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeLocationImpl.java
@@ -0,0 +1,242 @@
+
+/*-
+ * ============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.dcae.controller.core.service.impl;
+
+import org.openecomp.dcae.controller.core.service.DcaeLocation;
+import org.openecomp.dcae.controller.core.service.ServicePackage;
+import org.openecomp.ncomp.openstack.location.OpenStackProject;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Location</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaeLocationImpl#getLocationType <em>Location Type</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaeLocationImpl#getOpenstackProject <em>Openstack Project</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DcaeLocationImpl extends DcaeServiceContainerImpl implements DcaeLocation {
+	/**
+	 * The default value of the '{@link #getLocationType() <em>Location Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocationType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LOCATION_TYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLocationType() <em>Location Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocationType()
+	 * @generated
+	 * @ordered
+	 */
+	protected String locationType = LOCATION_TYPE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getOpenstackProject() <em>Openstack Project</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOpenstackProject()
+	 * @generated
+	 * @ordered
+	 */
+	protected OpenStackProject openstackProject;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeLocationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServicePackage.Literals.DCAE_LOCATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLocationType() {
+		return locationType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLocationType(String newLocationType) {
+		String oldLocationType = locationType;
+		locationType = newLocationType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_LOCATION__LOCATION_TYPE, oldLocationType, locationType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OpenStackProject getOpenstackProject() {
+		if (openstackProject != null && openstackProject.eIsProxy()) {
+			InternalEObject oldOpenstackProject = (InternalEObject)openstackProject;
+			openstackProject = (OpenStackProject)eResolveProxy(oldOpenstackProject);
+			if (openstackProject != oldOpenstackProject) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ServicePackage.DCAE_LOCATION__OPENSTACK_PROJECT, oldOpenstackProject, openstackProject));
+			}
+		}
+		return openstackProject;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OpenStackProject basicGetOpenstackProject() {
+		return openstackProject;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOpenstackProject(OpenStackProject newOpenstackProject) {
+		OpenStackProject oldOpenstackProject = openstackProject;
+		openstackProject = newOpenstackProject;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_LOCATION__OPENSTACK_PROJECT, oldOpenstackProject, openstackProject));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ServicePackage.DCAE_LOCATION__LOCATION_TYPE:
+				return getLocationType();
+			case ServicePackage.DCAE_LOCATION__OPENSTACK_PROJECT:
+				if (resolve) return getOpenstackProject();
+				return basicGetOpenstackProject();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ServicePackage.DCAE_LOCATION__LOCATION_TYPE:
+				setLocationType((String)newValue);
+				return;
+			case ServicePackage.DCAE_LOCATION__OPENSTACK_PROJECT:
+				setOpenstackProject((OpenStackProject)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ServicePackage.DCAE_LOCATION__LOCATION_TYPE:
+				setLocationType(LOCATION_TYPE_EDEFAULT);
+				return;
+			case ServicePackage.DCAE_LOCATION__OPENSTACK_PROJECT:
+				setOpenstackProject((OpenStackProject)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ServicePackage.DCAE_LOCATION__LOCATION_TYPE:
+				return LOCATION_TYPE_EDEFAULT == null ? locationType != null : !LOCATION_TYPE_EDEFAULT.equals(locationType);
+			case ServicePackage.DCAE_LOCATION__OPENSTACK_PROJECT:
+				return openstackProject != null;
+		}
+		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(" (locationType: ");
+		result.append(locationType);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DcaeLocationImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaePolicyEntityImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaePolicyEntityImpl.java
new file mode 100644
index 0000000..d053055
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaePolicyEntityImpl.java
@@ -0,0 +1,508 @@
+
+/*-
+ * ============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.dcae.controller.core.service.impl;
+
+import org.openecomp.dcae.controller.core.service.DcaePolicyEntity;
+import org.openecomp.dcae.controller.core.service.ServicePackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Policy Entity</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaePolicyEntityImpl#getPolicyName <em>Policy Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaePolicyEntityImpl#getPolicyDescription <em>Policy Description</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaePolicyEntityImpl#getPolicyConfigName <em>Policy Config Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaePolicyEntityImpl#getPolicyTemplateVersion <em>Policy Template Version</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaePolicyEntityImpl#getPolicyVersion <em>Policy Version</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaePolicyEntityImpl#getPolicyPriority <em>Policy Priority</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaePolicyEntityImpl#getPolicyScope <em>Policy Scope</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class DcaePolicyEntityImpl extends MinimalEObjectImpl.Container implements DcaePolicyEntity {
+	/**
+	 * The default value of the '{@link #getPolicyName() <em>Policy Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String POLICY_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPolicyName() <em>Policy Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String policyName = POLICY_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPolicyDescription() <em>Policy Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String POLICY_DESCRIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPolicyDescription() <em>Policy Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String policyDescription = POLICY_DESCRIPTION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPolicyConfigName() <em>Policy Config Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyConfigName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String POLICY_CONFIG_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPolicyConfigName() <em>Policy Config Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyConfigName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String policyConfigName = POLICY_CONFIG_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPolicyTemplateVersion() <em>Policy Template Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyTemplateVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String POLICY_TEMPLATE_VERSION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPolicyTemplateVersion() <em>Policy Template Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyTemplateVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected String policyTemplateVersion = POLICY_TEMPLATE_VERSION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPolicyVersion() <em>Policy Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String POLICY_VERSION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPolicyVersion() <em>Policy Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected String policyVersion = POLICY_VERSION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPolicyPriority() <em>Policy Priority</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyPriority()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String POLICY_PRIORITY_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPolicyPriority() <em>Policy Priority</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyPriority()
+	 * @generated
+	 * @ordered
+	 */
+	protected String policyPriority = POLICY_PRIORITY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPolicyScope() <em>Policy Scope</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyScope()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String POLICY_SCOPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPolicyScope() <em>Policy Scope</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPolicyScope()
+	 * @generated
+	 * @ordered
+	 */
+	protected String policyScope = POLICY_SCOPE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaePolicyEntityImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServicePackage.Literals.DCAE_POLICY_ENTITY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPolicyName() {
+		return policyName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPolicyName(String newPolicyName) {
+		String oldPolicyName = policyName;
+		policyName = newPolicyName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_POLICY_ENTITY__POLICY_NAME, oldPolicyName, policyName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPolicyDescription() {
+		return policyDescription;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPolicyDescription(String newPolicyDescription) {
+		String oldPolicyDescription = policyDescription;
+		policyDescription = newPolicyDescription;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_POLICY_ENTITY__POLICY_DESCRIPTION, oldPolicyDescription, policyDescription));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPolicyConfigName() {
+		return policyConfigName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPolicyConfigName(String newPolicyConfigName) {
+		String oldPolicyConfigName = policyConfigName;
+		policyConfigName = newPolicyConfigName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_POLICY_ENTITY__POLICY_CONFIG_NAME, oldPolicyConfigName, policyConfigName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPolicyTemplateVersion() {
+		return policyTemplateVersion;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPolicyTemplateVersion(String newPolicyTemplateVersion) {
+		String oldPolicyTemplateVersion = policyTemplateVersion;
+		policyTemplateVersion = newPolicyTemplateVersion;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_POLICY_ENTITY__POLICY_TEMPLATE_VERSION, oldPolicyTemplateVersion, policyTemplateVersion));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPolicyVersion() {
+		return policyVersion;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPolicyVersion(String newPolicyVersion) {
+		String oldPolicyVersion = policyVersion;
+		policyVersion = newPolicyVersion;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_POLICY_ENTITY__POLICY_VERSION, oldPolicyVersion, policyVersion));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPolicyPriority() {
+		return policyPriority;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPolicyPriority(String newPolicyPriority) {
+		String oldPolicyPriority = policyPriority;
+		policyPriority = newPolicyPriority;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_POLICY_ENTITY__POLICY_PRIORITY, oldPolicyPriority, policyPriority));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPolicyScope() {
+		return policyScope;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPolicyScope(String newPolicyScope) {
+		String oldPolicyScope = policyScope;
+		policyScope = newPolicyScope;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_POLICY_ENTITY__POLICY_SCOPE, oldPolicyScope, policyScope));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_NAME:
+				return getPolicyName();
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_DESCRIPTION:
+				return getPolicyDescription();
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_CONFIG_NAME:
+				return getPolicyConfigName();
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_TEMPLATE_VERSION:
+				return getPolicyTemplateVersion();
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_VERSION:
+				return getPolicyVersion();
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_PRIORITY:
+				return getPolicyPriority();
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_SCOPE:
+				return getPolicyScope();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_NAME:
+				setPolicyName((String)newValue);
+				return;
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_DESCRIPTION:
+				setPolicyDescription((String)newValue);
+				return;
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_CONFIG_NAME:
+				setPolicyConfigName((String)newValue);
+				return;
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_TEMPLATE_VERSION:
+				setPolicyTemplateVersion((String)newValue);
+				return;
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_VERSION:
+				setPolicyVersion((String)newValue);
+				return;
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_PRIORITY:
+				setPolicyPriority((String)newValue);
+				return;
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_SCOPE:
+				setPolicyScope((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_NAME:
+				setPolicyName(POLICY_NAME_EDEFAULT);
+				return;
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_DESCRIPTION:
+				setPolicyDescription(POLICY_DESCRIPTION_EDEFAULT);
+				return;
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_CONFIG_NAME:
+				setPolicyConfigName(POLICY_CONFIG_NAME_EDEFAULT);
+				return;
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_TEMPLATE_VERSION:
+				setPolicyTemplateVersion(POLICY_TEMPLATE_VERSION_EDEFAULT);
+				return;
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_VERSION:
+				setPolicyVersion(POLICY_VERSION_EDEFAULT);
+				return;
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_PRIORITY:
+				setPolicyPriority(POLICY_PRIORITY_EDEFAULT);
+				return;
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_SCOPE:
+				setPolicyScope(POLICY_SCOPE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_NAME:
+				return POLICY_NAME_EDEFAULT == null ? policyName != null : !POLICY_NAME_EDEFAULT.equals(policyName);
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_DESCRIPTION:
+				return POLICY_DESCRIPTION_EDEFAULT == null ? policyDescription != null : !POLICY_DESCRIPTION_EDEFAULT.equals(policyDescription);
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_CONFIG_NAME:
+				return POLICY_CONFIG_NAME_EDEFAULT == null ? policyConfigName != null : !POLICY_CONFIG_NAME_EDEFAULT.equals(policyConfigName);
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_TEMPLATE_VERSION:
+				return POLICY_TEMPLATE_VERSION_EDEFAULT == null ? policyTemplateVersion != null : !POLICY_TEMPLATE_VERSION_EDEFAULT.equals(policyTemplateVersion);
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_VERSION:
+				return POLICY_VERSION_EDEFAULT == null ? policyVersion != null : !POLICY_VERSION_EDEFAULT.equals(policyVersion);
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_PRIORITY:
+				return POLICY_PRIORITY_EDEFAULT == null ? policyPriority != null : !POLICY_PRIORITY_EDEFAULT.equals(policyPriority);
+			case ServicePackage.DCAE_POLICY_ENTITY__POLICY_SCOPE:
+				return POLICY_SCOPE_EDEFAULT == null ? policyScope != null : !POLICY_SCOPE_EDEFAULT.equals(policyScope);
+		}
+		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(" (policyName: ");
+		result.append(policyName);
+		result.append(", policyDescription: ");
+		result.append(policyDescription);
+		result.append(", policyConfigName: ");
+		result.append(policyConfigName);
+		result.append(", policyTemplateVersion: ");
+		result.append(policyTemplateVersion);
+		result.append(", policyVersion: ");
+		result.append(policyVersion);
+		result.append(", policyPriority: ");
+		result.append(policyPriority);
+		result.append(", policyScope: ");
+		result.append(policyScope);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DcaePolicyEntityImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeServiceContainerImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeServiceContainerImpl.java
new file mode 100644
index 0000000..fea898d
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeServiceContainerImpl.java
@@ -0,0 +1,181 @@
+
+/*-
+ * ============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.dcae.controller.core.service.impl;
+
+import org.openecomp.dcae.controller.core.service.DcaeServiceContainer;
+import org.openecomp.dcae.controller.core.service.DcaeServiceInstance;
+import org.openecomp.dcae.controller.core.service.ServicePackage;
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+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.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Service Container</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceContainerImpl#getInstances <em>Instances</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class DcaeServiceContainerImpl extends NamedEntityImpl implements DcaeServiceContainer {
+	/**
+	 * The cached value of the '{@link #getInstances() <em>Instances</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getInstances()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<DcaeServiceInstance> instances;
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeServiceContainerImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServicePackage.Literals.DCAE_SERVICE_CONTAINER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<DcaeServiceInstance> getInstances() {
+		if (instances == null) {
+			instances = new EObjectWithInverseResolvingEList<DcaeServiceInstance>(DcaeServiceInstance.class, this, ServicePackage.DCAE_SERVICE_CONTAINER__INSTANCES, ServicePackage.DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER);
+		}
+		return instances;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ServicePackage.DCAE_SERVICE_CONTAINER__INSTANCES:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getInstances()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ServicePackage.DCAE_SERVICE_CONTAINER__INSTANCES:
+				return ((InternalEList<?>)getInstances()).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 ServicePackage.DCAE_SERVICE_CONTAINER__INSTANCES:
+				return getInstances();
+		}
+		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 ServicePackage.DCAE_SERVICE_CONTAINER__INSTANCES:
+				getInstances().clear();
+				getInstances().addAll((Collection<? extends DcaeServiceInstance>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ServicePackage.DCAE_SERVICE_CONTAINER__INSTANCES:
+				getInstances().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ServicePackage.DCAE_SERVICE_CONTAINER__INSTANCES:
+				return instances != null && !instances.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //DcaeServiceContainerImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeServiceDescriptorImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeServiceDescriptorImpl.java
new file mode 100644
index 0000000..8ad411e
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeServiceDescriptorImpl.java
@@ -0,0 +1,293 @@
+
+/*-
+ * ============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.dcae.controller.core.service.impl;
+
+import org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor;
+import org.openecomp.dcae.controller.core.service.ServicePackage;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Service Descriptor</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceDescriptorImpl#getGroupId <em>Group Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceDescriptorImpl#getArtifact <em>Artifact</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceDescriptorImpl#getVersion <em>Version</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DcaeServiceDescriptorImpl extends NamedEntityImpl implements DcaeServiceDescriptor {
+	/**
+	 * The default value of the '{@link #getGroupId() <em>Group Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGroupId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String GROUP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getGroupId() <em>Group Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGroupId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String groupId = GROUP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getArtifact() <em>Artifact</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getArtifact()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ARTIFACT_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getArtifact() <em>Artifact</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getArtifact()
+	 * @generated
+	 * @ordered
+	 */
+	protected String artifact = ARTIFACT_EDEFAULT;
+
+	/**
+	 * 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;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeServiceDescriptorImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServicePackage.Literals.DCAE_SERVICE_DESCRIPTOR;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getGroupId() {
+		return groupId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setGroupId(String newGroupId) {
+		String oldGroupId = groupId;
+		groupId = newGroupId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_SERVICE_DESCRIPTOR__GROUP_ID, oldGroupId, groupId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getArtifact() {
+		return artifact;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setArtifact(String newArtifact) {
+		String oldArtifact = artifact;
+		artifact = newArtifact;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_SERVICE_DESCRIPTOR__ARTIFACT, oldArtifact, artifact));
+	}
+
+	/**
+	 * <!-- 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, ServicePackage.DCAE_SERVICE_DESCRIPTOR__VERSION, oldVersion, version));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR__GROUP_ID:
+				return getGroupId();
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR__ARTIFACT:
+				return getArtifact();
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR__VERSION:
+				return getVersion();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR__GROUP_ID:
+				setGroupId((String)newValue);
+				return;
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR__ARTIFACT:
+				setArtifact((String)newValue);
+				return;
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR__VERSION:
+				setVersion((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR__GROUP_ID:
+				setGroupId(GROUP_ID_EDEFAULT);
+				return;
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR__ARTIFACT:
+				setArtifact(ARTIFACT_EDEFAULT);
+				return;
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR__VERSION:
+				setVersion(VERSION_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR__GROUP_ID:
+				return GROUP_ID_EDEFAULT == null ? groupId != null : !GROUP_ID_EDEFAULT.equals(groupId);
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR__ARTIFACT:
+				return ARTIFACT_EDEFAULT == null ? artifact != null : !ARTIFACT_EDEFAULT.equals(artifact);
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR__VERSION:
+				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
+		}
+		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(" (groupId: ");
+		result.append(groupId);
+		result.append(", artifact: ");
+		result.append(artifact);
+		result.append(", version: ");
+		result.append(version);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DcaeServiceDescriptorImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeServiceImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeServiceImpl.java
new file mode 100644
index 0000000..2fc6b56
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeServiceImpl.java
@@ -0,0 +1,228 @@
+
+/*-
+ * ============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.dcae.controller.core.service.impl;
+
+import org.openecomp.dcae.controller.core.service.DcaeService;
+import org.openecomp.dcae.controller.core.service.HealthTestResponse;
+import org.openecomp.dcae.controller.core.service.ServicePackage;
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+import java.lang.reflect.InvocationTargetException;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.json.JSONObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Service</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class DcaeServiceImpl extends NamedEntityImpl implements DcaeService {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeServiceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServicePackage.Literals.DCAE_SERVICE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void deploy(String instanceName, String containerPath) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void undeploy(String instanceName) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public HealthTestResponse test(String instanceName) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void suspend(String instanceName) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void resume(String instanceName) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void pushManagerConfiguration(String instanceName) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void pollManagerConfiguration(String instanceName) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject managerConfiguration(String instanceName) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public JSONObject managerOperation(String instanceName, String operation, JSONObject parameters) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void updateConfigurationFromPolicy(String instanceName) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void runHealthTests() {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case ServicePackage.DCAE_SERVICE___DEPLOY__STRING_STRING:
+				deploy((String)arguments.get(0), (String)arguments.get(1));
+				return null;
+			case ServicePackage.DCAE_SERVICE___UNDEPLOY__STRING:
+				undeploy((String)arguments.get(0));
+				return null;
+			case ServicePackage.DCAE_SERVICE___TEST__STRING:
+				return test((String)arguments.get(0));
+			case ServicePackage.DCAE_SERVICE___SUSPEND__STRING:
+				suspend((String)arguments.get(0));
+				return null;
+			case ServicePackage.DCAE_SERVICE___RESUME__STRING:
+				resume((String)arguments.get(0));
+				return null;
+			case ServicePackage.DCAE_SERVICE___PUSH_MANAGER_CONFIGURATION__STRING:
+				pushManagerConfiguration((String)arguments.get(0));
+				return null;
+			case ServicePackage.DCAE_SERVICE___POLL_MANAGER_CONFIGURATION__STRING:
+				pollManagerConfiguration((String)arguments.get(0));
+				return null;
+			case ServicePackage.DCAE_SERVICE___MANAGER_CONFIGURATION__STRING:
+				return managerConfiguration((String)arguments.get(0));
+			case ServicePackage.DCAE_SERVICE___MANAGER_OPERATION__STRING_STRING_JSONOBJECT:
+				return managerOperation((String)arguments.get(0), (String)arguments.get(1), (JSONObject)arguments.get(2));
+			case ServicePackage.DCAE_SERVICE___UPDATE_CONFIGURATION_FROM_POLICY__STRING:
+				updateConfigurationFromPolicy((String)arguments.get(0));
+				return null;
+			case ServicePackage.DCAE_SERVICE___RUN_HEALTH_TESTS:
+				runHealthTests();
+				return null;
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+
+} //DcaeServiceImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeServiceInstanceImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeServiceInstanceImpl.java
new file mode 100644
index 0000000..ce2d06b
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/DcaeServiceInstanceImpl.java
@@ -0,0 +1,539 @@
+
+/*-
+ * ============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.dcae.controller.core.service.impl;
+
+import org.openecomp.dcae.controller.core.service.DcaeServiceContainer;
+import org.openecomp.dcae.controller.core.service.DcaeServiceInstance;
+import org.openecomp.dcae.controller.core.service.HealthTestStatus;
+import org.openecomp.dcae.controller.core.service.ServicePackage;
+import org.openecomp.dcae.controller.core.stream.DcaeStream;
+import org.openecomp.ncomp.core.DeploymentStatus;
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+import org.openecomp.ncomp.core.types.metrics.DateMetricAttribute;
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Service Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceInstanceImpl#getServiceContainer <em>Service Container</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceInstanceImpl#getStatus <em>Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceInstanceImpl#getInputStreams <em>Input Streams</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceInstanceImpl#getOutputStreams <em>Output Streams</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceInstanceImpl#getLastHealthTest <em>Last Health Test</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceInstanceImpl#getHealthTestStatus <em>Health Test Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.DcaeServiceInstanceImpl#getHealthTestMessageCode <em>Health Test Message Code</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class DcaeServiceInstanceImpl extends NamedEntityImpl implements DcaeServiceInstance {
+	/**
+	 * The cached value of the '{@link #getServiceContainer() <em>Service Container</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceContainer()
+	 * @generated
+	 * @ordered
+	 */
+	protected DcaeServiceContainer serviceContainer;
+
+	/**
+	 * The default value of the '{@link #getStatus() <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final DeploymentStatus STATUS_EDEFAULT = DeploymentStatus.UNDEPLOYED;
+
+	/**
+	 * The cached value of the '{@link #getStatus() <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected DeploymentStatus status = STATUS_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getInputStreams() <em>Input Streams</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getInputStreams()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<DcaeStream> inputStreams;
+
+	/**
+	 * The cached value of the '{@link #getOutputStreams() <em>Output Streams</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOutputStreams()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<DcaeStream> outputStreams;
+
+	/**
+	 * The default value of the '{@link #getLastHealthTest() <em>Last Health Test</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastHealthTest()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final DateMetricAttribute LAST_HEALTH_TEST_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLastHealthTest() <em>Last Health Test</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastHealthTest()
+	 * @generated
+	 * @ordered
+	 */
+	protected DateMetricAttribute lastHealthTest = LAST_HEALTH_TEST_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHealthTestStatus() <em>Health Test Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthTestStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final HealthTestStatus HEALTH_TEST_STATUS_EDEFAULT = HealthTestStatus.GREEN;
+
+	/**
+	 * The cached value of the '{@link #getHealthTestStatus() <em>Health Test Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthTestStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected HealthTestStatus healthTestStatus = HEALTH_TEST_STATUS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHealthTestMessageCode() <em>Health Test Message Code</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthTestMessageCode()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HEALTH_TEST_MESSAGE_CODE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHealthTestMessageCode() <em>Health Test Message Code</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthTestMessageCode()
+	 * @generated
+	 * @ordered
+	 */
+	protected String healthTestMessageCode = HEALTH_TEST_MESSAGE_CODE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeServiceInstanceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServicePackage.Literals.DCAE_SERVICE_INSTANCE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeServiceContainer getServiceContainer() {
+		if (serviceContainer != null && serviceContainer.eIsProxy()) {
+			InternalEObject oldServiceContainer = (InternalEObject)serviceContainer;
+			serviceContainer = (DcaeServiceContainer)eResolveProxy(oldServiceContainer);
+			if (serviceContainer != oldServiceContainer) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ServicePackage.DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER, oldServiceContainer, serviceContainer));
+			}
+		}
+		return serviceContainer;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeServiceContainer basicGetServiceContainer() {
+		return serviceContainer;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetServiceContainer(DcaeServiceContainer newServiceContainer, NotificationChain msgs) {
+		DcaeServiceContainer oldServiceContainer = serviceContainer;
+		serviceContainer = newServiceContainer;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER, oldServiceContainer, newServiceContainer);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServiceContainer(DcaeServiceContainer newServiceContainer) {
+		if (newServiceContainer != serviceContainer) {
+			NotificationChain msgs = null;
+			if (serviceContainer != null)
+				msgs = ((InternalEObject)serviceContainer).eInverseRemove(this, ServicePackage.DCAE_SERVICE_CONTAINER__INSTANCES, DcaeServiceContainer.class, msgs);
+			if (newServiceContainer != null)
+				msgs = ((InternalEObject)newServiceContainer).eInverseAdd(this, ServicePackage.DCAE_SERVICE_CONTAINER__INSTANCES, DcaeServiceContainer.class, msgs);
+			msgs = basicSetServiceContainer(newServiceContainer, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER, newServiceContainer, newServiceContainer));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DeploymentStatus getStatus() {
+		return status;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatus(DeploymentStatus newStatus) {
+		DeploymentStatus oldStatus = status;
+		status = newStatus == null ? STATUS_EDEFAULT : newStatus;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_SERVICE_INSTANCE__STATUS, oldStatus, status));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<DcaeStream> getInputStreams() {
+		if (inputStreams == null) {
+			inputStreams = new EObjectContainmentEList<DcaeStream>(DcaeStream.class, this, ServicePackage.DCAE_SERVICE_INSTANCE__INPUT_STREAMS);
+		}
+		return inputStreams;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<DcaeStream> getOutputStreams() {
+		if (outputStreams == null) {
+			outputStreams = new EObjectContainmentEList<DcaeStream>(DcaeStream.class, this, ServicePackage.DCAE_SERVICE_INSTANCE__OUTPUT_STREAMS);
+		}
+		return outputStreams;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DateMetricAttribute getLastHealthTest() {
+		return lastHealthTest;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLastHealthTest(DateMetricAttribute newLastHealthTest) {
+		DateMetricAttribute oldLastHealthTest = lastHealthTest;
+		lastHealthTest = newLastHealthTest;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_SERVICE_INSTANCE__LAST_HEALTH_TEST, oldLastHealthTest, lastHealthTest));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public HealthTestStatus getHealthTestStatus() {
+		return healthTestStatus;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHealthTestStatus(HealthTestStatus newHealthTestStatus) {
+		HealthTestStatus oldHealthTestStatus = healthTestStatus;
+		healthTestStatus = newHealthTestStatus == null ? HEALTH_TEST_STATUS_EDEFAULT : newHealthTestStatus;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_SERVICE_INSTANCE__HEALTH_TEST_STATUS, oldHealthTestStatus, healthTestStatus));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHealthTestMessageCode() {
+		return healthTestMessageCode;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHealthTestMessageCode(String newHealthTestMessageCode) {
+		String oldHealthTestMessageCode = healthTestMessageCode;
+		healthTestMessageCode = newHealthTestMessageCode;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.DCAE_SERVICE_INSTANCE__HEALTH_TEST_MESSAGE_CODE, oldHealthTestMessageCode, healthTestMessageCode));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ServicePackage.DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER:
+				if (serviceContainer != null)
+					msgs = ((InternalEObject)serviceContainer).eInverseRemove(this, ServicePackage.DCAE_SERVICE_CONTAINER__INSTANCES, DcaeServiceContainer.class, msgs);
+				return basicSetServiceContainer((DcaeServiceContainer)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ServicePackage.DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER:
+				return basicSetServiceContainer(null, msgs);
+			case ServicePackage.DCAE_SERVICE_INSTANCE__INPUT_STREAMS:
+				return ((InternalEList<?>)getInputStreams()).basicRemove(otherEnd, msgs);
+			case ServicePackage.DCAE_SERVICE_INSTANCE__OUTPUT_STREAMS:
+				return ((InternalEList<?>)getOutputStreams()).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 ServicePackage.DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER:
+				if (resolve) return getServiceContainer();
+				return basicGetServiceContainer();
+			case ServicePackage.DCAE_SERVICE_INSTANCE__STATUS:
+				return getStatus();
+			case ServicePackage.DCAE_SERVICE_INSTANCE__INPUT_STREAMS:
+				return getInputStreams();
+			case ServicePackage.DCAE_SERVICE_INSTANCE__OUTPUT_STREAMS:
+				return getOutputStreams();
+			case ServicePackage.DCAE_SERVICE_INSTANCE__LAST_HEALTH_TEST:
+				return getLastHealthTest();
+			case ServicePackage.DCAE_SERVICE_INSTANCE__HEALTH_TEST_STATUS:
+				return getHealthTestStatus();
+			case ServicePackage.DCAE_SERVICE_INSTANCE__HEALTH_TEST_MESSAGE_CODE:
+				return getHealthTestMessageCode();
+		}
+		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 ServicePackage.DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER:
+				setServiceContainer((DcaeServiceContainer)newValue);
+				return;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__STATUS:
+				setStatus((DeploymentStatus)newValue);
+				return;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__INPUT_STREAMS:
+				getInputStreams().clear();
+				getInputStreams().addAll((Collection<? extends DcaeStream>)newValue);
+				return;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__OUTPUT_STREAMS:
+				getOutputStreams().clear();
+				getOutputStreams().addAll((Collection<? extends DcaeStream>)newValue);
+				return;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__LAST_HEALTH_TEST:
+				setLastHealthTest((DateMetricAttribute)newValue);
+				return;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__HEALTH_TEST_STATUS:
+				setHealthTestStatus((HealthTestStatus)newValue);
+				return;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__HEALTH_TEST_MESSAGE_CODE:
+				setHealthTestMessageCode((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ServicePackage.DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER:
+				setServiceContainer((DcaeServiceContainer)null);
+				return;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__STATUS:
+				setStatus(STATUS_EDEFAULT);
+				return;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__INPUT_STREAMS:
+				getInputStreams().clear();
+				return;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__OUTPUT_STREAMS:
+				getOutputStreams().clear();
+				return;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__LAST_HEALTH_TEST:
+				setLastHealthTest(LAST_HEALTH_TEST_EDEFAULT);
+				return;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__HEALTH_TEST_STATUS:
+				setHealthTestStatus(HEALTH_TEST_STATUS_EDEFAULT);
+				return;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__HEALTH_TEST_MESSAGE_CODE:
+				setHealthTestMessageCode(HEALTH_TEST_MESSAGE_CODE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ServicePackage.DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER:
+				return serviceContainer != null;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__STATUS:
+				return status != STATUS_EDEFAULT;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__INPUT_STREAMS:
+				return inputStreams != null && !inputStreams.isEmpty();
+			case ServicePackage.DCAE_SERVICE_INSTANCE__OUTPUT_STREAMS:
+				return outputStreams != null && !outputStreams.isEmpty();
+			case ServicePackage.DCAE_SERVICE_INSTANCE__LAST_HEALTH_TEST:
+				return LAST_HEALTH_TEST_EDEFAULT == null ? lastHealthTest != null : !LAST_HEALTH_TEST_EDEFAULT.equals(lastHealthTest);
+			case ServicePackage.DCAE_SERVICE_INSTANCE__HEALTH_TEST_STATUS:
+				return healthTestStatus != HEALTH_TEST_STATUS_EDEFAULT;
+			case ServicePackage.DCAE_SERVICE_INSTANCE__HEALTH_TEST_MESSAGE_CODE:
+				return HEALTH_TEST_MESSAGE_CODE_EDEFAULT == null ? healthTestMessageCode != null : !HEALTH_TEST_MESSAGE_CODE_EDEFAULT.equals(healthTestMessageCode);
+		}
+		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(" (status: ");
+		result.append(status);
+		result.append(", lastHealthTest: ");
+		result.append(lastHealthTest);
+		result.append(", healthTestStatus: ");
+		result.append(healthTestStatus);
+		result.append(", healthTestMessageCode: ");
+		result.append(healthTestMessageCode);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DcaeServiceInstanceImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/HealthTestResponseImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/HealthTestResponseImpl.java
new file mode 100644
index 0000000..70b646c
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/HealthTestResponseImpl.java
@@ -0,0 +1,239 @@
+
+/*-
+ * ============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.dcae.controller.core.service.impl;
+
+import org.openecomp.dcae.controller.core.service.HealthTestResponse;
+import org.openecomp.dcae.controller.core.service.HealthTestStatus;
+import org.openecomp.dcae.controller.core.service.ServicePackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Healt Test Response</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.HealthTestResponseImpl#getStatus <em>Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.service.impl.HealthTestResponseImpl#getMessageCode <em>Message Code</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class HealthTestResponseImpl extends MinimalEObjectImpl.Container implements HealthTestResponse {
+	/**
+	 * The default value of the '{@link #getStatus() <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final HealthTestStatus STATUS_EDEFAULT = HealthTestStatus.GREEN;
+
+	/**
+	 * The cached value of the '{@link #getStatus() <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected HealthTestStatus status = STATUS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMessageCode() <em>Message Code</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMessageCode()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String MESSAGE_CODE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getMessageCode() <em>Message Code</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMessageCode()
+	 * @generated
+	 * @ordered
+	 */
+	protected String messageCode = MESSAGE_CODE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected HealthTestResponseImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ServicePackage.Literals.HEALTH_TEST_RESPONSE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public HealthTestStatus getStatus() {
+		return status;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatus(HealthTestStatus newStatus) {
+		HealthTestStatus oldStatus = status;
+		status = newStatus == null ? STATUS_EDEFAULT : newStatus;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.HEALTH_TEST_RESPONSE__STATUS, oldStatus, status));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getMessageCode() {
+		return messageCode;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMessageCode(String newMessageCode) {
+		String oldMessageCode = messageCode;
+		messageCode = newMessageCode;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.HEALTH_TEST_RESPONSE__MESSAGE_CODE, oldMessageCode, messageCode));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ServicePackage.HEALTH_TEST_RESPONSE__STATUS:
+				return getStatus();
+			case ServicePackage.HEALTH_TEST_RESPONSE__MESSAGE_CODE:
+				return getMessageCode();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ServicePackage.HEALTH_TEST_RESPONSE__STATUS:
+				setStatus((HealthTestStatus)newValue);
+				return;
+			case ServicePackage.HEALTH_TEST_RESPONSE__MESSAGE_CODE:
+				setMessageCode((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ServicePackage.HEALTH_TEST_RESPONSE__STATUS:
+				setStatus(STATUS_EDEFAULT);
+				return;
+			case ServicePackage.HEALTH_TEST_RESPONSE__MESSAGE_CODE:
+				setMessageCode(MESSAGE_CODE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ServicePackage.HEALTH_TEST_RESPONSE__STATUS:
+				return status != STATUS_EDEFAULT;
+			case ServicePackage.HEALTH_TEST_RESPONSE__MESSAGE_CODE:
+				return MESSAGE_CODE_EDEFAULT == null ? messageCode != null : !MESSAGE_CODE_EDEFAULT.equals(messageCode);
+		}
+		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(" (status: ");
+		result.append(status);
+		result.append(", messageCode: ");
+		result.append(messageCode);
+		result.append(')');
+		return result.toString();
+	}
+
+} //HealtTestResponseImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/ServiceFactoryImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/ServiceFactoryImpl.java
new file mode 100644
index 0000000..0b0ce9e
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/ServiceFactoryImpl.java
@@ -0,0 +1,189 @@
+
+/*-
+ * ============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.dcae.controller.core.service.impl;
+
+import org.openecomp.dcae.controller.core.service.*;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ServiceFactoryImpl extends EFactoryImpl implements ServiceFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static ServiceFactory init() {
+		try {
+			ServiceFactory theServiceFactory = (ServiceFactory)EPackage.Registry.INSTANCE.getEFactory(ServicePackage.eNS_URI);
+			if (theServiceFactory != null) {
+				return theServiceFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new ServiceFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServiceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case ServicePackage.DCAE_LOCATION: return createDcaeLocation();
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR: return createDcaeServiceDescriptor();
+			case ServicePackage.HEALTH_TEST_RESPONSE: return createHealthTestResponse();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+			case ServicePackage.HEALTH_TEST_STATUS:
+				return createHealthTestStatusFromString(eDataType, initialValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+			case ServicePackage.HEALTH_TEST_STATUS:
+				return convertHealthTestStatusToString(eDataType, instanceValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeLocation createDcaeLocation() {
+		DcaeLocationImpl dcaeLocation = new DcaeLocationImpl();
+		return dcaeLocation;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeServiceDescriptor createDcaeServiceDescriptor() {
+		DcaeServiceDescriptorImpl dcaeServiceDescriptor = new DcaeServiceDescriptorImpl();
+		return dcaeServiceDescriptor;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public HealthTestResponse createHealthTestResponse() {
+		HealthTestResponseImpl healthTestResponse = new HealthTestResponseImpl();
+		return healthTestResponse;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public HealthTestStatus createHealthTestStatusFromString(EDataType eDataType, String initialValue) {
+		HealthTestStatus result = HealthTestStatus.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertHealthTestStatusToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServicePackage getServicePackage() {
+		return (ServicePackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static ServicePackage getPackage() {
+		return ServicePackage.eINSTANCE;
+	}
+
+} //ServiceFactoryImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/ServicePackageImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/ServicePackageImpl.java
new file mode 100644
index 0000000..f3bc7f0
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/impl/ServicePackageImpl.java
@@ -0,0 +1,857 @@
+
+/*-
+ * ============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.dcae.controller.core.service.impl;
+
+import org.openecomp.dcae.controller.core.service.DcaeLocation;
+import org.openecomp.dcae.controller.core.service.DcaePolicyEntity;
+import org.openecomp.dcae.controller.core.service.DcaeService;
+import org.openecomp.dcae.controller.core.service.DcaeServiceContainer;
+import org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor;
+import org.openecomp.dcae.controller.core.service.DcaeServiceInstance;
+import org.openecomp.dcae.controller.core.service.HealthTestResponse;
+import org.openecomp.dcae.controller.core.service.HealthTestStatus;
+import org.openecomp.dcae.controller.core.service.ServiceFactory;
+import org.openecomp.dcae.controller.core.service.ServicePackage;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+import org.openecomp.ncomp.core.CorePackage;
+import org.openecomp.ncomp.openstack.location.LocationPackage;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+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.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeServiceEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeServiceContainerEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeServiceInstanceEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeLocationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeServiceDescriptorEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass healthTestResponseEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaePolicyEntityEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum healthTestStatusEEnum = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.openecomp.dcae.controller.core.service.ServicePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private ServicePackageImpl() {
+		super(eNS_URI, ServiceFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link ServicePackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static ServicePackage init() {
+		if (isInited) return (ServicePackage)EPackage.Registry.INSTANCE.getEPackage(ServicePackage.eNS_URI);
+
+		// Obtain or create and register package
+		ServicePackageImpl theServicePackage = (ServicePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ServicePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ServicePackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		LocationPackage.eINSTANCE.eClass();
+		StreamPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theServicePackage.createPackageContents();
+
+		// Initialize created meta-data
+		theServicePackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theServicePackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(ServicePackage.eNS_URI, theServicePackage);
+		return theServicePackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeService() {
+		return dcaeServiceEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeService__Deploy__String_String() {
+		return dcaeServiceEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeService__Undeploy__String() {
+		return dcaeServiceEClass.getEOperations().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeService__Test__String() {
+		return dcaeServiceEClass.getEOperations().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeService__Suspend__String() {
+		return dcaeServiceEClass.getEOperations().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeService__Resume__String() {
+		return dcaeServiceEClass.getEOperations().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeService__PushManagerConfiguration__String() {
+		return dcaeServiceEClass.getEOperations().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeService__PollManagerConfiguration__String() {
+		return dcaeServiceEClass.getEOperations().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeService__ManagerConfiguration__String() {
+		return dcaeServiceEClass.getEOperations().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeService__ManagerOperation__String_String_JSONObject() {
+		return dcaeServiceEClass.getEOperations().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeService__UpdateConfigurationFromPolicy__String() {
+		return dcaeServiceEClass.getEOperations().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getDcaeService__RunHealthTests() {
+		return dcaeServiceEClass.getEOperations().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeServiceContainer() {
+		return dcaeServiceContainerEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeServiceContainer_Instances() {
+		return (EReference)dcaeServiceContainerEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeServiceInstance() {
+		return dcaeServiceInstanceEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeServiceInstance_ServiceContainer() {
+		return (EReference)dcaeServiceInstanceEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeServiceInstance_Status() {
+		return (EAttribute)dcaeServiceInstanceEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeServiceInstance_InputStreams() {
+		return (EReference)dcaeServiceInstanceEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeServiceInstance_OutputStreams() {
+		return (EReference)dcaeServiceInstanceEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeServiceInstance_LastHealthTest() {
+		return (EAttribute)dcaeServiceInstanceEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeServiceInstance_HealthTestStatus() {
+		return (EAttribute)dcaeServiceInstanceEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeServiceInstance_HealthTestMessageCode() {
+		return (EAttribute)dcaeServiceInstanceEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeLocation() {
+		return dcaeLocationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeLocation_LocationType() {
+		return (EAttribute)dcaeLocationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeLocation_OpenstackProject() {
+		return (EReference)dcaeLocationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeServiceDescriptor() {
+		return dcaeServiceDescriptorEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeServiceDescriptor_GroupId() {
+		return (EAttribute)dcaeServiceDescriptorEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeServiceDescriptor_Artifact() {
+		return (EAttribute)dcaeServiceDescriptorEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeServiceDescriptor_Version() {
+		return (EAttribute)dcaeServiceDescriptorEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getHealthTestResponse() {
+		return healthTestResponseEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getHealthTestResponse_Status() {
+		return (EAttribute)healthTestResponseEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getHealthTestResponse_MessageCode() {
+		return (EAttribute)healthTestResponseEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaePolicyEntity() {
+		return dcaePolicyEntityEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaePolicyEntity_PolicyName() {
+		return (EAttribute)dcaePolicyEntityEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaePolicyEntity_PolicyDescription() {
+		return (EAttribute)dcaePolicyEntityEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaePolicyEntity_PolicyConfigName() {
+		return (EAttribute)dcaePolicyEntityEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaePolicyEntity_PolicyTemplateVersion() {
+		return (EAttribute)dcaePolicyEntityEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaePolicyEntity_PolicyVersion() {
+		return (EAttribute)dcaePolicyEntityEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaePolicyEntity_PolicyPriority() {
+		return (EAttribute)dcaePolicyEntityEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaePolicyEntity_PolicyScope() {
+		return (EAttribute)dcaePolicyEntityEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EEnum getHealthTestStatus() {
+		return healthTestStatusEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServiceFactory getServiceFactory() {
+		return (ServiceFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		dcaeServiceContainerEClass = createEClass(DCAE_SERVICE_CONTAINER);
+		createEReference(dcaeServiceContainerEClass, DCAE_SERVICE_CONTAINER__INSTANCES);
+
+		dcaeServiceEClass = createEClass(DCAE_SERVICE);
+		createEOperation(dcaeServiceEClass, DCAE_SERVICE___DEPLOY__STRING_STRING);
+		createEOperation(dcaeServiceEClass, DCAE_SERVICE___UNDEPLOY__STRING);
+		createEOperation(dcaeServiceEClass, DCAE_SERVICE___TEST__STRING);
+		createEOperation(dcaeServiceEClass, DCAE_SERVICE___SUSPEND__STRING);
+		createEOperation(dcaeServiceEClass, DCAE_SERVICE___RESUME__STRING);
+		createEOperation(dcaeServiceEClass, DCAE_SERVICE___PUSH_MANAGER_CONFIGURATION__STRING);
+		createEOperation(dcaeServiceEClass, DCAE_SERVICE___POLL_MANAGER_CONFIGURATION__STRING);
+		createEOperation(dcaeServiceEClass, DCAE_SERVICE___MANAGER_CONFIGURATION__STRING);
+		createEOperation(dcaeServiceEClass, DCAE_SERVICE___MANAGER_OPERATION__STRING_STRING_JSONOBJECT);
+		createEOperation(dcaeServiceEClass, DCAE_SERVICE___UPDATE_CONFIGURATION_FROM_POLICY__STRING);
+		createEOperation(dcaeServiceEClass, DCAE_SERVICE___RUN_HEALTH_TESTS);
+
+		dcaeServiceInstanceEClass = createEClass(DCAE_SERVICE_INSTANCE);
+		createEReference(dcaeServiceInstanceEClass, DCAE_SERVICE_INSTANCE__SERVICE_CONTAINER);
+		createEAttribute(dcaeServiceInstanceEClass, DCAE_SERVICE_INSTANCE__STATUS);
+		createEReference(dcaeServiceInstanceEClass, DCAE_SERVICE_INSTANCE__INPUT_STREAMS);
+		createEReference(dcaeServiceInstanceEClass, DCAE_SERVICE_INSTANCE__OUTPUT_STREAMS);
+		createEAttribute(dcaeServiceInstanceEClass, DCAE_SERVICE_INSTANCE__LAST_HEALTH_TEST);
+		createEAttribute(dcaeServiceInstanceEClass, DCAE_SERVICE_INSTANCE__HEALTH_TEST_STATUS);
+		createEAttribute(dcaeServiceInstanceEClass, DCAE_SERVICE_INSTANCE__HEALTH_TEST_MESSAGE_CODE);
+
+		dcaeLocationEClass = createEClass(DCAE_LOCATION);
+		createEAttribute(dcaeLocationEClass, DCAE_LOCATION__LOCATION_TYPE);
+		createEReference(dcaeLocationEClass, DCAE_LOCATION__OPENSTACK_PROJECT);
+
+		dcaeServiceDescriptorEClass = createEClass(DCAE_SERVICE_DESCRIPTOR);
+		createEAttribute(dcaeServiceDescriptorEClass, DCAE_SERVICE_DESCRIPTOR__GROUP_ID);
+		createEAttribute(dcaeServiceDescriptorEClass, DCAE_SERVICE_DESCRIPTOR__ARTIFACT);
+		createEAttribute(dcaeServiceDescriptorEClass, DCAE_SERVICE_DESCRIPTOR__VERSION);
+
+		healthTestResponseEClass = createEClass(HEALTH_TEST_RESPONSE);
+		createEAttribute(healthTestResponseEClass, HEALTH_TEST_RESPONSE__STATUS);
+		createEAttribute(healthTestResponseEClass, HEALTH_TEST_RESPONSE__MESSAGE_CODE);
+
+		dcaePolicyEntityEClass = createEClass(DCAE_POLICY_ENTITY);
+		createEAttribute(dcaePolicyEntityEClass, DCAE_POLICY_ENTITY__POLICY_NAME);
+		createEAttribute(dcaePolicyEntityEClass, DCAE_POLICY_ENTITY__POLICY_DESCRIPTION);
+		createEAttribute(dcaePolicyEntityEClass, DCAE_POLICY_ENTITY__POLICY_CONFIG_NAME);
+		createEAttribute(dcaePolicyEntityEClass, DCAE_POLICY_ENTITY__POLICY_TEMPLATE_VERSION);
+		createEAttribute(dcaePolicyEntityEClass, DCAE_POLICY_ENTITY__POLICY_VERSION);
+		createEAttribute(dcaePolicyEntityEClass, DCAE_POLICY_ENTITY__POLICY_PRIORITY);
+		createEAttribute(dcaePolicyEntityEClass, DCAE_POLICY_ENTITY__POLICY_SCOPE);
+
+		// Create enums
+		healthTestStatusEEnum = createEEnum(HEALTH_TEST_STATUS);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		CorePackage theCorePackage = (CorePackage)EPackage.Registry.INSTANCE.getEPackage(CorePackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		StreamPackage theStreamPackage = (StreamPackage)EPackage.Registry.INSTANCE.getEPackage(StreamPackage.eNS_URI);
+		LocationPackage theLocationPackage = (LocationPackage)EPackage.Registry.INSTANCE.getEPackage(LocationPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		dcaeServiceContainerEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		dcaeServiceEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		dcaeServiceInstanceEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		dcaeLocationEClass.getESuperTypes().add(this.getDcaeServiceContainer());
+		dcaeServiceDescriptorEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(dcaeServiceContainerEClass, DcaeServiceContainer.class, "DcaeServiceContainer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getDcaeServiceContainer_Instances(), this.getDcaeServiceInstance(), this.getDcaeServiceInstance_ServiceContainer(), "instances", null, 0, -1, DcaeServiceContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(dcaeServiceEClass, DcaeService.class, "DcaeService", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		EOperation op = initEOperation(getDcaeService__Deploy__String_String(), null, "deploy", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "instanceName", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "containerPath", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		op = initEOperation(getDcaeService__Undeploy__String(), null, "undeploy", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "instanceName", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		op = initEOperation(getDcaeService__Test__String(), this.getHealthTestResponse(), "test", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "instanceName", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		op = initEOperation(getDcaeService__Suspend__String(), null, "suspend", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "instanceName", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		op = initEOperation(getDcaeService__Resume__String(), null, "resume", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "instanceName", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		op = initEOperation(getDcaeService__PushManagerConfiguration__String(), null, "pushManagerConfiguration", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "instanceName", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		op = initEOperation(getDcaeService__PollManagerConfiguration__String(), null, "pollManagerConfiguration", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "instanceName", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		op = initEOperation(getDcaeService__ManagerConfiguration__String(), theEcorePackage.getEObject(), "managerConfiguration", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "instanceName", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		op = initEOperation(getDcaeService__ManagerOperation__String_String_JSONObject(), theCorePackage.getJsonObject(), "managerOperation", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "instanceName", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "operation", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theCorePackage.getJsonObject(), "parameters", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		op = initEOperation(getDcaeService__UpdateConfigurationFromPolicy__String(), null, "updateConfigurationFromPolicy", 0, 1, !IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, theEcorePackage.getEString(), "instanceName", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		initEOperation(getDcaeService__RunHealthTests(), null, "runHealthTests", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
+		initEClass(dcaeServiceInstanceEClass, DcaeServiceInstance.class, "DcaeServiceInstance", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getDcaeServiceInstance_ServiceContainer(), this.getDcaeServiceContainer(), this.getDcaeServiceContainer_Instances(), "serviceContainer", null, 0, 1, DcaeServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeServiceInstance_Status(), theCorePackage.getDeploymentStatus(), "status", null, 0, 1, DcaeServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDcaeServiceInstance_InputStreams(), theStreamPackage.getDcaeStream(), null, "inputStreams", null, 0, -1, DcaeServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDcaeServiceInstance_OutputStreams(), theStreamPackage.getDcaeStream(), null, "outputStreams", null, 0, -1, DcaeServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeServiceInstance_LastHealthTest(), theCorePackage.getDateMetricAttribute(), "lastHealthTest", null, 0, 1, DcaeServiceInstance.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeServiceInstance_HealthTestStatus(), this.getHealthTestStatus(), "healthTestStatus", null, 0, 1, DcaeServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeServiceInstance_HealthTestMessageCode(), theEcorePackage.getEString(), "healthTestMessageCode", null, 0, 1, DcaeServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(dcaeLocationEClass, DcaeLocation.class, "DcaeLocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDcaeLocation_LocationType(), theEcorePackage.getEString(), "locationType", null, 0, 1, DcaeLocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDcaeLocation_OpenstackProject(), theLocationPackage.getOpenStackProject(), null, "openstackProject", null, 0, 1, DcaeLocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(dcaeServiceDescriptorEClass, DcaeServiceDescriptor.class, "DcaeServiceDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDcaeServiceDescriptor_GroupId(), theEcorePackage.getEString(), "groupId", null, 0, 1, DcaeServiceDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeServiceDescriptor_Artifact(), theEcorePackage.getEString(), "artifact", null, 0, 1, DcaeServiceDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeServiceDescriptor_Version(), theEcorePackage.getEString(), "version", null, 0, 1, DcaeServiceDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(healthTestResponseEClass, HealthTestResponse.class, "HealthTestResponse", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getHealthTestResponse_Status(), this.getHealthTestStatus(), "status", null, 0, 1, HealthTestResponse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getHealthTestResponse_MessageCode(), theEcorePackage.getEString(), "messageCode", null, 0, 1, HealthTestResponse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(dcaePolicyEntityEClass, DcaePolicyEntity.class, "DcaePolicyEntity", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDcaePolicyEntity_PolicyName(), theEcorePackage.getEString(), "policyName", null, 0, 1, DcaePolicyEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaePolicyEntity_PolicyDescription(), theEcorePackage.getEString(), "policyDescription", null, 0, 1, DcaePolicyEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaePolicyEntity_PolicyConfigName(), theEcorePackage.getEString(), "policyConfigName", null, 0, 1, DcaePolicyEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaePolicyEntity_PolicyTemplateVersion(), theEcorePackage.getEString(), "policyTemplateVersion", null, 0, 1, DcaePolicyEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaePolicyEntity_PolicyVersion(), theEcorePackage.getEString(), "policyVersion", null, 0, 1, DcaePolicyEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaePolicyEntity_PolicyPriority(), theEcorePackage.getEString(), "policyPriority", null, 0, 1, DcaePolicyEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaePolicyEntity_PolicyScope(), theEcorePackage.getEString(), "policyScope", null, 0, 1, DcaePolicyEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Initialize enums and add enum literals
+		initEEnum(healthTestStatusEEnum, HealthTestStatus.class, "HealthTestStatus");
+		addEEnumLiteral(healthTestStatusEEnum, HealthTestStatus.GREEN);
+		addEEnumLiteral(healthTestStatusEEnum, HealthTestStatus.YELLOW);
+		addEEnumLiteral(healthTestStatusEEnum, HealthTestStatus.RED);
+
+		// Create resource
+		createResource(eNS_URI);
+
+		// Create annotations
+		// http://www.eclipse.org/emf/2011/Xcore
+		createXcoreAnnotations();
+		// http://openecomp.org
+		createEcompAnnotations();
+		// http://openecomp.org/cdap
+		createCdapAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2011/Xcore</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createXcoreAnnotations() {
+		String source = "http://www.eclipse.org/emf/2011/Xcore";	
+		addAnnotation
+		  (this, 
+		   source, 
+		   new String[] {
+			 "ecomp", "http://openecomp.org",
+			 "cdap", "http://openecomp.org/cdap"
+		   });
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://openecomp.org</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createEcompAnnotations() {
+		String source = "http://openecomp.org";	
+		addAnnotation
+		  (getDcaeServiceInstance_ServiceContainer(), 
+		   source, 
+		   new String[] {
+			 "type", "operational"
+		   });	
+		addAnnotation
+		  (getDcaeServiceInstance_Status(), 
+		   source, 
+		   new String[] {
+			 "type", "operational"
+		   });	
+		addAnnotation
+		  (getDcaeServiceInstance_InputStreams(), 
+		   source, 
+		   new String[] {
+			 "type", "service"
+		   });	
+		addAnnotation
+		  (getDcaeServiceInstance_OutputStreams(), 
+		   source, 
+		   new String[] {
+			 "type", "service"
+		   });
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://openecomp.org/cdap</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createCdapAnnotations() {
+		String source = "http://openecomp.org/cdap";	
+		addAnnotation
+		  (getDcaePolicyEntity_PolicyName(), 
+		   source, 
+		   new String[] {
+			 "destination", "namespace-prefs::${path}.policyName"
+		   });	
+		addAnnotation
+		  (getDcaePolicyEntity_PolicyDescription(), 
+		   source, 
+		   new String[] {
+			 "destination", "namespace-prefs::${path}.policyDescription"
+		   });	
+		addAnnotation
+		  (getDcaePolicyEntity_PolicyConfigName(), 
+		   source, 
+		   new String[] {
+			 "destination", "namespace-prefs::${path}.policyConfigName"
+		   });	
+		addAnnotation
+		  (getDcaePolicyEntity_PolicyTemplateVersion(), 
+		   source, 
+		   new String[] {
+			 "destination", "namespace-prefs::${path}.policyTemplateVersion"
+		   });	
+		addAnnotation
+		  (getDcaePolicyEntity_PolicyVersion(), 
+		   source, 
+		   new String[] {
+			 "destination", "namespace-prefs::${path}.policyVersion"
+		   });	
+		addAnnotation
+		  (getDcaePolicyEntity_PolicyPriority(), 
+		   source, 
+		   new String[] {
+			 "destination", "namespace-prefs::${path}.policyPriority"
+		   });	
+		addAnnotation
+		  (getDcaePolicyEntity_PolicyScope(), 
+		   source, 
+		   new String[] {
+			 "destination", "namespace-prefs::${path}.policyScope"
+		   });
+	}
+
+} //ServicePackageImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/util/ServiceAdapterFactory.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/util/ServiceAdapterFactory.java
new file mode 100644
index 0000000..be5e923
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/util/ServiceAdapterFactory.java
@@ -0,0 +1,269 @@
+
+/*-
+ * ============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.dcae.controller.core.service.util;
+
+import org.openecomp.dcae.controller.core.service.*;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.service.ServicePackage
+ * @generated
+ */
+public class ServiceAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ServicePackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServiceAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = ServicePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ServiceSwitch<Adapter> modelSwitch =
+		new ServiceSwitch<Adapter>() {
+			@Override
+			public Adapter caseDcaeServiceContainer(DcaeServiceContainer object) {
+				return createDcaeServiceContainerAdapter();
+			}
+			@Override
+			public Adapter caseDcaeService(DcaeService object) {
+				return createDcaeServiceAdapter();
+			}
+			@Override
+			public Adapter caseDcaeServiceInstance(DcaeServiceInstance object) {
+				return createDcaeServiceInstanceAdapter();
+			}
+			@Override
+			public Adapter caseDcaeLocation(DcaeLocation object) {
+				return createDcaeLocationAdapter();
+			}
+			@Override
+			public Adapter caseDcaeServiceDescriptor(DcaeServiceDescriptor object) {
+				return createDcaeServiceDescriptorAdapter();
+			}
+			@Override
+			public Adapter caseHealthTestResponse(HealthTestResponse object) {
+				return createHealthTestResponseAdapter();
+			}
+			@Override
+			public Adapter caseDcaePolicyEntity(DcaePolicyEntity object) {
+				return createDcaePolicyEntityAdapter();
+			}
+			@Override
+			public Adapter caseNamedEntity(NamedEntity object) {
+				return createNamedEntityAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.service.DcaeService <em>Dcae Service</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.dcae.controller.core.service.DcaeService
+	 * @generated
+	 */
+	public Adapter createDcaeServiceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.service.DcaeServiceContainer <em>Dcae Service Container</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.dcae.controller.core.service.DcaeServiceContainer
+	 * @generated
+	 */
+	public Adapter createDcaeServiceContainerAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.service.DcaeServiceInstance <em>Dcae Service Instance</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.dcae.controller.core.service.DcaeServiceInstance
+	 * @generated
+	 */
+	public Adapter createDcaeServiceInstanceAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.service.DcaeLocation <em>Dcae Location</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.dcae.controller.core.service.DcaeLocation
+	 * @generated
+	 */
+	public Adapter createDcaeLocationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor <em>Dcae Service Descriptor</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.dcae.controller.core.service.DcaeServiceDescriptor
+	 * @generated
+	 */
+	public Adapter createDcaeServiceDescriptorAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.service.HealthTestResponse <em>Health Test Response</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.dcae.controller.core.service.HealthTestResponse
+	 * @generated
+	 */
+	public Adapter createHealthTestResponseAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.service.DcaePolicyEntity <em>Dcae Policy 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.dcae.controller.core.service.DcaePolicyEntity
+	 * @generated
+	 */
+	public Adapter createDcaePolicyEntityAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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 the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //ServiceAdapterFactory
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/util/ServiceSwitch.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/util/ServiceSwitch.java
new file mode 100644
index 0000000..3845664
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/service/util/ServiceSwitch.java
@@ -0,0 +1,280 @@
+
+/*-
+ * ============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.dcae.controller.core.service.util;
+
+import org.openecomp.dcae.controller.core.service.*;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.service.ServicePackage
+ * @generated
+ */
+public class ServiceSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ServicePackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ServiceSwitch() {
+		if (modelPackage == null) {
+			modelPackage = ServicePackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @parameter ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case ServicePackage.DCAE_SERVICE_CONTAINER: {
+				DcaeServiceContainer dcaeServiceContainer = (DcaeServiceContainer)theEObject;
+				T result = caseDcaeServiceContainer(dcaeServiceContainer);
+				if (result == null) result = caseNamedEntity(dcaeServiceContainer);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ServicePackage.DCAE_SERVICE: {
+				DcaeService dcaeService = (DcaeService)theEObject;
+				T result = caseDcaeService(dcaeService);
+				if (result == null) result = caseNamedEntity(dcaeService);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ServicePackage.DCAE_SERVICE_INSTANCE: {
+				DcaeServiceInstance dcaeServiceInstance = (DcaeServiceInstance)theEObject;
+				T result = caseDcaeServiceInstance(dcaeServiceInstance);
+				if (result == null) result = caseNamedEntity(dcaeServiceInstance);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ServicePackage.DCAE_LOCATION: {
+				DcaeLocation dcaeLocation = (DcaeLocation)theEObject;
+				T result = caseDcaeLocation(dcaeLocation);
+				if (result == null) result = caseDcaeServiceContainer(dcaeLocation);
+				if (result == null) result = caseNamedEntity(dcaeLocation);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ServicePackage.DCAE_SERVICE_DESCRIPTOR: {
+				DcaeServiceDescriptor dcaeServiceDescriptor = (DcaeServiceDescriptor)theEObject;
+				T result = caseDcaeServiceDescriptor(dcaeServiceDescriptor);
+				if (result == null) result = caseNamedEntity(dcaeServiceDescriptor);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ServicePackage.HEALTH_TEST_RESPONSE: {
+				HealthTestResponse healthTestResponse = (HealthTestResponse)theEObject;
+				T result = caseHealthTestResponse(healthTestResponse);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ServicePackage.DCAE_POLICY_ENTITY: {
+				DcaePolicyEntity dcaePolicyEntity = (DcaePolicyEntity)theEObject;
+				T result = caseDcaePolicyEntity(dcaePolicyEntity);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Service</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>Dcae Service</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeService(DcaeService object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Service Container</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>Dcae Service Container</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeServiceContainer(DcaeServiceContainer object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Service Instance</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>Dcae Service Instance</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeServiceInstance(DcaeServiceInstance object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Location</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>Dcae Location</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeLocation(DcaeLocation object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Service Descriptor</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>Dcae Service Descriptor</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeServiceDescriptor(DcaeServiceDescriptor object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Health Test Response</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>Health Test Response</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseHealthTestResponse(HealthTestResponse object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Policy 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>Dcae Policy Entity</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaePolicyEntity(DcaePolicyEntity object) {
+		return null;
+	}
+
+	/**
+	 * 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>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //ServiceSwitch
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusDataRouterNode.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusDataRouterNode.java
new file mode 100644
index 0000000..eab989b
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusDataRouterNode.java
@@ -0,0 +1,124 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Databus Data Router Node</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode#getDcaeLocationName <em>Dcae Location Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode#getHostFqdn <em>Host Fqdn</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode#getVersion <em>Version</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusDataRouterNode()
+ * @model
+ * @generated
+ */
+public interface DatabusDataRouterNode extends DatabusEntity {
+
+	/**
+	 * Returns the value of the '<em><b>Dcae Location Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dcae Location Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dcae Location Name</em>' attribute.
+	 * @see #setDcaeLocationName(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusDataRouterNode_DcaeLocationName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDcaeLocationName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode#getDcaeLocationName <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dcae Location Name</em>' attribute.
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 */
+	void setDcaeLocationName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Host Fqdn</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Host Fqdn</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Host Fqdn</em>' attribute.
+	 * @see #setHostFqdn(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusDataRouterNode_HostFqdn()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getHostFqdn();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode#getHostFqdn <em>Host Fqdn</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Host Fqdn</em>' attribute.
+	 * @see #getHostFqdn()
+	 * @generated
+	 */
+	void setHostFqdn(String value);
+
+	/**
+	 * 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.dcae.controller.core.stream.StreamPackage#getDatabusDataRouterNode_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode#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);
+} // DatabusDataRouterNode
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusEntity.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusEntity.java
new file mode 100644
index 0000000..0047458
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusEntity.java
@@ -0,0 +1,126 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.openecomp.ncomp.core.NamedEntity;
+import java.util.Date;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Databus Entity</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusEntity#getStatus <em>Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusEntity#getLastModified <em>Last Modified</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusEntity#getType <em>Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusEntity()
+ * @model
+ * @generated
+ */
+public interface DatabusEntity extends NamedEntity {
+	/**
+	 * Returns the value of the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Status</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Status</em>' attribute.
+	 * @see #setStatus(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusEntity_Status()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getStatus();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusEntity#getStatus <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Status</em>' attribute.
+	 * @see #getStatus()
+	 * @generated
+	 */
+	void setStatus(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Last Modified</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Last Modified</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Last Modified</em>' attribute.
+	 * @see #setLastModified(Date)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusEntity_LastModified()
+	 * @model unique="false"
+	 * @generated
+	 */
+	Date getLastModified();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusEntity#getLastModified <em>Last Modified</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Last Modified</em>' attribute.
+	 * @see #getLastModified()
+	 * @generated
+	 */
+	void setLastModified(Date value);
+
+	/**
+	 * Returns the value of the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Type</em>' attribute.
+	 * @see #setType(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusEntity_Type()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getType();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusEntity#getType <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Type</em>' attribute.
+	 * @see #getType()
+	 * @generated
+	 */
+	void setType(String value);
+
+} // DatabusEntity
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusLocation.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusLocation.java
new file mode 100644
index 0000000..a4aee6b
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusLocation.java
@@ -0,0 +1,70 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Databus Location</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusLocation#getDcaeLayer <em>Dcae Layer</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusLocation()
+ * @model
+ * @generated
+ */
+public interface DatabusLocation extends DatabusEntity {
+
+	/**
+	 * Returns the value of the '<em><b>Dcae Layer</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dcae Layer</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dcae Layer</em>' attribute.
+	 * @see #setDcaeLayer(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusLocation_DcaeLayer()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDcaeLayer();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusLocation#getDcaeLayer <em>Dcae Layer</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dcae Layer</em>' attribute.
+	 * @see #getDcaeLayer()
+	 * @generated
+	 */
+	void setDcaeLayer(String value);
+} // DatabusLocation
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusMessageRouterCluster.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusMessageRouterCluster.java
new file mode 100644
index 0000000..d176b17
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusMessageRouterCluster.java
@@ -0,0 +1,169 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Databus Message Router Cluster</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getDcaeLocationName <em>Dcae Location Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getServiceFqdn <em>Service Fqdn</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getHostFqdn <em>Host Fqdn</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getTopicPort <em>Topic Port</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getTopicProtocol <em>Topic Protocol</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusMessageRouterCluster()
+ * @model
+ * @generated
+ */
+public interface DatabusMessageRouterCluster extends DatabusEntity {
+
+	/**
+	 * Returns the value of the '<em><b>Dcae Location Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dcae Location Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dcae Location Name</em>' attribute.
+	 * @see #setDcaeLocationName(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusMessageRouterCluster_DcaeLocationName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDcaeLocationName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getDcaeLocationName <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dcae Location Name</em>' attribute.
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 */
+	void setDcaeLocationName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Service Fqdn</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service Fqdn</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Service Fqdn</em>' attribute.
+	 * @see #setServiceFqdn(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusMessageRouterCluster_ServiceFqdn()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getServiceFqdn();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getServiceFqdn <em>Service Fqdn</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service Fqdn</em>' attribute.
+	 * @see #getServiceFqdn()
+	 * @generated
+	 */
+	void setServiceFqdn(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Host Fqdn</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Host Fqdn</em>' attribute list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Host Fqdn</em>' attribute list.
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusMessageRouterCluster_HostFqdn()
+	 * @model unique="false"
+	 * @generated
+	 */
+	EList<String> getHostFqdn();
+
+	/**
+	 * Returns the value of the '<em><b>Topic Port</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Topic Port</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Topic Port</em>' attribute.
+	 * @see #setTopicPort(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusMessageRouterCluster_TopicPort()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getTopicPort();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getTopicPort <em>Topic Port</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Topic Port</em>' attribute.
+	 * @see #getTopicPort()
+	 * @generated
+	 */
+	void setTopicPort(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Topic Protocol</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Topic Protocol</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Topic Protocol</em>' attribute.
+	 * @see #setTopicProtocol(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusMessageRouterCluster_TopicProtocol()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getTopicProtocol();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getTopicProtocol <em>Topic Protocol</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Topic Protocol</em>' attribute.
+	 * @see #getTopicProtocol()
+	 * @generated
+	 */
+	void setTopicProtocol(String value);
+} // DatabusMessageRouterCluster
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStream.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStream.java
new file mode 100644
index 0000000..4252099
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStream.java
@@ -0,0 +1,39 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Databus Stream</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStream()
+ * @model abstract="true"
+ * @generated
+ */
+public interface DatabusStream extends NamedEntity {
+} // DatabusStream
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamFeed.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamFeed.java
new file mode 100644
index 0000000..910a0f8
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamFeed.java
@@ -0,0 +1,376 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.eclipse.emf.common.util.EList;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Databus Stream Feed</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedName <em>Feed Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedVersion <em>Feed Version</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedDescription <em>Feed Description</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getAsprClassification <em>Aspr Classification</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedId <em>Feed Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getLogURL <em>Log URL</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getPublishURL <em>Publish URL</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getSubscribeURL <em>Subscribe URL</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getStatus <em>Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getSuspended <em>Suspended</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getPublishers <em>Publishers</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getSubscribers <em>Subscribers</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed()
+ * @model
+ * @generated
+ */
+public interface DatabusStreamFeed extends DatabusStream {
+
+	/**
+	 * Returns the value of the '<em><b>Feed Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Feed Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Feed Name</em>' attribute.
+	 * @see #setFeedName(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed_FeedName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getFeedName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedName <em>Feed Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Feed Name</em>' attribute.
+	 * @see #getFeedName()
+	 * @generated
+	 */
+	void setFeedName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Feed Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Feed 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>Feed Version</em>' attribute.
+	 * @see #setFeedVersion(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed_FeedVersion()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getFeedVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedVersion <em>Feed Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Feed Version</em>' attribute.
+	 * @see #getFeedVersion()
+	 * @generated
+	 */
+	void setFeedVersion(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Feed Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Feed Description</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Feed Description</em>' attribute.
+	 * @see #setFeedDescription(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed_FeedDescription()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getFeedDescription();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedDescription <em>Feed Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Feed Description</em>' attribute.
+	 * @see #getFeedDescription()
+	 * @generated
+	 */
+	void setFeedDescription(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Aspr Classification</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Aspr Classification</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Aspr Classification</em>' attribute.
+	 * @see #setAsprClassification(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed_AsprClassification()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAsprClassification();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getAsprClassification <em>Aspr Classification</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Aspr Classification</em>' attribute.
+	 * @see #getAsprClassification()
+	 * @generated
+	 */
+	void setAsprClassification(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Owner</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Owner</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Owner</em>' attribute.
+	 * @see #setOwner(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed_Owner()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getOwner();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getOwner <em>Owner</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owner</em>' attribute.
+	 * @see #getOwner()
+	 * @generated
+	 */
+	void setOwner(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Feed Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Feed Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Feed Id</em>' attribute.
+	 * @see #setFeedId(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed_FeedId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getFeedId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedId <em>Feed Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Feed Id</em>' attribute.
+	 * @see #getFeedId()
+	 * @generated
+	 */
+	void setFeedId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Log URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Log URL</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Log URL</em>' attribute.
+	 * @see #setLogURL(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed_LogURL()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getLogURL();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getLogURL <em>Log URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Log URL</em>' attribute.
+	 * @see #getLogURL()
+	 * @generated
+	 */
+	void setLogURL(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Publish URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Publish URL</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Publish URL</em>' attribute.
+	 * @see #setPublishURL(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed_PublishURL()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getPublishURL();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getPublishURL <em>Publish URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Publish URL</em>' attribute.
+	 * @see #getPublishURL()
+	 * @generated
+	 */
+	void setPublishURL(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Subscribe URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Subscribe URL</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Subscribe URL</em>' attribute.
+	 * @see #setSubscribeURL(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed_SubscribeURL()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getSubscribeURL();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getSubscribeURL <em>Subscribe URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Subscribe URL</em>' attribute.
+	 * @see #getSubscribeURL()
+	 * @generated
+	 */
+	void setSubscribeURL(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Status</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Status</em>' attribute.
+	 * @see #setStatus(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed_Status()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getStatus();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getStatus <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Status</em>' attribute.
+	 * @see #getStatus()
+	 * @generated
+	 */
+	void setStatus(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Suspended</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Suspended</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Suspended</em>' attribute.
+	 * @see #setSuspended(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed_Suspended()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getSuspended();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getSuspended <em>Suspended</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Suspended</em>' attribute.
+	 * @see #getSuspended()
+	 * @generated
+	 */
+	void setSuspended(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Publishers</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Publishers</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>Publishers</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed_Publishers()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<DatabusStreamFeedPublisher> getPublishers();
+
+	/**
+	 * Returns the value of the '<em><b>Subscribers</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Subscribers</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>Subscribers</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeed_Subscribers()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<DatabusStreamFeedSubscriber> getSubscribers();
+} // DatabusStreamFeed
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamFeedPublisher.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamFeedPublisher.java
new file mode 100644
index 0000000..9513cfc
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamFeedPublisher.java
@@ -0,0 +1,233 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Databus Stream Feed Publisher</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getLocalStreamId <em>Local Stream Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getDcaeLocationName <em>Dcae Location Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getFeedId <em>Feed Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getPubId <em>Pub Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getStatus <em>Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getUsername <em>Username</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getUserpwd <em>Userpwd</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedPublisher()
+ * @model
+ * @generated
+ */
+public interface DatabusStreamFeedPublisher extends NamedEntity {
+	/**
+	 * Returns the value of the '<em><b>Local Stream Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Local Stream Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Local Stream Id</em>' attribute.
+	 * @see #setLocalStreamId(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedPublisher_LocalStreamId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getLocalStreamId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getLocalStreamId <em>Local Stream Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Stream Id</em>' attribute.
+	 * @see #getLocalStreamId()
+	 * @generated
+	 */
+	void setLocalStreamId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dcae Location Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dcae Location Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dcae Location Name</em>' attribute.
+	 * @see #setDcaeLocationName(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedPublisher_DcaeLocationName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDcaeLocationName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getDcaeLocationName <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dcae Location Name</em>' attribute.
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 */
+	void setDcaeLocationName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Feed Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Feed Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Feed Id</em>' attribute.
+	 * @see #setFeedId(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedPublisher_FeedId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getFeedId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getFeedId <em>Feed Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Feed Id</em>' attribute.
+	 * @see #getFeedId()
+	 * @generated
+	 */
+	void setFeedId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Pub Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Pub Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Pub Id</em>' attribute.
+	 * @see #setPubId(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedPublisher_PubId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getPubId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getPubId <em>Pub Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Pub Id</em>' attribute.
+	 * @see #getPubId()
+	 * @generated
+	 */
+	void setPubId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Status</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Status</em>' attribute.
+	 * @see #setStatus(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedPublisher_Status()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getStatus();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getStatus <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Status</em>' attribute.
+	 * @see #getStatus()
+	 * @generated
+	 */
+	void setStatus(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Username</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Username</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Username</em>' attribute.
+	 * @see #setUsername(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedPublisher_Username()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getUsername();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getUsername <em>Username</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Username</em>' attribute.
+	 * @see #getUsername()
+	 * @generated
+	 */
+	void setUsername(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Userpwd</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Userpwd</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Userpwd</em>' attribute.
+	 * @see #setUserpwd(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedPublisher_Userpwd()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getUserpwd();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getUserpwd <em>Userpwd</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Userpwd</em>' attribute.
+	 * @see #getUserpwd()
+	 * @generated
+	 */
+	void setUserpwd(String value);
+
+} // DatabusStreamFeedPublisher
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamFeedSubscriber.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamFeedSubscriber.java
new file mode 100644
index 0000000..b9b37d1
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamFeedSubscriber.java
@@ -0,0 +1,368 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Databus Stream Feed Subscriber</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getLocalStreamId <em>Local Stream Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getDcaeLocationName <em>Dcae Location Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getOtherFeedName <em>Other Feed Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getFeedId <em>Feed Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getLogURL <em>Log URL</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getSubId <em>Sub Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#isSuspended <em>Suspended</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#isUse100 <em>Use100</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getUsername <em>Username</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getUserpwd <em>Userpwd</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getDeliveryURL <em>Delivery URL</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedSubscriber()
+ * @model
+ * @generated
+ */
+public interface DatabusStreamFeedSubscriber extends NamedEntity {
+	/**
+	 * Returns the value of the '<em><b>Local Stream Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Local Stream Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Local Stream Id</em>' attribute.
+	 * @see #setLocalStreamId(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedSubscriber_LocalStreamId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getLocalStreamId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getLocalStreamId <em>Local Stream Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Stream Id</em>' attribute.
+	 * @see #getLocalStreamId()
+	 * @generated
+	 */
+	void setLocalStreamId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dcae Location Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dcae Location Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dcae Location Name</em>' attribute.
+	 * @see #setDcaeLocationName(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedSubscriber_DcaeLocationName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDcaeLocationName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getDcaeLocationName <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dcae Location Name</em>' attribute.
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 */
+	void setDcaeLocationName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Other Feed Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Other Feed Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Other Feed Name</em>' attribute.
+	 * @see #setOtherFeedName(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedSubscriber_OtherFeedName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getOtherFeedName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getOtherFeedName <em>Other Feed Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Other Feed Name</em>' attribute.
+	 * @see #getOtherFeedName()
+	 * @generated
+	 */
+	void setOtherFeedName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Feed Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Feed Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Feed Id</em>' attribute.
+	 * @see #setFeedId(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedSubscriber_FeedId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getFeedId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getFeedId <em>Feed Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Feed Id</em>' attribute.
+	 * @see #getFeedId()
+	 * @generated
+	 */
+	void setFeedId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Log URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Log URL</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Log URL</em>' attribute.
+	 * @see #setLogURL(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedSubscriber_LogURL()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getLogURL();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getLogURL <em>Log URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Log URL</em>' attribute.
+	 * @see #getLogURL()
+	 * @generated
+	 */
+	void setLogURL(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Owner</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Owner</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Owner</em>' attribute.
+	 * @see #setOwner(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedSubscriber_Owner()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getOwner();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getOwner <em>Owner</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owner</em>' attribute.
+	 * @see #getOwner()
+	 * @generated
+	 */
+	void setOwner(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Sub Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Sub Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Sub Id</em>' attribute.
+	 * @see #setSubId(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedSubscriber_SubId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getSubId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getSubId <em>Sub Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Sub Id</em>' attribute.
+	 * @see #getSubId()
+	 * @generated
+	 */
+	void setSubId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Suspended</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Suspended</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Suspended</em>' attribute.
+	 * @see #setSuspended(boolean)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedSubscriber_Suspended()
+	 * @model unique="false"
+	 * @generated
+	 */
+	boolean isSuspended();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#isSuspended <em>Suspended</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Suspended</em>' attribute.
+	 * @see #isSuspended()
+	 * @generated
+	 */
+	void setSuspended(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Use100</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Use100</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Use100</em>' attribute.
+	 * @see #setUse100(boolean)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedSubscriber_Use100()
+	 * @model unique="false"
+	 * @generated
+	 */
+	boolean isUse100();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#isUse100 <em>Use100</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Use100</em>' attribute.
+	 * @see #isUse100()
+	 * @generated
+	 */
+	void setUse100(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Username</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Username</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Username</em>' attribute.
+	 * @see #setUsername(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedSubscriber_Username()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getUsername();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getUsername <em>Username</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Username</em>' attribute.
+	 * @see #getUsername()
+	 * @generated
+	 */
+	void setUsername(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Userpwd</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Userpwd</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Userpwd</em>' attribute.
+	 * @see #setUserpwd(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedSubscriber_Userpwd()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getUserpwd();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getUserpwd <em>Userpwd</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Userpwd</em>' attribute.
+	 * @see #getUserpwd()
+	 * @generated
+	 */
+	void setUserpwd(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Delivery URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Delivery URL</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Delivery URL</em>' attribute.
+	 * @see #setDeliveryURL(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamFeedSubscriber_DeliveryURL()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDeliveryURL();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getDeliveryURL <em>Delivery URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Delivery URL</em>' attribute.
+	 * @see #getDeliveryURL()
+	 * @generated
+	 */
+	void setDeliveryURL(String value);
+
+} // DatabusStreamFeedSubscriber
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamTopic.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamTopic.java
new file mode 100644
index 0000000..7fab2f2
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamTopic.java
@@ -0,0 +1,363 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import java.util.Date;
+import org.eclipse.emf.common.util.EList;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Databus Stream Topic</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getTopicName <em>Topic Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getTopicDescription <em>Topic Description</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getDcaeLocationName <em>Dcae Location Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#isTxenabled <em>Txenabled</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getFqtn <em>Fqtn</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getLastMod <em>Last Mod</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getStatus <em>Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getClients <em>Clients</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getPublishURL <em>Publish URL</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getSubscribeURL <em>Subscribe URL</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getAuthenticationMethod <em>Authentication Method</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopic()
+ * @model
+ * @generated
+ */
+public interface DatabusStreamTopic extends DatabusStream {
+
+	/**
+	 * Returns the value of the '<em><b>Topic Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Topic Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Topic Name</em>' attribute.
+	 * @see #setTopicName(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopic_TopicName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getTopicName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getTopicName <em>Topic Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Topic Name</em>' attribute.
+	 * @see #getTopicName()
+	 * @generated
+	 */
+	void setTopicName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Topic Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Topic Description</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Topic Description</em>' attribute.
+	 * @see #setTopicDescription(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopic_TopicDescription()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getTopicDescription();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getTopicDescription <em>Topic Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Topic Description</em>' attribute.
+	 * @see #getTopicDescription()
+	 * @generated
+	 */
+	void setTopicDescription(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dcae Location Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dcae Location Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dcae Location Name</em>' attribute.
+	 * @see #setDcaeLocationName(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopic_DcaeLocationName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDcaeLocationName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getDcaeLocationName <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dcae Location Name</em>' attribute.
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 */
+	void setDcaeLocationName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Owner</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Owner</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Owner</em>' attribute.
+	 * @see #setOwner(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopic_Owner()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getOwner();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getOwner <em>Owner</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owner</em>' attribute.
+	 * @see #getOwner()
+	 * @generated
+	 */
+	void setOwner(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Txenabled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Txenabled</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Txenabled</em>' attribute.
+	 * @see #setTxenabled(boolean)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopic_Txenabled()
+	 * @model unique="false"
+	 * @generated
+	 */
+	boolean isTxenabled();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#isTxenabled <em>Txenabled</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Txenabled</em>' attribute.
+	 * @see #isTxenabled()
+	 * @generated
+	 */
+	void setTxenabled(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Fqtn</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Fqtn</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Fqtn</em>' attribute.
+	 * @see #setFqtn(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopic_Fqtn()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getFqtn();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getFqtn <em>Fqtn</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Fqtn</em>' attribute.
+	 * @see #getFqtn()
+	 * @generated
+	 */
+	void setFqtn(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Last Mod</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Last Mod</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Last Mod</em>' attribute.
+	 * @see #setLastMod(Date)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopic_LastMod()
+	 * @model unique="false"
+	 * @generated
+	 */
+	Date getLastMod();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getLastMod <em>Last Mod</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Last Mod</em>' attribute.
+	 * @see #getLastMod()
+	 * @generated
+	 */
+	void setLastMod(Date value);
+
+	/**
+	 * Returns the value of the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Status</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Status</em>' attribute.
+	 * @see #setStatus(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopic_Status()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getStatus();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getStatus <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Status</em>' attribute.
+	 * @see #getStatus()
+	 * @generated
+	 */
+	void setStatus(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Clients</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Clients</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>Clients</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopic_Clients()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<DatabusStreamTopicClient> getClients();
+
+	/**
+	 * Returns the value of the '<em><b>Publish URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Publish URL</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Publish URL</em>' attribute.
+	 * @see #setPublishURL(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopic_PublishURL()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getPublishURL();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getPublishURL <em>Publish URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Publish URL</em>' attribute.
+	 * @see #getPublishURL()
+	 * @generated
+	 */
+	void setPublishURL(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Subscribe URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Subscribe URL</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Subscribe URL</em>' attribute.
+	 * @see #setSubscribeURL(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopic_SubscribeURL()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getSubscribeURL();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getSubscribeURL <em>Subscribe URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Subscribe URL</em>' attribute.
+	 * @see #getSubscribeURL()
+	 * @generated
+	 */
+	void setSubscribeURL(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Authentication Method</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.openecomp.dcae.controller.core.stream.StreamAuthentication}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Authentication Method</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Authentication Method</em>' attribute.
+	 * @see org.openecomp.dcae.controller.core.stream.StreamAuthentication
+	 * @see #setAuthenticationMethod(StreamAuthentication)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopic_AuthenticationMethod()
+	 * @model unique="false"
+	 * @generated
+	 */
+	StreamAuthentication getAuthenticationMethod();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getAuthenticationMethod <em>Authentication Method</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Authentication Method</em>' attribute.
+	 * @see org.openecomp.dcae.controller.core.stream.StreamAuthentication
+	 * @see #getAuthenticationMethod()
+	 * @generated
+	 */
+	void setAuthenticationMethod(StreamAuthentication value);
+} // DatabusStreamTopic
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamTopicAction.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamTopicAction.java
new file mode 100644
index 0000000..313e19e
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamTopicAction.java
@@ -0,0 +1,254 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Databus Stream Topic Action</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopicAction()
+ * @model
+ * @generated
+ */
+public enum DatabusStreamTopicAction implements Enumerator {
+	/**
+	 * The '<em><b>PUB</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #PUB_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	PUB(0, "PUB", "pub"),
+
+	/**
+	 * The '<em><b>SUB</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #SUB_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	SUB(0, "SUB", "sub"),
+
+	/**
+	 * The '<em><b>VIEW</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #VIEW_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	VIEW(0, "VIEW", "view");
+
+	/**
+	 * The '<em><b>PUB</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>PUB</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #PUB
+	 * @model literal="pub"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int PUB_VALUE = 0;
+
+	/**
+	 * The '<em><b>SUB</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>SUB</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #SUB
+	 * @model literal="sub"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int SUB_VALUE = 0;
+
+	/**
+	 * The '<em><b>VIEW</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>VIEW</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #VIEW
+	 * @model literal="view"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int VIEW_VALUE = 0;
+
+	/**
+	 * An array of all the '<em><b>Databus Stream Topic Action</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final DatabusStreamTopicAction[] VALUES_ARRAY =
+		new DatabusStreamTopicAction[] {
+			PUB,
+			SUB,
+			VIEW,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Databus Stream Topic Action</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<DatabusStreamTopicAction> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Databus Stream Topic Action</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static DatabusStreamTopicAction get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			DatabusStreamTopicAction result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Databus Stream Topic Action</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static DatabusStreamTopicAction getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			DatabusStreamTopicAction result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Databus Stream Topic Action</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static DatabusStreamTopicAction get(int value) {
+		switch (value) {
+			case PUB_VALUE: return PUB;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private DatabusStreamTopicAction(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //DatabusStreamTopicAction
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamTopicClient.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamTopicClient.java
new file mode 100644
index 0000000..21b7e59
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DatabusStreamTopicClient.java
@@ -0,0 +1,279 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Databus Stream Topic Client</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getLocalStreamId <em>Local Stream Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getDcaeLocationName <em>Dcae Location Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getClientRole <em>Client Role</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getAction <em>Action</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getUsername <em>Username</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getUserpwd <em>Userpwd</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getFqtn <em>Fqtn</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getMrClientId <em>Mr Client Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getTopicURL <em>Topic URL</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopicClient()
+ * @model
+ * @generated
+ */
+public interface DatabusStreamTopicClient extends DatabusStream {
+	/**
+	 * Returns the value of the '<em><b>Local Stream Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Local Stream Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Local Stream Id</em>' attribute.
+	 * @see #setLocalStreamId(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopicClient_LocalStreamId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getLocalStreamId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getLocalStreamId <em>Local Stream Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Stream Id</em>' attribute.
+	 * @see #getLocalStreamId()
+	 * @generated
+	 */
+	void setLocalStreamId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dcae Location Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dcae Location Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dcae Location Name</em>' attribute.
+	 * @see #setDcaeLocationName(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopicClient_DcaeLocationName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDcaeLocationName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getDcaeLocationName <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dcae Location Name</em>' attribute.
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 */
+	void setDcaeLocationName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Client Role</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Client Role</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Client Role</em>' attribute.
+	 * @see #setClientRole(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopicClient_ClientRole()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getClientRole();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getClientRole <em>Client Role</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Client Role</em>' attribute.
+	 * @see #getClientRole()
+	 * @generated
+	 */
+	void setClientRole(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Action</b></em>' attribute list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicAction}.
+	 * The literals are from the enumeration {@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicAction}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Action</em>' attribute list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Action</em>' attribute list.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicAction
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopicClient_Action()
+	 * @model unique="false"
+	 * @generated
+	 */
+	EList<DatabusStreamTopicAction> getAction();
+
+	/**
+	 * Returns the value of the '<em><b>Username</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Username</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Username</em>' attribute.
+	 * @see #setUsername(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopicClient_Username()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getUsername();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getUsername <em>Username</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Username</em>' attribute.
+	 * @see #getUsername()
+	 * @generated
+	 */
+	void setUsername(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Userpwd</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Userpwd</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Userpwd</em>' attribute.
+	 * @see #setUserpwd(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopicClient_Userpwd()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getUserpwd();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getUserpwd <em>Userpwd</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Userpwd</em>' attribute.
+	 * @see #getUserpwd()
+	 * @generated
+	 */
+	void setUserpwd(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Fqtn</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Fqtn</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Fqtn</em>' attribute.
+	 * @see #setFqtn(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopicClient_Fqtn()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getFqtn();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getFqtn <em>Fqtn</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Fqtn</em>' attribute.
+	 * @see #getFqtn()
+	 * @generated
+	 */
+	void setFqtn(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Mr Client Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Mr Client Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Mr Client Id</em>' attribute.
+	 * @see #setMrClientId(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopicClient_MrClientId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getMrClientId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getMrClientId <em>Mr Client Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Mr Client Id</em>' attribute.
+	 * @see #getMrClientId()
+	 * @generated
+	 */
+	void setMrClientId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Topic URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Topic URL</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Topic URL</em>' attribute.
+	 * @see #setTopicURL(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDatabusStreamTopicClient_TopicURL()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getTopicURL();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getTopicURL <em>Topic URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Topic URL</em>' attribute.
+	 * @see #getTopicURL()
+	 * @generated
+	 */
+	void setTopicURL(String value);
+
+} // DatabusStreamTopicClient
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStream.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStream.java
new file mode 100644
index 0000000..dadb69b
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStream.java
@@ -0,0 +1,39 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Stream</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStream()
+ * @model
+ * @generated
+ */
+public interface DcaeStream extends NamedEntity {
+} // DcaeStream
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamDefinition.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamDefinition.java
new file mode 100644
index 0000000..24e4702
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamDefinition.java
@@ -0,0 +1,133 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.openecomp.ncomp.core.NamedEntity;
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Stream Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getStreamType <em>Stream Type</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getDatabusType <em>Databus Type</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getPublishers <em>Publishers</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getSubscribers <em>Subscribers</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamDefinition()
+ * @model
+ * @generated
+ */
+public interface DcaeStreamDefinition extends NamedEntity {
+	/**
+	 * Returns the value of the '<em><b>Stream Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Stream Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Stream Type</em>' attribute.
+	 * @see #setStreamType(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamDefinition_StreamType()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getStreamType();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getStreamType <em>Stream Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Stream Type</em>' attribute.
+	 * @see #getStreamType()
+	 * @generated
+	 */
+	void setStreamType(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Databus Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Databus Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Databus Type</em>' attribute.
+	 * @see #setDatabusType(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamDefinition_DatabusType()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDatabusType();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getDatabusType <em>Databus Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Databus Type</em>' attribute.
+	 * @see #getDatabusType()
+	 * @generated
+	 */
+	void setDatabusType(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Publishers</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.core.stream.DcaeStreamPublisher}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Publishers</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>Publishers</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamDefinition_Publishers()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<DcaeStreamPublisher> getPublishers();
+
+	/**
+	 * Returns the value of the '<em><b>Subscribers</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriber}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Subscribers</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>Subscribers</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamDefinition_Subscribers()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<DcaeStreamSubscriber> getSubscribers();
+
+} // DcaeStreamDefinition
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamExternalEndPoint.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamExternalEndPoint.java
new file mode 100644
index 0000000..b8e9ab3
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamExternalEndPoint.java
@@ -0,0 +1,125 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Stream External End Point</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint#getUser <em>User</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint#getPassword <em>Password</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint#getUrl <em>Url</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamExternalEndPoint()
+ * @model
+ * @generated
+ */
+public interface DcaeStreamExternalEndPoint extends EObject {
+	/**
+	 * Returns the value of the '<em><b>User</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>User</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>User</em>' attribute.
+	 * @see #setUser(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamExternalEndPoint_User()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getUser();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint#getUser <em>User</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>User</em>' attribute.
+	 * @see #getUser()
+	 * @generated
+	 */
+	void setUser(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Password</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Password</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Password</em>' attribute.
+	 * @see #setPassword(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamExternalEndPoint_Password()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getPassword();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint#getPassword <em>Password</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Password</em>' attribute.
+	 * @see #getPassword()
+	 * @generated
+	 */
+	void setPassword(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Url</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Url</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Url</em>' attribute.
+	 * @see #setUrl(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamExternalEndPoint_Url()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getUrl();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint#getUrl <em>Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Url</em>' attribute.
+	 * @see #getUrl()
+	 * @generated
+	 */
+	void setUrl(String value);
+
+} // DcaeStreamExternalEndPoint
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamInternalEndPoint.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamInternalEndPoint.java
new file mode 100644
index 0000000..0fc65fe
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamInternalEndPoint.java
@@ -0,0 +1,98 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Stream Internal End Point</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint#getLocalName <em>Local Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint#getServiceName <em>Service Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamInternalEndPoint()
+ * @model
+ * @generated
+ */
+public interface DcaeStreamInternalEndPoint extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Local Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Local Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Local Name</em>' attribute.
+	 * @see #setLocalName(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamInternalEndPoint_LocalName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getLocalName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint#getLocalName <em>Local Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Name</em>' attribute.
+	 * @see #getLocalName()
+	 * @generated
+	 */
+	void setLocalName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Service Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Service Name</em>' attribute.
+	 * @see #setServiceName(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamInternalEndPoint_ServiceName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getServiceName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint#getServiceName <em>Service Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service Name</em>' attribute.
+	 * @see #getServiceName()
+	 * @generated
+	 */
+	void setServiceName(String value);
+
+} // DcaeStreamInternalEndPoint
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamPublisher.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamPublisher.java
new file mode 100644
index 0000000..10e70d7
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamPublisher.java
@@ -0,0 +1,39 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Stream Publisher</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamPublisher()
+ * @model abstract="true"
+ * @generated
+ */
+public interface DcaeStreamPublisher extends NamedEntity {
+} // DcaeStreamPublisher
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamPublisherExternal.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamPublisherExternal.java
new file mode 100644
index 0000000..b4a71a6
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamPublisherExternal.java
@@ -0,0 +1,38 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Stream Publisher External</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamPublisherExternal()
+ * @model
+ * @generated
+ */
+public interface DcaeStreamPublisherExternal extends DcaeStreamPublisher, DcaeStreamExternalEndPoint {
+} // DcaeStreamPublisherExternal
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamPublisherInternal.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamPublisherInternal.java
new file mode 100644
index 0000000..6821ded
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamPublisherInternal.java
@@ -0,0 +1,38 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Stream Publisher Internal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamPublisherInternal()
+ * @model
+ * @generated
+ */
+public interface DcaeStreamPublisherInternal extends DcaeStreamPublisher, DcaeStreamInternalEndPoint {
+} // DcaeStreamPublisherInternal
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamSubscriber.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamSubscriber.java
new file mode 100644
index 0000000..2df16b0
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamSubscriber.java
@@ -0,0 +1,40 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Stream Subscriber</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamSubscriber()
+ * @model abstract="true"
+ * @generated
+ */
+public interface DcaeStreamSubscriber extends NamedEntity {
+
+} // DcaeStreamSubscriber
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamSubscriberExternal.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamSubscriberExternal.java
new file mode 100644
index 0000000..1a2f6f4
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamSubscriberExternal.java
@@ -0,0 +1,38 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Stream Subscriber External</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamSubscriberExternal()
+ * @model
+ * @generated
+ */
+public interface DcaeStreamSubscriberExternal extends DcaeStreamSubscriber, DcaeStreamExternalEndPoint {
+} // DcaeStreamSubscriberExternal
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamSubscriberInternal.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamSubscriberInternal.java
new file mode 100644
index 0000000..16bc53f
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DcaeStreamSubscriberInternal.java
@@ -0,0 +1,38 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dcae Stream Subscriber Internal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDcaeStreamSubscriberInternal()
+ * @model
+ * @generated
+ */
+public interface DcaeStreamSubscriberInternal extends DcaeStreamSubscriber, DcaeStreamInternalEndPoint {
+} // DcaeStreamSubscriberInternal
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DmaapStream.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DmaapStream.java
new file mode 100644
index 0000000..b0e9b89
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/DmaapStream.java
@@ -0,0 +1,205 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dmaap Stream</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapDataType <em>Dmaap Data Type</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapAction <em>Dmaap Action</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapUrl <em>Dmaap Url</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapUserName <em>Dmaap User Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapPassword <em>Dmaap Password</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapAuthMethod <em>Dmaap Auth Method</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDmaapStream()
+ * @model
+ * @generated
+ */
+public interface DmaapStream extends DcaeStream {
+	/**
+	 * Returns the value of the '<em><b>Dmaap Data Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dmaap Data Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dmaap Data Type</em>' attribute.
+	 * @see #setDmaapDataType(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDmaapStream_DmaapDataType()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDmaapDataType();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapDataType <em>Dmaap Data Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dmaap Data Type</em>' attribute.
+	 * @see #getDmaapDataType()
+	 * @generated
+	 */
+	void setDmaapDataType(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dmaap Action</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dmaap Action</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dmaap Action</em>' attribute.
+	 * @see #setDmaapAction(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDmaapStream_DmaapAction()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDmaapAction();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapAction <em>Dmaap Action</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dmaap Action</em>' attribute.
+	 * @see #getDmaapAction()
+	 * @generated
+	 */
+	void setDmaapAction(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dmaap Url</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dmaap Url</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dmaap Url</em>' attribute.
+	 * @see #setDmaapUrl(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDmaapStream_DmaapUrl()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDmaapUrl();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapUrl <em>Dmaap Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dmaap Url</em>' attribute.
+	 * @see #getDmaapUrl()
+	 * @generated
+	 */
+	void setDmaapUrl(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dmaap User Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dmaap User Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dmaap User Name</em>' attribute.
+	 * @see #setDmaapUserName(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDmaapStream_DmaapUserName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDmaapUserName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapUserName <em>Dmaap User Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dmaap User Name</em>' attribute.
+	 * @see #getDmaapUserName()
+	 * @generated
+	 */
+	void setDmaapUserName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dmaap Password</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dmaap Password</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dmaap Password</em>' attribute.
+	 * @see #setDmaapPassword(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDmaapStream_DmaapPassword()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDmaapPassword();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapPassword <em>Dmaap Password</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dmaap Password</em>' attribute.
+	 * @see #getDmaapPassword()
+	 * @generated
+	 */
+	void setDmaapPassword(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Dmaap Auth Method</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dmaap Auth Method</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dmaap Auth Method</em>' attribute.
+	 * @see #setDmaapAuthMethod(String)
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getDmaapStream_DmaapAuthMethod()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDmaapAuthMethod();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapAuthMethod <em>Dmaap Auth Method</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dmaap Auth Method</em>' attribute.
+	 * @see #getDmaapAuthMethod()
+	 * @generated
+	 */
+	void setDmaapAuthMethod(String value);
+
+} // DmaapStream
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/StreamAuthentication.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/StreamAuthentication.java
new file mode 100644
index 0000000..f798a33
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/StreamAuthentication.java
@@ -0,0 +1,250 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Topic Authentication</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getStreamAuthentication()
+ * @model
+ * @generated
+ */
+public enum StreamAuthentication implements Enumerator {
+	/**
+	 * The '<em><b>AAF</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #AAF_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	AAF(0, "AAF", "aaf"), /**
+	 * The '<em><b>NONE</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NONE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	NONE(0, "NONE", "none"), /**
+	 * The '<em><b>PASSWORD</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #PASSWORD_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	PASSWORD(0, "PASSWORD", "password");
+
+	/**
+	 * The '<em><b>AAF</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>AAF</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #AAF
+	 * @model literal="aaf"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int AAF_VALUE = 0;
+
+	/**
+	 * The '<em><b>NONE</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #NONE
+	 * @model literal="none"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int NONE_VALUE = 0;
+
+	/**
+	 * The '<em><b>PASSWORD</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>PASSWORD</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #PASSWORD
+	 * @model literal="password"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int PASSWORD_VALUE = 0;
+
+	/**
+	 * An array of all the '<em><b>Authentication</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final StreamAuthentication[] VALUES_ARRAY =
+		new StreamAuthentication[] {
+			AAF,
+			NONE,
+			PASSWORD,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Authentication</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<StreamAuthentication> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Authentication</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static StreamAuthentication get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			StreamAuthentication result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Authentication</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static StreamAuthentication getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			StreamAuthentication result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Authentication</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static StreamAuthentication get(int value) {
+		switch (value) {
+			case AAF_VALUE: return AAF;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private StreamAuthentication(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //TopicAuthentication
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/StreamFactory.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/StreamFactory.java
new file mode 100644
index 0000000..7c62a38
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/StreamFactory.java
@@ -0,0 +1,216 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage
+ * @generated
+ */
+public interface StreamFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	StreamFactory eINSTANCE = org.openecomp.dcae.controller.core.stream.impl.StreamFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Dcae Stream</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dcae Stream</em>'.
+	 * @generated
+	 */
+	DcaeStream createDcaeStream();
+
+	/**
+	 * Returns a new object of class '<em>Dmaap Stream</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dmaap Stream</em>'.
+	 * @generated
+	 */
+	DmaapStream createDmaapStream();
+
+	/**
+	 * Returns a new object of class '<em>Dcae Stream Definition</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dcae Stream Definition</em>'.
+	 * @generated
+	 */
+	DcaeStreamDefinition createDcaeStreamDefinition();
+
+	/**
+	 * Returns a new object of class '<em>Dcae Stream Publisher External</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dcae Stream Publisher External</em>'.
+	 * @generated
+	 */
+	DcaeStreamPublisherExternal createDcaeStreamPublisherExternal();
+
+	/**
+	 * Returns a new object of class '<em>Dcae Stream Publisher Internal</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dcae Stream Publisher Internal</em>'.
+	 * @generated
+	 */
+	DcaeStreamPublisherInternal createDcaeStreamPublisherInternal();
+
+	/**
+	 * Returns a new object of class '<em>Dcae Stream Subscriber External</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dcae Stream Subscriber External</em>'.
+	 * @generated
+	 */
+	DcaeStreamSubscriberExternal createDcaeStreamSubscriberExternal();
+
+	/**
+	 * Returns a new object of class '<em>Dcae Stream Subscriber Internal</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dcae Stream Subscriber Internal</em>'.
+	 * @generated
+	 */
+	DcaeStreamSubscriberInternal createDcaeStreamSubscriberInternal();
+
+	/**
+	 * Returns a new object of class '<em>Dcae Stream Internal End Point</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dcae Stream Internal End Point</em>'.
+	 * @generated
+	 */
+	DcaeStreamInternalEndPoint createDcaeStreamInternalEndPoint();
+
+	/**
+	 * Returns a new object of class '<em>Dcae Stream External End Point</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Dcae Stream External End Point</em>'.
+	 * @generated
+	 */
+	DcaeStreamExternalEndPoint createDcaeStreamExternalEndPoint();
+
+	/**
+	 * Returns a new object of class '<em>Databus Stream Topic</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Databus Stream Topic</em>'.
+	 * @generated
+	 */
+	DatabusStreamTopic createDatabusStreamTopic();
+
+	/**
+	 * Returns a new object of class '<em>Databus Stream Topic Client</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Databus Stream Topic Client</em>'.
+	 * @generated
+	 */
+	DatabusStreamTopicClient createDatabusStreamTopicClient();
+
+	/**
+	 * Returns a new object of class '<em>Databus Stream Feed</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Databus Stream Feed</em>'.
+	 * @generated
+	 */
+	DatabusStreamFeed createDatabusStreamFeed();
+
+	/**
+	 * Returns a new object of class '<em>Databus Stream Feed Publisher</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Databus Stream Feed Publisher</em>'.
+	 * @generated
+	 */
+	DatabusStreamFeedPublisher createDatabusStreamFeedPublisher();
+
+	/**
+	 * Returns a new object of class '<em>Databus Stream Feed Subscriber</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Databus Stream Feed Subscriber</em>'.
+	 * @generated
+	 */
+	DatabusStreamFeedSubscriber createDatabusStreamFeedSubscriber();
+
+	/**
+	 * Returns a new object of class '<em>Databus Entity</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Databus Entity</em>'.
+	 * @generated
+	 */
+	DatabusEntity createDatabusEntity();
+
+	/**
+	 * Returns a new object of class '<em>Databus Location</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Databus Location</em>'.
+	 * @generated
+	 */
+	DatabusLocation createDatabusLocation();
+
+	/**
+	 * Returns a new object of class '<em>Databus Message Router Cluster</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Databus Message Router Cluster</em>'.
+	 * @generated
+	 */
+	DatabusMessageRouterCluster createDatabusMessageRouterCluster();
+
+	/**
+	 * Returns a new object of class '<em>Databus Data Router Node</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Databus Data Router Node</em>'.
+	 * @generated
+	 */
+	DatabusDataRouterNode createDatabusDataRouterNode();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	StreamPackage getStreamPackage();
+
+} //StreamFactory
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/StreamPackage.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/StreamPackage.java
new file mode 100644
index 0000000..efeb246
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/StreamPackage.java
@@ -0,0 +1,4179 @@
+
+/*-
+ * ============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.dcae.controller.core.stream;
+
+import org.openecomp.ncomp.core.CorePackage;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.stream.StreamFactory
+ * @model kind="package"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-core-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.core'"
+ * @generated
+ */
+public interface StreamPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "stream";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "org.openecomp.dcae.controller.core.stream";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "stream";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	StreamPackage eINSTANCE = org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamImpl <em>Dcae Stream</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStream()
+	 * @generated
+	 */
+	int DCAE_STREAM = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM__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 DCAE_STREAM__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 DCAE_STREAM__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 DCAE_STREAM__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Stream</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Dcae Stream</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DmaapStreamImpl <em>Dmaap Stream</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DmaapStreamImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDmaapStream()
+	 * @generated
+	 */
+	int DMAAP_STREAM = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DMAAP_STREAM__NAME = DCAE_STREAM__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DMAAP_STREAM__LAST_POLLED = DCAE_STREAM__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DMAAP_STREAM__LAST_CHANGED = DCAE_STREAM__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DMAAP_STREAM__CREATED = DCAE_STREAM__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Data Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DMAAP_STREAM__DMAAP_DATA_TYPE = DCAE_STREAM_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Action</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DMAAP_STREAM__DMAAP_ACTION = DCAE_STREAM_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Url</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DMAAP_STREAM__DMAAP_URL = DCAE_STREAM_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap User Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DMAAP_STREAM__DMAAP_USER_NAME = DCAE_STREAM_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Password</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DMAAP_STREAM__DMAAP_PASSWORD = DCAE_STREAM_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Dmaap Auth Method</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DMAAP_STREAM__DMAAP_AUTH_METHOD = DCAE_STREAM_FEATURE_COUNT + 5;
+
+	/**
+	 * The number of structural features of the '<em>Dmaap Stream</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DMAAP_STREAM_FEATURE_COUNT = DCAE_STREAM_FEATURE_COUNT + 6;
+
+	/**
+	 * The number of operations of the '<em>Dmaap Stream</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DMAAP_STREAM_OPERATION_COUNT = DCAE_STREAM_OPERATION_COUNT + 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamDefinitionImpl <em>Dcae Stream Definition</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamDefinitionImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamDefinition()
+	 * @generated
+	 */
+	int DCAE_STREAM_DEFINITION = 2;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_DEFINITION__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 DCAE_STREAM_DEFINITION__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 DCAE_STREAM_DEFINITION__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 DCAE_STREAM_DEFINITION__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Stream Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_DEFINITION__STREAM_TYPE = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Databus Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_DEFINITION__DATABUS_TYPE = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Publishers</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_DEFINITION__PUBLISHERS = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Subscribers</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_DEFINITION__SUBSCRIBERS = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Stream Definition</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_DEFINITION_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of operations of the '<em>Dcae Stream Definition</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_DEFINITION_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherImpl <em>Dcae Stream Publisher</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamPublisher()
+	 * @generated
+	 */
+	int DCAE_STREAM_PUBLISHER = 3;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER__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 DCAE_STREAM_PUBLISHER__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 DCAE_STREAM_PUBLISHER__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 DCAE_STREAM_PUBLISHER__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Stream Publisher</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Dcae Stream Publisher</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberImpl <em>Dcae Stream Subscriber</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamSubscriber()
+	 * @generated
+	 */
+	int DCAE_STREAM_SUBSCRIBER = 4;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER__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 DCAE_STREAM_SUBSCRIBER__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 DCAE_STREAM_SUBSCRIBER__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 DCAE_STREAM_SUBSCRIBER__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Stream Subscriber</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Dcae Stream Subscriber</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherExternalImpl <em>Dcae Stream Publisher External</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherExternalImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamPublisherExternal()
+	 * @generated
+	 */
+	int DCAE_STREAM_PUBLISHER_EXTERNAL = 5;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_EXTERNAL__NAME = DCAE_STREAM_PUBLISHER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_EXTERNAL__LAST_POLLED = DCAE_STREAM_PUBLISHER__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_EXTERNAL__LAST_CHANGED = DCAE_STREAM_PUBLISHER__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_EXTERNAL__CREATED = DCAE_STREAM_PUBLISHER__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>User</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_EXTERNAL__USER = DCAE_STREAM_PUBLISHER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Password</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_EXTERNAL__PASSWORD = DCAE_STREAM_PUBLISHER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Url</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_EXTERNAL__URL = DCAE_STREAM_PUBLISHER_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Stream Publisher External</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_EXTERNAL_FEATURE_COUNT = DCAE_STREAM_PUBLISHER_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Dcae Stream Publisher External</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_EXTERNAL_OPERATION_COUNT = DCAE_STREAM_PUBLISHER_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherInternalImpl <em>Dcae Stream Publisher Internal</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherInternalImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamPublisherInternal()
+	 * @generated
+	 */
+	int DCAE_STREAM_PUBLISHER_INTERNAL = 6;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_INTERNAL__NAME = DCAE_STREAM_PUBLISHER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_INTERNAL__LAST_POLLED = DCAE_STREAM_PUBLISHER__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_INTERNAL__LAST_CHANGED = DCAE_STREAM_PUBLISHER__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_INTERNAL__CREATED = DCAE_STREAM_PUBLISHER__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Local Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_INTERNAL__LOCAL_NAME = DCAE_STREAM_PUBLISHER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Service Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_INTERNAL__SERVICE_NAME = DCAE_STREAM_PUBLISHER_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Stream Publisher Internal</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_INTERNAL_FEATURE_COUNT = DCAE_STREAM_PUBLISHER_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Dcae Stream Publisher Internal</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_PUBLISHER_INTERNAL_OPERATION_COUNT = DCAE_STREAM_PUBLISHER_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberExternalImpl <em>Dcae Stream Subscriber External</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberExternalImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamSubscriberExternal()
+	 * @generated
+	 */
+	int DCAE_STREAM_SUBSCRIBER_EXTERNAL = 7;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_EXTERNAL__NAME = DCAE_STREAM_SUBSCRIBER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_EXTERNAL__LAST_POLLED = DCAE_STREAM_SUBSCRIBER__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_EXTERNAL__LAST_CHANGED = DCAE_STREAM_SUBSCRIBER__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_EXTERNAL__CREATED = DCAE_STREAM_SUBSCRIBER__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>User</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_EXTERNAL__USER = DCAE_STREAM_SUBSCRIBER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Password</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_EXTERNAL__PASSWORD = DCAE_STREAM_SUBSCRIBER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Url</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_EXTERNAL__URL = DCAE_STREAM_SUBSCRIBER_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Stream Subscriber External</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_EXTERNAL_FEATURE_COUNT = DCAE_STREAM_SUBSCRIBER_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Dcae Stream Subscriber External</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_EXTERNAL_OPERATION_COUNT = DCAE_STREAM_SUBSCRIBER_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberInternalImpl <em>Dcae Stream Subscriber Internal</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberInternalImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamSubscriberInternal()
+	 * @generated
+	 */
+	int DCAE_STREAM_SUBSCRIBER_INTERNAL = 8;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_INTERNAL__NAME = DCAE_STREAM_SUBSCRIBER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_INTERNAL__LAST_POLLED = DCAE_STREAM_SUBSCRIBER__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_INTERNAL__LAST_CHANGED = DCAE_STREAM_SUBSCRIBER__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_INTERNAL__CREATED = DCAE_STREAM_SUBSCRIBER__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Local Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_INTERNAL__LOCAL_NAME = DCAE_STREAM_SUBSCRIBER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Service Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_INTERNAL__SERVICE_NAME = DCAE_STREAM_SUBSCRIBER_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Stream Subscriber Internal</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_INTERNAL_FEATURE_COUNT = DCAE_STREAM_SUBSCRIBER_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Dcae Stream Subscriber Internal</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_SUBSCRIBER_INTERNAL_OPERATION_COUNT = DCAE_STREAM_SUBSCRIBER_OPERATION_COUNT + 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamInternalEndPointImpl <em>Dcae Stream Internal End Point</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamInternalEndPointImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamInternalEndPoint()
+	 * @generated
+	 */
+	int DCAE_STREAM_INTERNAL_END_POINT = 9;
+
+	/**
+	 * The feature id for the '<em><b>Local Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_INTERNAL_END_POINT__LOCAL_NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Service Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_INTERNAL_END_POINT__SERVICE_NAME = 1;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Stream Internal End Point</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_INTERNAL_END_POINT_FEATURE_COUNT = 2;
+
+	/**
+	 * The number of operations of the '<em>Dcae Stream Internal End Point</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_INTERNAL_END_POINT_OPERATION_COUNT = 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamExternalEndPointImpl <em>Dcae Stream External End Point</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamExternalEndPointImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamExternalEndPoint()
+	 * @generated
+	 */
+	int DCAE_STREAM_EXTERNAL_END_POINT = 10;
+
+	/**
+	 * The feature id for the '<em><b>User</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_EXTERNAL_END_POINT__USER = 0;
+
+	/**
+	 * The feature id for the '<em><b>Password</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_EXTERNAL_END_POINT__PASSWORD = 1;
+
+	/**
+	 * The feature id for the '<em><b>Url</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_EXTERNAL_END_POINT__URL = 2;
+
+	/**
+	 * The number of structural features of the '<em>Dcae Stream External End Point</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_EXTERNAL_END_POINT_FEATURE_COUNT = 3;
+
+	/**
+	 * The number of operations of the '<em>Dcae Stream External End Point</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_STREAM_EXTERNAL_END_POINT_OPERATION_COUNT = 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamImpl <em>Databus Stream</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusStreamImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStream()
+	 * @generated
+	 */
+	int DATABUS_STREAM = 11;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM__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 DATABUS_STREAM__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 DATABUS_STREAM__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 DATABUS_STREAM__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The number of structural features of the '<em>Databus Stream</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Databus Stream</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl <em>Databus Stream Topic</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStreamTopic()
+	 * @generated
+	 */
+	int DATABUS_STREAM_TOPIC = 12;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__NAME = DATABUS_STREAM__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__LAST_POLLED = DATABUS_STREAM__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__LAST_CHANGED = DATABUS_STREAM__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__CREATED = DATABUS_STREAM__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Topic Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__TOPIC_NAME = DATABUS_STREAM_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Topic Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__TOPIC_DESCRIPTION = DATABUS_STREAM_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Dcae Location Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__DCAE_LOCATION_NAME = DATABUS_STREAM_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__OWNER = DATABUS_STREAM_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Txenabled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__TXENABLED = DATABUS_STREAM_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Fqtn</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__FQTN = DATABUS_STREAM_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Last Mod</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__LAST_MOD = DATABUS_STREAM_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__STATUS = DATABUS_STREAM_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Clients</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__CLIENTS = DATABUS_STREAM_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Publish URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__PUBLISH_URL = DATABUS_STREAM_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Subscribe URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__SUBSCRIBE_URL = DATABUS_STREAM_FEATURE_COUNT + 10;
+
+	/**
+	 * The feature id for the '<em><b>Authentication Method</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC__AUTHENTICATION_METHOD = DATABUS_STREAM_FEATURE_COUNT + 11;
+
+	/**
+	 * The number of structural features of the '<em>Databus Stream Topic</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_FEATURE_COUNT = DATABUS_STREAM_FEATURE_COUNT + 12;
+
+	/**
+	 * The number of operations of the '<em>Databus Stream Topic</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_OPERATION_COUNT = DATABUS_STREAM_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicClientImpl <em>Databus Stream Topic Client</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicClientImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStreamTopicClient()
+	 * @generated
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT = 13;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT__NAME = DATABUS_STREAM__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT__LAST_POLLED = DATABUS_STREAM__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT__LAST_CHANGED = DATABUS_STREAM__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT__CREATED = DATABUS_STREAM__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Local Stream Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT__LOCAL_STREAM_ID = DATABUS_STREAM_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Dcae Location Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT__DCAE_LOCATION_NAME = DATABUS_STREAM_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Client Role</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT__CLIENT_ROLE = DATABUS_STREAM_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Action</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT__ACTION = DATABUS_STREAM_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Username</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT__USERNAME = DATABUS_STREAM_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Userpwd</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT__USERPWD = DATABUS_STREAM_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Fqtn</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT__FQTN = DATABUS_STREAM_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Mr Client Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT__MR_CLIENT_ID = DATABUS_STREAM_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Topic URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT__TOPIC_URL = DATABUS_STREAM_FEATURE_COUNT + 8;
+
+	/**
+	 * The number of structural features of the '<em>Databus Stream Topic Client</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT_FEATURE_COUNT = DATABUS_STREAM_FEATURE_COUNT + 9;
+
+	/**
+	 * The number of operations of the '<em>Databus Stream Topic Client</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_TOPIC_CLIENT_OPERATION_COUNT = DATABUS_STREAM_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl <em>Databus Stream Feed</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStreamFeed()
+	 * @generated
+	 */
+	int DATABUS_STREAM_FEED = 14;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__NAME = DATABUS_STREAM__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__LAST_POLLED = DATABUS_STREAM__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__LAST_CHANGED = DATABUS_STREAM__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__CREATED = DATABUS_STREAM__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Feed Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__FEED_NAME = DATABUS_STREAM_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Feed Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__FEED_VERSION = DATABUS_STREAM_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Feed Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__FEED_DESCRIPTION = DATABUS_STREAM_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Aspr Classification</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__ASPR_CLASSIFICATION = DATABUS_STREAM_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__OWNER = DATABUS_STREAM_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Feed Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__FEED_ID = DATABUS_STREAM_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Log URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__LOG_URL = DATABUS_STREAM_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Publish URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__PUBLISH_URL = DATABUS_STREAM_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Subscribe URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__SUBSCRIBE_URL = DATABUS_STREAM_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__STATUS = DATABUS_STREAM_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Suspended</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__SUSPENDED = DATABUS_STREAM_FEATURE_COUNT + 10;
+
+	/**
+	 * The feature id for the '<em><b>Publishers</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__PUBLISHERS = DATABUS_STREAM_FEATURE_COUNT + 11;
+
+	/**
+	 * The feature id for the '<em><b>Subscribers</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED__SUBSCRIBERS = DATABUS_STREAM_FEATURE_COUNT + 12;
+
+	/**
+	 * The number of structural features of the '<em>Databus Stream Feed</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_FEATURE_COUNT = DATABUS_STREAM_FEATURE_COUNT + 13;
+
+	/**
+	 * The number of operations of the '<em>Databus Stream Feed</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_OPERATION_COUNT = DATABUS_STREAM_OPERATION_COUNT + 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedPublisherImpl <em>Databus Stream Feed Publisher</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedPublisherImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStreamFeedPublisher()
+	 * @generated
+	 */
+	int DATABUS_STREAM_FEED_PUBLISHER = 15;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_PUBLISHER__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 DATABUS_STREAM_FEED_PUBLISHER__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 DATABUS_STREAM_FEED_PUBLISHER__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 DATABUS_STREAM_FEED_PUBLISHER__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Local Stream Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_PUBLISHER__LOCAL_STREAM_ID = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Dcae Location Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_PUBLISHER__DCAE_LOCATION_NAME = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Feed Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_PUBLISHER__FEED_ID = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Pub Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_PUBLISHER__PUB_ID = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_PUBLISHER__STATUS = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Username</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_PUBLISHER__USERNAME = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Userpwd</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_PUBLISHER__USERPWD = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 6;
+
+	/**
+	 * The number of structural features of the '<em>Databus Stream Feed Publisher</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_PUBLISHER_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 7;
+
+	/**
+	 * The number of operations of the '<em>Databus Stream Feed Publisher</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_PUBLISHER_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl <em>Databus Stream Feed Subscriber</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStreamFeedSubscriber()
+	 * @generated
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER = 16;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER__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 DATABUS_STREAM_FEED_SUBSCRIBER__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 DATABUS_STREAM_FEED_SUBSCRIBER__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 DATABUS_STREAM_FEED_SUBSCRIBER__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Local Stream Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER__LOCAL_STREAM_ID = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Dcae Location Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER__DCAE_LOCATION_NAME = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Other Feed Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER__OTHER_FEED_NAME = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Feed Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER__FEED_ID = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Log URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER__LOG_URL = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER__OWNER = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Sub Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER__SUB_ID = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Suspended</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER__SUSPENDED = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Use100</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER__USE100 = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Username</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER__USERNAME = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Userpwd</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER__USERPWD = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 10;
+
+	/**
+	 * The feature id for the '<em><b>Delivery URL</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER__DELIVERY_URL = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 11;
+
+	/**
+	 * The number of structural features of the '<em>Databus Stream Feed Subscriber</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 12;
+
+	/**
+	 * The number of operations of the '<em>Databus Stream Feed Subscriber</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_STREAM_FEED_SUBSCRIBER_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusEntityImpl <em>Databus Entity</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusEntityImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusEntity()
+	 * @generated
+	 */
+	int DATABUS_ENTITY = 17;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_ENTITY__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 DATABUS_ENTITY__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 DATABUS_ENTITY__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 DATABUS_ENTITY__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_ENTITY__STATUS = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Last Modified</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_ENTITY__LAST_MODIFIED = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_ENTITY__TYPE = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Databus Entity</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_ENTITY_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Databus Entity</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_ENTITY_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusLocationImpl <em>Databus Location</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusLocationImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusLocation()
+	 * @generated
+	 */
+	int DATABUS_LOCATION = 18;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_LOCATION__NAME = DATABUS_ENTITY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_LOCATION__LAST_POLLED = DATABUS_ENTITY__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_LOCATION__LAST_CHANGED = DATABUS_ENTITY__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_LOCATION__CREATED = DATABUS_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_LOCATION__STATUS = DATABUS_ENTITY__STATUS;
+
+	/**
+	 * The feature id for the '<em><b>Last Modified</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_LOCATION__LAST_MODIFIED = DATABUS_ENTITY__LAST_MODIFIED;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_LOCATION__TYPE = DATABUS_ENTITY__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Dcae Layer</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_LOCATION__DCAE_LAYER = DATABUS_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Databus Location</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_LOCATION_FEATURE_COUNT = DATABUS_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Databus Location</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_LOCATION_OPERATION_COUNT = DATABUS_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusMessageRouterClusterImpl <em>Databus Message Router Cluster</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusMessageRouterClusterImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusMessageRouterCluster()
+	 * @generated
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER = 19;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER__NAME = DATABUS_ENTITY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER__LAST_POLLED = DATABUS_ENTITY__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER__LAST_CHANGED = DATABUS_ENTITY__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER__CREATED = DATABUS_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER__STATUS = DATABUS_ENTITY__STATUS;
+
+	/**
+	 * The feature id for the '<em><b>Last Modified</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER__LAST_MODIFIED = DATABUS_ENTITY__LAST_MODIFIED;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER__TYPE = DATABUS_ENTITY__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Dcae Location Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER__DCAE_LOCATION_NAME = DATABUS_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Service Fqdn</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER__SERVICE_FQDN = DATABUS_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Host Fqdn</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER__HOST_FQDN = DATABUS_ENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Topic Port</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PORT = DATABUS_ENTITY_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Topic Protocol</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PROTOCOL = DATABUS_ENTITY_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the '<em>Databus Message Router Cluster</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER_FEATURE_COUNT = DATABUS_ENTITY_FEATURE_COUNT + 5;
+
+	/**
+	 * The number of operations of the '<em>Databus Message Router Cluster</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_MESSAGE_ROUTER_CLUSTER_OPERATION_COUNT = DATABUS_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusDataRouterNodeImpl <em>Databus Data Router Node</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusDataRouterNodeImpl
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusDataRouterNode()
+	 * @generated
+	 */
+	int DATABUS_DATA_ROUTER_NODE = 20;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_DATA_ROUTER_NODE__NAME = DATABUS_ENTITY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_DATA_ROUTER_NODE__LAST_POLLED = DATABUS_ENTITY__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_DATA_ROUTER_NODE__LAST_CHANGED = DATABUS_ENTITY__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_DATA_ROUTER_NODE__CREATED = DATABUS_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_DATA_ROUTER_NODE__STATUS = DATABUS_ENTITY__STATUS;
+
+	/**
+	 * The feature id for the '<em><b>Last Modified</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_DATA_ROUTER_NODE__LAST_MODIFIED = DATABUS_ENTITY__LAST_MODIFIED;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_DATA_ROUTER_NODE__TYPE = DATABUS_ENTITY__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Dcae Location Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_DATA_ROUTER_NODE__DCAE_LOCATION_NAME = DATABUS_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Host Fqdn</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_DATA_ROUTER_NODE__HOST_FQDN = DATABUS_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_DATA_ROUTER_NODE__VERSION = DATABUS_ENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Databus Data Router Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_DATA_ROUTER_NODE_FEATURE_COUNT = DATABUS_ENTITY_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Databus Data Router Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATABUS_DATA_ROUTER_NODE_OPERATION_COUNT = DATABUS_ENTITY_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicAction <em>Databus Stream Topic Action</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicAction
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStreamTopicAction()
+	 * @generated
+	 */
+	int DATABUS_STREAM_TOPIC_ACTION = 21;
+
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.core.stream.StreamAuthentication <em>Authentication</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.core.stream.StreamAuthentication
+	 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getStreamAuthentication()
+	 * @generated
+	 */
+	int STREAM_AUTHENTICATION = 22;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DcaeStream <em>Dcae Stream</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Stream</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStream
+	 * @generated
+	 */
+	EClass getDcaeStream();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DmaapStream <em>Dmaap Stream</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dmaap Stream</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DmaapStream
+	 * @generated
+	 */
+	EClass getDmaapStream();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapDataType <em>Dmaap Data Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dmaap Data Type</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapDataType()
+	 * @see #getDmaapStream()
+	 * @generated
+	 */
+	EAttribute getDmaapStream_DmaapDataType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapAction <em>Dmaap Action</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dmaap Action</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapAction()
+	 * @see #getDmaapStream()
+	 * @generated
+	 */
+	EAttribute getDmaapStream_DmaapAction();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapUrl <em>Dmaap Url</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dmaap Url</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapUrl()
+	 * @see #getDmaapStream()
+	 * @generated
+	 */
+	EAttribute getDmaapStream_DmaapUrl();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapUserName <em>Dmaap User Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dmaap User Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapUserName()
+	 * @see #getDmaapStream()
+	 * @generated
+	 */
+	EAttribute getDmaapStream_DmaapUserName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapPassword <em>Dmaap Password</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dmaap Password</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapPassword()
+	 * @see #getDmaapStream()
+	 * @generated
+	 */
+	EAttribute getDmaapStream_DmaapPassword();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapAuthMethod <em>Dmaap Auth Method</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dmaap Auth Method</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DmaapStream#getDmaapAuthMethod()
+	 * @see #getDmaapStream()
+	 * @generated
+	 */
+	EAttribute getDmaapStream_DmaapAuthMethod();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition <em>Dcae Stream Definition</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Stream Definition</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition
+	 * @generated
+	 */
+	EClass getDcaeStreamDefinition();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getStreamType <em>Stream Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Stream Type</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getStreamType()
+	 * @see #getDcaeStreamDefinition()
+	 * @generated
+	 */
+	EAttribute getDcaeStreamDefinition_StreamType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getDatabusType <em>Databus Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Databus Type</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getDatabusType()
+	 * @see #getDcaeStreamDefinition()
+	 * @generated
+	 */
+	EAttribute getDcaeStreamDefinition_DatabusType();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getPublishers <em>Publishers</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Publishers</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getPublishers()
+	 * @see #getDcaeStreamDefinition()
+	 * @generated
+	 */
+	EReference getDcaeStreamDefinition_Publishers();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getSubscribers <em>Subscribers</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Subscribers</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition#getSubscribers()
+	 * @see #getDcaeStreamDefinition()
+	 * @generated
+	 */
+	EReference getDcaeStreamDefinition_Subscribers();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamPublisher <em>Dcae Stream Publisher</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Stream Publisher</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamPublisher
+	 * @generated
+	 */
+	EClass getDcaeStreamPublisher();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriber <em>Dcae Stream Subscriber</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Stream Subscriber</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriber
+	 * @generated
+	 */
+	EClass getDcaeStreamSubscriber();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamPublisherExternal <em>Dcae Stream Publisher External</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Stream Publisher External</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamPublisherExternal
+	 * @generated
+	 */
+	EClass getDcaeStreamPublisherExternal();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamPublisherInternal <em>Dcae Stream Publisher Internal</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Stream Publisher Internal</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamPublisherInternal
+	 * @generated
+	 */
+	EClass getDcaeStreamPublisherInternal();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriberExternal <em>Dcae Stream Subscriber External</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Stream Subscriber External</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriberExternal
+	 * @generated
+	 */
+	EClass getDcaeStreamSubscriberExternal();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriberInternal <em>Dcae Stream Subscriber Internal</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Stream Subscriber Internal</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriberInternal
+	 * @generated
+	 */
+	EClass getDcaeStreamSubscriberInternal();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint <em>Dcae Stream Internal End Point</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Stream Internal End Point</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint
+	 * @generated
+	 */
+	EClass getDcaeStreamInternalEndPoint();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint#getLocalName <em>Local Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Local Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint#getLocalName()
+	 * @see #getDcaeStreamInternalEndPoint()
+	 * @generated
+	 */
+	EAttribute getDcaeStreamInternalEndPoint_LocalName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint#getServiceName <em>Service Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Service Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint#getServiceName()
+	 * @see #getDcaeStreamInternalEndPoint()
+	 * @generated
+	 */
+	EAttribute getDcaeStreamInternalEndPoint_ServiceName();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint <em>Dcae Stream External End Point</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Dcae Stream External End Point</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint
+	 * @generated
+	 */
+	EClass getDcaeStreamExternalEndPoint();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint#getUser <em>User</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>User</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint#getUser()
+	 * @see #getDcaeStreamExternalEndPoint()
+	 * @generated
+	 */
+	EAttribute getDcaeStreamExternalEndPoint_User();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint#getPassword <em>Password</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Password</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint#getPassword()
+	 * @see #getDcaeStreamExternalEndPoint()
+	 * @generated
+	 */
+	EAttribute getDcaeStreamExternalEndPoint_Password();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint#getUrl <em>Url</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Url</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint#getUrl()
+	 * @see #getDcaeStreamExternalEndPoint()
+	 * @generated
+	 */
+	EAttribute getDcaeStreamExternalEndPoint_Url();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DatabusStream <em>Databus Stream</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Databus Stream</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStream
+	 * @generated
+	 */
+	EClass getDatabusStream();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic <em>Databus Stream Topic</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Databus Stream Topic</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopic
+	 * @generated
+	 */
+	EClass getDatabusStreamTopic();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getTopicName <em>Topic Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Topic Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getTopicName()
+	 * @see #getDatabusStreamTopic()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopic_TopicName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getTopicDescription <em>Topic Description</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Topic Description</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getTopicDescription()
+	 * @see #getDatabusStreamTopic()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopic_TopicDescription();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getDcaeLocationName <em>Dcae Location Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dcae Location Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getDcaeLocationName()
+	 * @see #getDatabusStreamTopic()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopic_DcaeLocationName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getOwner <em>Owner</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Owner</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getOwner()
+	 * @see #getDatabusStreamTopic()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopic_Owner();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#isTxenabled <em>Txenabled</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Txenabled</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#isTxenabled()
+	 * @see #getDatabusStreamTopic()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopic_Txenabled();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getFqtn <em>Fqtn</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Fqtn</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getFqtn()
+	 * @see #getDatabusStreamTopic()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopic_Fqtn();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getLastMod <em>Last Mod</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Last Mod</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getLastMod()
+	 * @see #getDatabusStreamTopic()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopic_LastMod();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getStatus <em>Status</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Status</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getStatus()
+	 * @see #getDatabusStreamTopic()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopic_Status();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getClients <em>Clients</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Clients</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getClients()
+	 * @see #getDatabusStreamTopic()
+	 * @generated
+	 */
+	EReference getDatabusStreamTopic_Clients();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getPublishURL <em>Publish URL</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Publish URL</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getPublishURL()
+	 * @see #getDatabusStreamTopic()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopic_PublishURL();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getSubscribeURL <em>Subscribe URL</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Subscribe URL</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getSubscribeURL()
+	 * @see #getDatabusStreamTopic()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopic_SubscribeURL();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getAuthenticationMethod <em>Authentication Method</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Authentication Method</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopic#getAuthenticationMethod()
+	 * @see #getDatabusStreamTopic()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopic_AuthenticationMethod();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient <em>Databus Stream Topic Client</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Databus Stream Topic Client</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient
+	 * @generated
+	 */
+	EClass getDatabusStreamTopicClient();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getLocalStreamId <em>Local Stream Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Local Stream Id</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getLocalStreamId()
+	 * @see #getDatabusStreamTopicClient()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopicClient_LocalStreamId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getDcaeLocationName <em>Dcae Location Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dcae Location Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getDcaeLocationName()
+	 * @see #getDatabusStreamTopicClient()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopicClient_DcaeLocationName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getClientRole <em>Client Role</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Client Role</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getClientRole()
+	 * @see #getDatabusStreamTopicClient()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopicClient_ClientRole();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getAction <em>Action</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Action</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getAction()
+	 * @see #getDatabusStreamTopicClient()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopicClient_Action();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getUsername <em>Username</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Username</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getUsername()
+	 * @see #getDatabusStreamTopicClient()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopicClient_Username();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getUserpwd <em>Userpwd</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Userpwd</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getUserpwd()
+	 * @see #getDatabusStreamTopicClient()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopicClient_Userpwd();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getFqtn <em>Fqtn</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Fqtn</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getFqtn()
+	 * @see #getDatabusStreamTopicClient()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopicClient_Fqtn();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getMrClientId <em>Mr Client Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Mr Client Id</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getMrClientId()
+	 * @see #getDatabusStreamTopicClient()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopicClient_MrClientId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getTopicURL <em>Topic URL</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Topic URL</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient#getTopicURL()
+	 * @see #getDatabusStreamTopicClient()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamTopicClient_TopicURL();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed <em>Databus Stream Feed</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Databus Stream Feed</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed
+	 * @generated
+	 */
+	EClass getDatabusStreamFeed();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedName <em>Feed Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Feed Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedName()
+	 * @see #getDatabusStreamFeed()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeed_FeedName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedVersion <em>Feed Version</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Feed Version</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedVersion()
+	 * @see #getDatabusStreamFeed()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeed_FeedVersion();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedDescription <em>Feed Description</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Feed Description</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedDescription()
+	 * @see #getDatabusStreamFeed()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeed_FeedDescription();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getAsprClassification <em>Aspr Classification</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Aspr Classification</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getAsprClassification()
+	 * @see #getDatabusStreamFeed()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeed_AsprClassification();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getOwner <em>Owner</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Owner</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getOwner()
+	 * @see #getDatabusStreamFeed()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeed_Owner();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedId <em>Feed Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Feed Id</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getFeedId()
+	 * @see #getDatabusStreamFeed()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeed_FeedId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getLogURL <em>Log URL</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Log URL</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getLogURL()
+	 * @see #getDatabusStreamFeed()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeed_LogURL();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getPublishURL <em>Publish URL</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Publish URL</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getPublishURL()
+	 * @see #getDatabusStreamFeed()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeed_PublishURL();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getSubscribeURL <em>Subscribe URL</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Subscribe URL</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getSubscribeURL()
+	 * @see #getDatabusStreamFeed()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeed_SubscribeURL();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getStatus <em>Status</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Status</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getStatus()
+	 * @see #getDatabusStreamFeed()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeed_Status();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getSuspended <em>Suspended</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Suspended</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getSuspended()
+	 * @see #getDatabusStreamFeed()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeed_Suspended();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getPublishers <em>Publishers</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Publishers</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getPublishers()
+	 * @see #getDatabusStreamFeed()
+	 * @generated
+	 */
+	EReference getDatabusStreamFeed_Publishers();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getSubscribers <em>Subscribers</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Subscribers</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeed#getSubscribers()
+	 * @see #getDatabusStreamFeed()
+	 * @generated
+	 */
+	EReference getDatabusStreamFeed_Subscribers();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher <em>Databus Stream Feed Publisher</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Databus Stream Feed Publisher</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher
+	 * @generated
+	 */
+	EClass getDatabusStreamFeedPublisher();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getLocalStreamId <em>Local Stream Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Local Stream Id</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getLocalStreamId()
+	 * @see #getDatabusStreamFeedPublisher()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedPublisher_LocalStreamId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getDcaeLocationName <em>Dcae Location Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dcae Location Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getDcaeLocationName()
+	 * @see #getDatabusStreamFeedPublisher()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedPublisher_DcaeLocationName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getFeedId <em>Feed Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Feed Id</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getFeedId()
+	 * @see #getDatabusStreamFeedPublisher()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedPublisher_FeedId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getPubId <em>Pub Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Pub Id</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getPubId()
+	 * @see #getDatabusStreamFeedPublisher()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedPublisher_PubId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getStatus <em>Status</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Status</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getStatus()
+	 * @see #getDatabusStreamFeedPublisher()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedPublisher_Status();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getUsername <em>Username</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Username</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getUsername()
+	 * @see #getDatabusStreamFeedPublisher()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedPublisher_Username();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getUserpwd <em>Userpwd</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Userpwd</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher#getUserpwd()
+	 * @see #getDatabusStreamFeedPublisher()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedPublisher_Userpwd();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber <em>Databus Stream Feed Subscriber</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Databus Stream Feed Subscriber</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber
+	 * @generated
+	 */
+	EClass getDatabusStreamFeedSubscriber();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getLocalStreamId <em>Local Stream Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Local Stream Id</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getLocalStreamId()
+	 * @see #getDatabusStreamFeedSubscriber()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedSubscriber_LocalStreamId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getDcaeLocationName <em>Dcae Location Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dcae Location Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getDcaeLocationName()
+	 * @see #getDatabusStreamFeedSubscriber()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedSubscriber_DcaeLocationName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getOtherFeedName <em>Other Feed Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Other Feed Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getOtherFeedName()
+	 * @see #getDatabusStreamFeedSubscriber()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedSubscriber_OtherFeedName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getFeedId <em>Feed Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Feed Id</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getFeedId()
+	 * @see #getDatabusStreamFeedSubscriber()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedSubscriber_FeedId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getLogURL <em>Log URL</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Log URL</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getLogURL()
+	 * @see #getDatabusStreamFeedSubscriber()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedSubscriber_LogURL();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getOwner <em>Owner</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Owner</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getOwner()
+	 * @see #getDatabusStreamFeedSubscriber()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedSubscriber_Owner();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getSubId <em>Sub Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Sub Id</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getSubId()
+	 * @see #getDatabusStreamFeedSubscriber()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedSubscriber_SubId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#isSuspended <em>Suspended</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Suspended</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#isSuspended()
+	 * @see #getDatabusStreamFeedSubscriber()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedSubscriber_Suspended();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#isUse100 <em>Use100</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Use100</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#isUse100()
+	 * @see #getDatabusStreamFeedSubscriber()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedSubscriber_Use100();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getUsername <em>Username</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Username</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getUsername()
+	 * @see #getDatabusStreamFeedSubscriber()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedSubscriber_Username();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getUserpwd <em>Userpwd</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Userpwd</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getUserpwd()
+	 * @see #getDatabusStreamFeedSubscriber()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedSubscriber_Userpwd();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getDeliveryURL <em>Delivery URL</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Delivery URL</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber#getDeliveryURL()
+	 * @see #getDatabusStreamFeedSubscriber()
+	 * @generated
+	 */
+	EAttribute getDatabusStreamFeedSubscriber_DeliveryURL();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DatabusEntity <em>Databus Entity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Databus Entity</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusEntity
+	 * @generated
+	 */
+	EClass getDatabusEntity();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusEntity#getStatus <em>Status</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Status</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusEntity#getStatus()
+	 * @see #getDatabusEntity()
+	 * @generated
+	 */
+	EAttribute getDatabusEntity_Status();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusEntity#getLastModified <em>Last Modified</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Last Modified</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusEntity#getLastModified()
+	 * @see #getDatabusEntity()
+	 * @generated
+	 */
+	EAttribute getDatabusEntity_LastModified();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusEntity#getType <em>Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Type</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusEntity#getType()
+	 * @see #getDatabusEntity()
+	 * @generated
+	 */
+	EAttribute getDatabusEntity_Type();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DatabusLocation <em>Databus Location</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Databus Location</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusLocation
+	 * @generated
+	 */
+	EClass getDatabusLocation();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusLocation#getDcaeLayer <em>Dcae Layer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dcae Layer</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusLocation#getDcaeLayer()
+	 * @see #getDatabusLocation()
+	 * @generated
+	 */
+	EAttribute getDatabusLocation_DcaeLayer();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster <em>Databus Message Router Cluster</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Databus Message Router Cluster</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster
+	 * @generated
+	 */
+	EClass getDatabusMessageRouterCluster();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getDcaeLocationName <em>Dcae Location Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dcae Location Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getDcaeLocationName()
+	 * @see #getDatabusMessageRouterCluster()
+	 * @generated
+	 */
+	EAttribute getDatabusMessageRouterCluster_DcaeLocationName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getServiceFqdn <em>Service Fqdn</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Service Fqdn</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getServiceFqdn()
+	 * @see #getDatabusMessageRouterCluster()
+	 * @generated
+	 */
+	EAttribute getDatabusMessageRouterCluster_ServiceFqdn();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getHostFqdn <em>Host Fqdn</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Host Fqdn</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getHostFqdn()
+	 * @see #getDatabusMessageRouterCluster()
+	 * @generated
+	 */
+	EAttribute getDatabusMessageRouterCluster_HostFqdn();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getTopicPort <em>Topic Port</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Topic Port</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getTopicPort()
+	 * @see #getDatabusMessageRouterCluster()
+	 * @generated
+	 */
+	EAttribute getDatabusMessageRouterCluster_TopicPort();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getTopicProtocol <em>Topic Protocol</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Topic Protocol</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster#getTopicProtocol()
+	 * @see #getDatabusMessageRouterCluster()
+	 * @generated
+	 */
+	EAttribute getDatabusMessageRouterCluster_TopicProtocol();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode <em>Databus Data Router Node</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Databus Data Router Node</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode
+	 * @generated
+	 */
+	EClass getDatabusDataRouterNode();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode#getDcaeLocationName <em>Dcae Location Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dcae Location Name</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode#getDcaeLocationName()
+	 * @see #getDatabusDataRouterNode()
+	 * @generated
+	 */
+	EAttribute getDatabusDataRouterNode_DcaeLocationName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode#getHostFqdn <em>Host Fqdn</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Host Fqdn</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode#getHostFqdn()
+	 * @see #getDatabusDataRouterNode()
+	 * @generated
+	 */
+	EAttribute getDatabusDataRouterNode_HostFqdn();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode#getVersion <em>Version</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Version</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode#getVersion()
+	 * @see #getDatabusDataRouterNode()
+	 * @generated
+	 */
+	EAttribute getDatabusDataRouterNode_Version();
+
+	/**
+	 * Returns the meta object for enum '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicAction <em>Databus Stream Topic Action</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Databus Stream Topic Action</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicAction
+	 * @generated
+	 */
+	EEnum getDatabusStreamTopicAction();
+
+	/**
+	 * Returns the meta object for enum '{@link org.openecomp.dcae.controller.core.stream.StreamAuthentication <em>Authentication</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Authentication</em>'.
+	 * @see org.openecomp.dcae.controller.core.stream.StreamAuthentication
+	 * @generated
+	 */
+	EEnum getStreamAuthentication();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	StreamFactory getStreamFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamImpl <em>Dcae Stream</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStream()
+		 * @generated
+		 */
+		EClass DCAE_STREAM = eINSTANCE.getDcaeStream();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DmaapStreamImpl <em>Dmaap Stream</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DmaapStreamImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDmaapStream()
+		 * @generated
+		 */
+		EClass DMAAP_STREAM = eINSTANCE.getDmaapStream();
+		/**
+		 * The meta object literal for the '<em><b>Dmaap Data Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DMAAP_STREAM__DMAAP_DATA_TYPE = eINSTANCE.getDmaapStream_DmaapDataType();
+		/**
+		 * The meta object literal for the '<em><b>Dmaap Action</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DMAAP_STREAM__DMAAP_ACTION = eINSTANCE.getDmaapStream_DmaapAction();
+		/**
+		 * The meta object literal for the '<em><b>Dmaap Url</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DMAAP_STREAM__DMAAP_URL = eINSTANCE.getDmaapStream_DmaapUrl();
+		/**
+		 * The meta object literal for the '<em><b>Dmaap User Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DMAAP_STREAM__DMAAP_USER_NAME = eINSTANCE.getDmaapStream_DmaapUserName();
+		/**
+		 * The meta object literal for the '<em><b>Dmaap Password</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DMAAP_STREAM__DMAAP_PASSWORD = eINSTANCE.getDmaapStream_DmaapPassword();
+		/**
+		 * The meta object literal for the '<em><b>Dmaap Auth Method</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DMAAP_STREAM__DMAAP_AUTH_METHOD = eINSTANCE.getDmaapStream_DmaapAuthMethod();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamDefinitionImpl <em>Dcae Stream Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamDefinitionImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamDefinition()
+		 * @generated
+		 */
+		EClass DCAE_STREAM_DEFINITION = eINSTANCE.getDcaeStreamDefinition();
+		/**
+		 * The meta object literal for the '<em><b>Stream Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_STREAM_DEFINITION__STREAM_TYPE = eINSTANCE.getDcaeStreamDefinition_StreamType();
+		/**
+		 * The meta object literal for the '<em><b>Databus Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_STREAM_DEFINITION__DATABUS_TYPE = eINSTANCE.getDcaeStreamDefinition_DatabusType();
+		/**
+		 * The meta object literal for the '<em><b>Publishers</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_STREAM_DEFINITION__PUBLISHERS = eINSTANCE.getDcaeStreamDefinition_Publishers();
+		/**
+		 * The meta object literal for the '<em><b>Subscribers</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_STREAM_DEFINITION__SUBSCRIBERS = eINSTANCE.getDcaeStreamDefinition_Subscribers();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherImpl <em>Dcae Stream Publisher</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamPublisher()
+		 * @generated
+		 */
+		EClass DCAE_STREAM_PUBLISHER = eINSTANCE.getDcaeStreamPublisher();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberImpl <em>Dcae Stream Subscriber</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamSubscriber()
+		 * @generated
+		 */
+		EClass DCAE_STREAM_SUBSCRIBER = eINSTANCE.getDcaeStreamSubscriber();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherExternalImpl <em>Dcae Stream Publisher External</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherExternalImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamPublisherExternal()
+		 * @generated
+		 */
+		EClass DCAE_STREAM_PUBLISHER_EXTERNAL = eINSTANCE.getDcaeStreamPublisherExternal();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherInternalImpl <em>Dcae Stream Publisher Internal</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherInternalImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamPublisherInternal()
+		 * @generated
+		 */
+		EClass DCAE_STREAM_PUBLISHER_INTERNAL = eINSTANCE.getDcaeStreamPublisherInternal();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberExternalImpl <em>Dcae Stream Subscriber External</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberExternalImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamSubscriberExternal()
+		 * @generated
+		 */
+		EClass DCAE_STREAM_SUBSCRIBER_EXTERNAL = eINSTANCE.getDcaeStreamSubscriberExternal();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberInternalImpl <em>Dcae Stream Subscriber Internal</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberInternalImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamSubscriberInternal()
+		 * @generated
+		 */
+		EClass DCAE_STREAM_SUBSCRIBER_INTERNAL = eINSTANCE.getDcaeStreamSubscriberInternal();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamInternalEndPointImpl <em>Dcae Stream Internal End Point</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamInternalEndPointImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamInternalEndPoint()
+		 * @generated
+		 */
+		EClass DCAE_STREAM_INTERNAL_END_POINT = eINSTANCE.getDcaeStreamInternalEndPoint();
+		/**
+		 * The meta object literal for the '<em><b>Local Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_STREAM_INTERNAL_END_POINT__LOCAL_NAME = eINSTANCE.getDcaeStreamInternalEndPoint_LocalName();
+		/**
+		 * The meta object literal for the '<em><b>Service Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_STREAM_INTERNAL_END_POINT__SERVICE_NAME = eINSTANCE.getDcaeStreamInternalEndPoint_ServiceName();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamExternalEndPointImpl <em>Dcae Stream External End Point</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DcaeStreamExternalEndPointImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDcaeStreamExternalEndPoint()
+		 * @generated
+		 */
+		EClass DCAE_STREAM_EXTERNAL_END_POINT = eINSTANCE.getDcaeStreamExternalEndPoint();
+		/**
+		 * The meta object literal for the '<em><b>User</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_STREAM_EXTERNAL_END_POINT__USER = eINSTANCE.getDcaeStreamExternalEndPoint_User();
+		/**
+		 * The meta object literal for the '<em><b>Password</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_STREAM_EXTERNAL_END_POINT__PASSWORD = eINSTANCE.getDcaeStreamExternalEndPoint_Password();
+		/**
+		 * The meta object literal for the '<em><b>Url</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_STREAM_EXTERNAL_END_POINT__URL = eINSTANCE.getDcaeStreamExternalEndPoint_Url();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamImpl <em>Databus Stream</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusStreamImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStream()
+		 * @generated
+		 */
+		EClass DATABUS_STREAM = eINSTANCE.getDatabusStream();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl <em>Databus Stream Topic</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStreamTopic()
+		 * @generated
+		 */
+		EClass DATABUS_STREAM_TOPIC = eINSTANCE.getDatabusStreamTopic();
+		/**
+		 * The meta object literal for the '<em><b>Topic Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC__TOPIC_NAME = eINSTANCE.getDatabusStreamTopic_TopicName();
+		/**
+		 * The meta object literal for the '<em><b>Topic Description</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC__TOPIC_DESCRIPTION = eINSTANCE.getDatabusStreamTopic_TopicDescription();
+		/**
+		 * The meta object literal for the '<em><b>Dcae Location Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC__DCAE_LOCATION_NAME = eINSTANCE.getDatabusStreamTopic_DcaeLocationName();
+		/**
+		 * The meta object literal for the '<em><b>Owner</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC__OWNER = eINSTANCE.getDatabusStreamTopic_Owner();
+		/**
+		 * The meta object literal for the '<em><b>Txenabled</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC__TXENABLED = eINSTANCE.getDatabusStreamTopic_Txenabled();
+		/**
+		 * The meta object literal for the '<em><b>Fqtn</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC__FQTN = eINSTANCE.getDatabusStreamTopic_Fqtn();
+		/**
+		 * The meta object literal for the '<em><b>Last Mod</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC__LAST_MOD = eINSTANCE.getDatabusStreamTopic_LastMod();
+		/**
+		 * The meta object literal for the '<em><b>Status</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC__STATUS = eINSTANCE.getDatabusStreamTopic_Status();
+		/**
+		 * The meta object literal for the '<em><b>Clients</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABUS_STREAM_TOPIC__CLIENTS = eINSTANCE.getDatabusStreamTopic_Clients();
+		/**
+		 * The meta object literal for the '<em><b>Publish URL</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC__PUBLISH_URL = eINSTANCE.getDatabusStreamTopic_PublishURL();
+		/**
+		 * The meta object literal for the '<em><b>Subscribe URL</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC__SUBSCRIBE_URL = eINSTANCE.getDatabusStreamTopic_SubscribeURL();
+		/**
+		 * The meta object literal for the '<em><b>Authentication Method</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC__AUTHENTICATION_METHOD = eINSTANCE.getDatabusStreamTopic_AuthenticationMethod();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicClientImpl <em>Databus Stream Topic Client</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicClientImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStreamTopicClient()
+		 * @generated
+		 */
+		EClass DATABUS_STREAM_TOPIC_CLIENT = eINSTANCE.getDatabusStreamTopicClient();
+		/**
+		 * The meta object literal for the '<em><b>Local Stream Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC_CLIENT__LOCAL_STREAM_ID = eINSTANCE.getDatabusStreamTopicClient_LocalStreamId();
+		/**
+		 * The meta object literal for the '<em><b>Dcae Location Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC_CLIENT__DCAE_LOCATION_NAME = eINSTANCE.getDatabusStreamTopicClient_DcaeLocationName();
+		/**
+		 * The meta object literal for the '<em><b>Client Role</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC_CLIENT__CLIENT_ROLE = eINSTANCE.getDatabusStreamTopicClient_ClientRole();
+		/**
+		 * The meta object literal for the '<em><b>Action</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC_CLIENT__ACTION = eINSTANCE.getDatabusStreamTopicClient_Action();
+		/**
+		 * The meta object literal for the '<em><b>Username</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC_CLIENT__USERNAME = eINSTANCE.getDatabusStreamTopicClient_Username();
+		/**
+		 * The meta object literal for the '<em><b>Userpwd</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC_CLIENT__USERPWD = eINSTANCE.getDatabusStreamTopicClient_Userpwd();
+		/**
+		 * The meta object literal for the '<em><b>Fqtn</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC_CLIENT__FQTN = eINSTANCE.getDatabusStreamTopicClient_Fqtn();
+		/**
+		 * The meta object literal for the '<em><b>Mr Client Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC_CLIENT__MR_CLIENT_ID = eINSTANCE.getDatabusStreamTopicClient_MrClientId();
+		/**
+		 * The meta object literal for the '<em><b>Topic URL</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_TOPIC_CLIENT__TOPIC_URL = eINSTANCE.getDatabusStreamTopicClient_TopicURL();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl <em>Databus Stream Feed</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStreamFeed()
+		 * @generated
+		 */
+		EClass DATABUS_STREAM_FEED = eINSTANCE.getDatabusStreamFeed();
+		/**
+		 * The meta object literal for the '<em><b>Feed Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED__FEED_NAME = eINSTANCE.getDatabusStreamFeed_FeedName();
+		/**
+		 * The meta object literal for the '<em><b>Feed Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED__FEED_VERSION = eINSTANCE.getDatabusStreamFeed_FeedVersion();
+		/**
+		 * The meta object literal for the '<em><b>Feed Description</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED__FEED_DESCRIPTION = eINSTANCE.getDatabusStreamFeed_FeedDescription();
+		/**
+		 * The meta object literal for the '<em><b>Aspr Classification</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED__ASPR_CLASSIFICATION = eINSTANCE.getDatabusStreamFeed_AsprClassification();
+		/**
+		 * The meta object literal for the '<em><b>Owner</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED__OWNER = eINSTANCE.getDatabusStreamFeed_Owner();
+		/**
+		 * The meta object literal for the '<em><b>Feed Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED__FEED_ID = eINSTANCE.getDatabusStreamFeed_FeedId();
+		/**
+		 * The meta object literal for the '<em><b>Log URL</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED__LOG_URL = eINSTANCE.getDatabusStreamFeed_LogURL();
+		/**
+		 * The meta object literal for the '<em><b>Publish URL</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED__PUBLISH_URL = eINSTANCE.getDatabusStreamFeed_PublishURL();
+		/**
+		 * The meta object literal for the '<em><b>Subscribe URL</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED__SUBSCRIBE_URL = eINSTANCE.getDatabusStreamFeed_SubscribeURL();
+		/**
+		 * The meta object literal for the '<em><b>Status</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED__STATUS = eINSTANCE.getDatabusStreamFeed_Status();
+		/**
+		 * The meta object literal for the '<em><b>Suspended</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED__SUSPENDED = eINSTANCE.getDatabusStreamFeed_Suspended();
+		/**
+		 * The meta object literal for the '<em><b>Publishers</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABUS_STREAM_FEED__PUBLISHERS = eINSTANCE.getDatabusStreamFeed_Publishers();
+		/**
+		 * The meta object literal for the '<em><b>Subscribers</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATABUS_STREAM_FEED__SUBSCRIBERS = eINSTANCE.getDatabusStreamFeed_Subscribers();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedPublisherImpl <em>Databus Stream Feed Publisher</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedPublisherImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStreamFeedPublisher()
+		 * @generated
+		 */
+		EClass DATABUS_STREAM_FEED_PUBLISHER = eINSTANCE.getDatabusStreamFeedPublisher();
+		/**
+		 * The meta object literal for the '<em><b>Local Stream Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_PUBLISHER__LOCAL_STREAM_ID = eINSTANCE.getDatabusStreamFeedPublisher_LocalStreamId();
+		/**
+		 * The meta object literal for the '<em><b>Dcae Location Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_PUBLISHER__DCAE_LOCATION_NAME = eINSTANCE.getDatabusStreamFeedPublisher_DcaeLocationName();
+		/**
+		 * The meta object literal for the '<em><b>Feed Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_PUBLISHER__FEED_ID = eINSTANCE.getDatabusStreamFeedPublisher_FeedId();
+		/**
+		 * The meta object literal for the '<em><b>Pub Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_PUBLISHER__PUB_ID = eINSTANCE.getDatabusStreamFeedPublisher_PubId();
+		/**
+		 * The meta object literal for the '<em><b>Status</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_PUBLISHER__STATUS = eINSTANCE.getDatabusStreamFeedPublisher_Status();
+		/**
+		 * The meta object literal for the '<em><b>Username</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_PUBLISHER__USERNAME = eINSTANCE.getDatabusStreamFeedPublisher_Username();
+		/**
+		 * The meta object literal for the '<em><b>Userpwd</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_PUBLISHER__USERPWD = eINSTANCE.getDatabusStreamFeedPublisher_Userpwd();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl <em>Databus Stream Feed Subscriber</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStreamFeedSubscriber()
+		 * @generated
+		 */
+		EClass DATABUS_STREAM_FEED_SUBSCRIBER = eINSTANCE.getDatabusStreamFeedSubscriber();
+		/**
+		 * The meta object literal for the '<em><b>Local Stream Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_SUBSCRIBER__LOCAL_STREAM_ID = eINSTANCE.getDatabusStreamFeedSubscriber_LocalStreamId();
+		/**
+		 * The meta object literal for the '<em><b>Dcae Location Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_SUBSCRIBER__DCAE_LOCATION_NAME = eINSTANCE.getDatabusStreamFeedSubscriber_DcaeLocationName();
+		/**
+		 * The meta object literal for the '<em><b>Other Feed Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_SUBSCRIBER__OTHER_FEED_NAME = eINSTANCE.getDatabusStreamFeedSubscriber_OtherFeedName();
+		/**
+		 * The meta object literal for the '<em><b>Feed Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_SUBSCRIBER__FEED_ID = eINSTANCE.getDatabusStreamFeedSubscriber_FeedId();
+		/**
+		 * The meta object literal for the '<em><b>Log URL</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_SUBSCRIBER__LOG_URL = eINSTANCE.getDatabusStreamFeedSubscriber_LogURL();
+		/**
+		 * The meta object literal for the '<em><b>Owner</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_SUBSCRIBER__OWNER = eINSTANCE.getDatabusStreamFeedSubscriber_Owner();
+		/**
+		 * The meta object literal for the '<em><b>Sub Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_SUBSCRIBER__SUB_ID = eINSTANCE.getDatabusStreamFeedSubscriber_SubId();
+		/**
+		 * The meta object literal for the '<em><b>Suspended</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_SUBSCRIBER__SUSPENDED = eINSTANCE.getDatabusStreamFeedSubscriber_Suspended();
+		/**
+		 * The meta object literal for the '<em><b>Use100</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_SUBSCRIBER__USE100 = eINSTANCE.getDatabusStreamFeedSubscriber_Use100();
+		/**
+		 * The meta object literal for the '<em><b>Username</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_SUBSCRIBER__USERNAME = eINSTANCE.getDatabusStreamFeedSubscriber_Username();
+		/**
+		 * The meta object literal for the '<em><b>Userpwd</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_SUBSCRIBER__USERPWD = eINSTANCE.getDatabusStreamFeedSubscriber_Userpwd();
+		/**
+		 * The meta object literal for the '<em><b>Delivery URL</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_STREAM_FEED_SUBSCRIBER__DELIVERY_URL = eINSTANCE.getDatabusStreamFeedSubscriber_DeliveryURL();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusEntityImpl <em>Databus Entity</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusEntityImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusEntity()
+		 * @generated
+		 */
+		EClass DATABUS_ENTITY = eINSTANCE.getDatabusEntity();
+		/**
+		 * The meta object literal for the '<em><b>Status</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_ENTITY__STATUS = eINSTANCE.getDatabusEntity_Status();
+		/**
+		 * The meta object literal for the '<em><b>Last Modified</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_ENTITY__LAST_MODIFIED = eINSTANCE.getDatabusEntity_LastModified();
+		/**
+		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_ENTITY__TYPE = eINSTANCE.getDatabusEntity_Type();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusLocationImpl <em>Databus Location</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusLocationImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusLocation()
+		 * @generated
+		 */
+		EClass DATABUS_LOCATION = eINSTANCE.getDatabusLocation();
+		/**
+		 * The meta object literal for the '<em><b>Dcae Layer</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_LOCATION__DCAE_LAYER = eINSTANCE.getDatabusLocation_DcaeLayer();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusMessageRouterClusterImpl <em>Databus Message Router Cluster</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusMessageRouterClusterImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusMessageRouterCluster()
+		 * @generated
+		 */
+		EClass DATABUS_MESSAGE_ROUTER_CLUSTER = eINSTANCE.getDatabusMessageRouterCluster();
+		/**
+		 * The meta object literal for the '<em><b>Dcae Location Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_MESSAGE_ROUTER_CLUSTER__DCAE_LOCATION_NAME = eINSTANCE.getDatabusMessageRouterCluster_DcaeLocationName();
+		/**
+		 * The meta object literal for the '<em><b>Service Fqdn</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_MESSAGE_ROUTER_CLUSTER__SERVICE_FQDN = eINSTANCE.getDatabusMessageRouterCluster_ServiceFqdn();
+		/**
+		 * The meta object literal for the '<em><b>Host Fqdn</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_MESSAGE_ROUTER_CLUSTER__HOST_FQDN = eINSTANCE.getDatabusMessageRouterCluster_HostFqdn();
+		/**
+		 * The meta object literal for the '<em><b>Topic Port</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PORT = eINSTANCE.getDatabusMessageRouterCluster_TopicPort();
+		/**
+		 * The meta object literal for the '<em><b>Topic Protocol</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PROTOCOL = eINSTANCE.getDatabusMessageRouterCluster_TopicProtocol();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.impl.DatabusDataRouterNodeImpl <em>Databus Data Router Node</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.impl.DatabusDataRouterNodeImpl
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusDataRouterNode()
+		 * @generated
+		 */
+		EClass DATABUS_DATA_ROUTER_NODE = eINSTANCE.getDatabusDataRouterNode();
+		/**
+		 * The meta object literal for the '<em><b>Dcae Location Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_DATA_ROUTER_NODE__DCAE_LOCATION_NAME = eINSTANCE.getDatabusDataRouterNode_DcaeLocationName();
+		/**
+		 * The meta object literal for the '<em><b>Host Fqdn</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_DATA_ROUTER_NODE__HOST_FQDN = eINSTANCE.getDatabusDataRouterNode_HostFqdn();
+		/**
+		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DATABUS_DATA_ROUTER_NODE__VERSION = eINSTANCE.getDatabusDataRouterNode_Version();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicAction <em>Databus Stream Topic Action</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.DatabusStreamTopicAction
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getDatabusStreamTopicAction()
+		 * @generated
+		 */
+		EEnum DATABUS_STREAM_TOPIC_ACTION = eINSTANCE.getDatabusStreamTopicAction();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.stream.StreamAuthentication <em>Authentication</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.core.stream.StreamAuthentication
+		 * @see org.openecomp.dcae.controller.core.stream.impl.StreamPackageImpl#getStreamAuthentication()
+		 * @generated
+		 */
+		EEnum STREAM_AUTHENTICATION = eINSTANCE.getStreamAuthentication();
+
+	}
+
+} //StreamPackage
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusDataRouterNodeImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusDataRouterNodeImpl.java
new file mode 100644
index 0000000..605ad95
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusDataRouterNodeImpl.java
@@ -0,0 +1,283 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Databus Data Router Node</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusDataRouterNodeImpl#getDcaeLocationName <em>Dcae Location Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusDataRouterNodeImpl#getHostFqdn <em>Host Fqdn</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusDataRouterNodeImpl#getVersion <em>Version</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DatabusDataRouterNodeImpl extends DatabusEntityImpl implements DatabusDataRouterNode {
+	/**
+	 * The default value of the '{@link #getDcaeLocationName() <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DCAE_LOCATION_NAME_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getDcaeLocationName() <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dcaeLocationName = DCAE_LOCATION_NAME_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getHostFqdn() <em>Host Fqdn</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHostFqdn()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HOST_FQDN_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getHostFqdn() <em>Host Fqdn</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHostFqdn()
+	 * @generated
+	 * @ordered
+	 */
+	protected String hostFqdn = HOST_FQDN_EDEFAULT;
+	/**
+	 * 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;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DatabusDataRouterNodeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DATABUS_DATA_ROUTER_NODE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDcaeLocationName() {
+		return dcaeLocationName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDcaeLocationName(String newDcaeLocationName) {
+		String oldDcaeLocationName = dcaeLocationName;
+		dcaeLocationName = newDcaeLocationName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_DATA_ROUTER_NODE__DCAE_LOCATION_NAME, oldDcaeLocationName, dcaeLocationName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHostFqdn() {
+		return hostFqdn;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHostFqdn(String newHostFqdn) {
+		String oldHostFqdn = hostFqdn;
+		hostFqdn = newHostFqdn;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_DATA_ROUTER_NODE__HOST_FQDN, oldHostFqdn, hostFqdn));
+	}
+
+	/**
+	 * <!-- 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, StreamPackage.DATABUS_DATA_ROUTER_NODE__VERSION, oldVersion, version));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE__DCAE_LOCATION_NAME:
+				return getDcaeLocationName();
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE__HOST_FQDN:
+				return getHostFqdn();
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE__VERSION:
+				return getVersion();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE__DCAE_LOCATION_NAME:
+				setDcaeLocationName((String)newValue);
+				return;
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE__HOST_FQDN:
+				setHostFqdn((String)newValue);
+				return;
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE__VERSION:
+				setVersion((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE__DCAE_LOCATION_NAME:
+				setDcaeLocationName(DCAE_LOCATION_NAME_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE__HOST_FQDN:
+				setHostFqdn(HOST_FQDN_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE__VERSION:
+				setVersion(VERSION_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE__DCAE_LOCATION_NAME:
+				return DCAE_LOCATION_NAME_EDEFAULT == null ? dcaeLocationName != null : !DCAE_LOCATION_NAME_EDEFAULT.equals(dcaeLocationName);
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE__HOST_FQDN:
+				return HOST_FQDN_EDEFAULT == null ? hostFqdn != null : !HOST_FQDN_EDEFAULT.equals(hostFqdn);
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE__VERSION:
+				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
+		}
+		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(" (dcaeLocationName: ");
+		result.append(dcaeLocationName);
+		result.append(", hostFqdn: ");
+		result.append(hostFqdn);
+		result.append(", version: ");
+		result.append(version);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DatabusDataRouterNodeImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusEntityImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusEntityImpl.java
new file mode 100644
index 0000000..e4b8a36
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusEntityImpl.java
@@ -0,0 +1,294 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DatabusEntity;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+import java.util.Date;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Databus Entity</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusEntityImpl#getStatus <em>Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusEntityImpl#getLastModified <em>Last Modified</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusEntityImpl#getType <em>Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DatabusEntityImpl extends NamedEntityImpl implements DatabusEntity {
+	/**
+	 * The default value of the '{@link #getStatus() <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STATUS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getStatus() <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected String status = STATUS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getLastModified() <em>Last Modified</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastModified()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Date LAST_MODIFIED_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLastModified() <em>Last Modified</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastModified()
+	 * @generated
+	 * @ordered
+	 */
+	protected Date lastModified = LAST_MODIFIED_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected String type = TYPE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DatabusEntityImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DATABUS_ENTITY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getStatus() {
+		return status;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatus(String newStatus) {
+		String oldStatus = status;
+		status = newStatus;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_ENTITY__STATUS, oldStatus, status));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Date getLastModified() {
+		return lastModified;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLastModified(Date newLastModified) {
+		Date oldLastModified = lastModified;
+		lastModified = newLastModified;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_ENTITY__LAST_MODIFIED, oldLastModified, lastModified));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setType(String newType) {
+		String oldType = type;
+		type = newType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_ENTITY__TYPE, oldType, type));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_ENTITY__STATUS:
+				return getStatus();
+			case StreamPackage.DATABUS_ENTITY__LAST_MODIFIED:
+				return getLastModified();
+			case StreamPackage.DATABUS_ENTITY__TYPE:
+				return getType();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_ENTITY__STATUS:
+				setStatus((String)newValue);
+				return;
+			case StreamPackage.DATABUS_ENTITY__LAST_MODIFIED:
+				setLastModified((Date)newValue);
+				return;
+			case StreamPackage.DATABUS_ENTITY__TYPE:
+				setType((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_ENTITY__STATUS:
+				setStatus(STATUS_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_ENTITY__LAST_MODIFIED:
+				setLastModified(LAST_MODIFIED_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_ENTITY__TYPE:
+				setType(TYPE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_ENTITY__STATUS:
+				return STATUS_EDEFAULT == null ? status != null : !STATUS_EDEFAULT.equals(status);
+			case StreamPackage.DATABUS_ENTITY__LAST_MODIFIED:
+				return LAST_MODIFIED_EDEFAULT == null ? lastModified != null : !LAST_MODIFIED_EDEFAULT.equals(lastModified);
+			case StreamPackage.DATABUS_ENTITY__TYPE:
+				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+		}
+		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(" (status: ");
+		result.append(status);
+		result.append(", lastModified: ");
+		result.append(lastModified);
+		result.append(", type: ");
+		result.append(type);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DatabusEntityImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusLocationImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusLocationImpl.java
new file mode 100644
index 0000000..7699732
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusLocationImpl.java
@@ -0,0 +1,179 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DatabusLocation;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Databus Location</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusLocationImpl#getDcaeLayer <em>Dcae Layer</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DatabusLocationImpl extends DatabusEntityImpl implements DatabusLocation {
+	/**
+	 * The default value of the '{@link #getDcaeLayer() <em>Dcae Layer</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLayer()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DCAE_LAYER_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getDcaeLayer() <em>Dcae Layer</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLayer()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dcaeLayer = DCAE_LAYER_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DatabusLocationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DATABUS_LOCATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDcaeLayer() {
+		return dcaeLayer;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDcaeLayer(String newDcaeLayer) {
+		String oldDcaeLayer = dcaeLayer;
+		dcaeLayer = newDcaeLayer;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_LOCATION__DCAE_LAYER, oldDcaeLayer, dcaeLayer));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_LOCATION__DCAE_LAYER:
+				return getDcaeLayer();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_LOCATION__DCAE_LAYER:
+				setDcaeLayer((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_LOCATION__DCAE_LAYER:
+				setDcaeLayer(DCAE_LAYER_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_LOCATION__DCAE_LAYER:
+				return DCAE_LAYER_EDEFAULT == null ? dcaeLayer != null : !DCAE_LAYER_EDEFAULT.equals(dcaeLayer);
+		}
+		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(" (dcaeLayer: ");
+		result.append(dcaeLayer);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DatabusLocationImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusMessageRouterClusterImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusMessageRouterClusterImpl.java
new file mode 100644
index 0000000..958e545
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusMessageRouterClusterImpl.java
@@ -0,0 +1,375 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Databus Message Router Cluster</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusMessageRouterClusterImpl#getDcaeLocationName <em>Dcae Location Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusMessageRouterClusterImpl#getServiceFqdn <em>Service Fqdn</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusMessageRouterClusterImpl#getHostFqdn <em>Host Fqdn</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusMessageRouterClusterImpl#getTopicPort <em>Topic Port</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusMessageRouterClusterImpl#getTopicProtocol <em>Topic Protocol</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DatabusMessageRouterClusterImpl extends DatabusEntityImpl implements DatabusMessageRouterCluster {
+	/**
+	 * The default value of the '{@link #getDcaeLocationName() <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DCAE_LOCATION_NAME_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getDcaeLocationName() <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dcaeLocationName = DCAE_LOCATION_NAME_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getServiceFqdn() <em>Service Fqdn</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceFqdn()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SERVICE_FQDN_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getServiceFqdn() <em>Service Fqdn</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceFqdn()
+	 * @generated
+	 * @ordered
+	 */
+	protected String serviceFqdn = SERVICE_FQDN_EDEFAULT;
+	/**
+	 * The cached value of the '{@link #getHostFqdn() <em>Host Fqdn</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHostFqdn()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> hostFqdn;
+
+	/**
+	 * The default value of the '{@link #getTopicPort() <em>Topic Port</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTopicPort()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TOPIC_PORT_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getTopicPort() <em>Topic Port</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTopicPort()
+	 * @generated
+	 * @ordered
+	 */
+	protected String topicPort = TOPIC_PORT_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getTopicProtocol() <em>Topic Protocol</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTopicProtocol()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TOPIC_PROTOCOL_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getTopicProtocol() <em>Topic Protocol</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTopicProtocol()
+	 * @generated
+	 * @ordered
+	 */
+	protected String topicProtocol = TOPIC_PROTOCOL_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DatabusMessageRouterClusterImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DATABUS_MESSAGE_ROUTER_CLUSTER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDcaeLocationName() {
+		return dcaeLocationName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDcaeLocationName(String newDcaeLocationName) {
+		String oldDcaeLocationName = dcaeLocationName;
+		dcaeLocationName = newDcaeLocationName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__DCAE_LOCATION_NAME, oldDcaeLocationName, dcaeLocationName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getServiceFqdn() {
+		return serviceFqdn;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServiceFqdn(String newServiceFqdn) {
+		String oldServiceFqdn = serviceFqdn;
+		serviceFqdn = newServiceFqdn;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__SERVICE_FQDN, oldServiceFqdn, serviceFqdn));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<String> getHostFqdn() {
+		if (hostFqdn == null) {
+			hostFqdn = new EDataTypeEList<String>(String.class, this, StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__HOST_FQDN);
+		}
+		return hostFqdn;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getTopicPort() {
+		return topicPort;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTopicPort(String newTopicPort) {
+		String oldTopicPort = topicPort;
+		topicPort = newTopicPort;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PORT, oldTopicPort, topicPort));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getTopicProtocol() {
+		return topicProtocol;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTopicProtocol(String newTopicProtocol) {
+		String oldTopicProtocol = topicProtocol;
+		topicProtocol = newTopicProtocol;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PROTOCOL, oldTopicProtocol, topicProtocol));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__DCAE_LOCATION_NAME:
+				return getDcaeLocationName();
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__SERVICE_FQDN:
+				return getServiceFqdn();
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__HOST_FQDN:
+				return getHostFqdn();
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PORT:
+				return getTopicPort();
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PROTOCOL:
+				return getTopicProtocol();
+		}
+		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 StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__DCAE_LOCATION_NAME:
+				setDcaeLocationName((String)newValue);
+				return;
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__SERVICE_FQDN:
+				setServiceFqdn((String)newValue);
+				return;
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__HOST_FQDN:
+				getHostFqdn().clear();
+				getHostFqdn().addAll((Collection<? extends String>)newValue);
+				return;
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PORT:
+				setTopicPort((String)newValue);
+				return;
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PROTOCOL:
+				setTopicProtocol((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__DCAE_LOCATION_NAME:
+				setDcaeLocationName(DCAE_LOCATION_NAME_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__SERVICE_FQDN:
+				setServiceFqdn(SERVICE_FQDN_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__HOST_FQDN:
+				getHostFqdn().clear();
+				return;
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PORT:
+				setTopicPort(TOPIC_PORT_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PROTOCOL:
+				setTopicProtocol(TOPIC_PROTOCOL_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__DCAE_LOCATION_NAME:
+				return DCAE_LOCATION_NAME_EDEFAULT == null ? dcaeLocationName != null : !DCAE_LOCATION_NAME_EDEFAULT.equals(dcaeLocationName);
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__SERVICE_FQDN:
+				return SERVICE_FQDN_EDEFAULT == null ? serviceFqdn != null : !SERVICE_FQDN_EDEFAULT.equals(serviceFqdn);
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__HOST_FQDN:
+				return hostFqdn != null && !hostFqdn.isEmpty();
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PORT:
+				return TOPIC_PORT_EDEFAULT == null ? topicPort != null : !TOPIC_PORT_EDEFAULT.equals(topicPort);
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PROTOCOL:
+				return TOPIC_PROTOCOL_EDEFAULT == null ? topicProtocol != null : !TOPIC_PROTOCOL_EDEFAULT.equals(topicProtocol);
+		}
+		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(" (dcaeLocationName: ");
+		result.append(dcaeLocationName);
+		result.append(", serviceFqdn: ");
+		result.append(serviceFqdn);
+		result.append(", hostFqdn: ");
+		result.append(hostFqdn);
+		result.append(", topicPort: ");
+		result.append(topicPort);
+		result.append(", topicProtocol: ");
+		result.append(topicProtocol);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DatabusMessageRouterClusterImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamFeedImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamFeedImpl.java
new file mode 100644
index 0000000..7bc9a2d
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamFeedImpl.java
@@ -0,0 +1,791 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DatabusStreamFeed;
+import org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher;
+import org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Databus Stream Feed</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl#getFeedName <em>Feed Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl#getFeedVersion <em>Feed Version</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl#getFeedDescription <em>Feed Description</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl#getAsprClassification <em>Aspr Classification</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl#getFeedId <em>Feed Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl#getLogURL <em>Log URL</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl#getPublishURL <em>Publish URL</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl#getSubscribeURL <em>Subscribe URL</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl#getStatus <em>Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl#getSuspended <em>Suspended</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl#getPublishers <em>Publishers</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedImpl#getSubscribers <em>Subscribers</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DatabusStreamFeedImpl extends DatabusStreamImpl implements DatabusStreamFeed {
+	/**
+	 * The default value of the '{@link #getFeedName() <em>Feed Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFeedName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FEED_NAME_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getFeedName() <em>Feed Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFeedName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String feedName = FEED_NAME_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getFeedVersion() <em>Feed Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFeedVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FEED_VERSION_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getFeedVersion() <em>Feed Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFeedVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected String feedVersion = FEED_VERSION_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getFeedDescription() <em>Feed Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFeedDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FEED_DESCRIPTION_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getFeedDescription() <em>Feed Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFeedDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String feedDescription = FEED_DESCRIPTION_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getAsprClassification() <em>Aspr Classification</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAsprClassification()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ASPR_CLASSIFICATION_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getAsprClassification() <em>Aspr Classification</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAsprClassification()
+	 * @generated
+	 * @ordered
+	 */
+	protected String asprClassification = ASPR_CLASSIFICATION_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getOwner() <em>Owner</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwner()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String OWNER_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getOwner() <em>Owner</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwner()
+	 * @generated
+	 * @ordered
+	 */
+	protected String owner = OWNER_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getFeedId() <em>Feed Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFeedId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FEED_ID_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getFeedId() <em>Feed Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFeedId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String feedId = FEED_ID_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getLogURL() <em>Log URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLogURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LOG_URL_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getLogURL() <em>Log URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLogURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected String logURL = LOG_URL_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getPublishURL() <em>Publish URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPublishURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String PUBLISH_URL_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getPublishURL() <em>Publish URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPublishURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected String publishURL = PUBLISH_URL_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getSubscribeURL() <em>Subscribe URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSubscribeURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SUBSCRIBE_URL_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getSubscribeURL() <em>Subscribe URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSubscribeURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected String subscribeURL = SUBSCRIBE_URL_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getStatus() <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STATUS_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getStatus() <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected String status = STATUS_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getSuspended() <em>Suspended</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSuspended()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SUSPENDED_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getSuspended() <em>Suspended</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSuspended()
+	 * @generated
+	 * @ordered
+	 */
+	protected String suspended = SUSPENDED_EDEFAULT;
+	/**
+	 * The cached value of the '{@link #getPublishers() <em>Publishers</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPublishers()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<DatabusStreamFeedPublisher> publishers;
+	/**
+	 * The cached value of the '{@link #getSubscribers() <em>Subscribers</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSubscribers()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<DatabusStreamFeedSubscriber> subscribers;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DatabusStreamFeedImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DATABUS_STREAM_FEED;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFeedName() {
+		return feedName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFeedName(String newFeedName) {
+		String oldFeedName = feedName;
+		feedName = newFeedName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED__FEED_NAME, oldFeedName, feedName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFeedVersion() {
+		return feedVersion;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFeedVersion(String newFeedVersion) {
+		String oldFeedVersion = feedVersion;
+		feedVersion = newFeedVersion;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED__FEED_VERSION, oldFeedVersion, feedVersion));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFeedDescription() {
+		return feedDescription;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFeedDescription(String newFeedDescription) {
+		String oldFeedDescription = feedDescription;
+		feedDescription = newFeedDescription;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED__FEED_DESCRIPTION, oldFeedDescription, feedDescription));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAsprClassification() {
+		return asprClassification;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAsprClassification(String newAsprClassification) {
+		String oldAsprClassification = asprClassification;
+		asprClassification = newAsprClassification;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED__ASPR_CLASSIFICATION, oldAsprClassification, asprClassification));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getOwner() {
+		return owner;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOwner(String newOwner) {
+		String oldOwner = owner;
+		owner = newOwner;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED__OWNER, oldOwner, owner));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFeedId() {
+		return feedId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFeedId(String newFeedId) {
+		String oldFeedId = feedId;
+		feedId = newFeedId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED__FEED_ID, oldFeedId, feedId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLogURL() {
+		return logURL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLogURL(String newLogURL) {
+		String oldLogURL = logURL;
+		logURL = newLogURL;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED__LOG_URL, oldLogURL, logURL));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPublishURL() {
+		return publishURL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPublishURL(String newPublishURL) {
+		String oldPublishURL = publishURL;
+		publishURL = newPublishURL;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED__PUBLISH_URL, oldPublishURL, publishURL));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getSubscribeURL() {
+		return subscribeURL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSubscribeURL(String newSubscribeURL) {
+		String oldSubscribeURL = subscribeURL;
+		subscribeURL = newSubscribeURL;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED__SUBSCRIBE_URL, oldSubscribeURL, subscribeURL));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getStatus() {
+		return status;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatus(String newStatus) {
+		String oldStatus = status;
+		status = newStatus;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED__STATUS, oldStatus, status));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getSuspended() {
+		return suspended;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSuspended(String newSuspended) {
+		String oldSuspended = suspended;
+		suspended = newSuspended;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED__SUSPENDED, oldSuspended, suspended));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<DatabusStreamFeedPublisher> getPublishers() {
+		if (publishers == null) {
+			publishers = new EObjectContainmentEList<DatabusStreamFeedPublisher>(DatabusStreamFeedPublisher.class, this, StreamPackage.DATABUS_STREAM_FEED__PUBLISHERS);
+		}
+		return publishers;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<DatabusStreamFeedSubscriber> getSubscribers() {
+		if (subscribers == null) {
+			subscribers = new EObjectContainmentEList<DatabusStreamFeedSubscriber>(DatabusStreamFeedSubscriber.class, this, StreamPackage.DATABUS_STREAM_FEED__SUBSCRIBERS);
+		}
+		return subscribers;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_FEED__PUBLISHERS:
+				return ((InternalEList<?>)getPublishers()).basicRemove(otherEnd, msgs);
+			case StreamPackage.DATABUS_STREAM_FEED__SUBSCRIBERS:
+				return ((InternalEList<?>)getSubscribers()).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 StreamPackage.DATABUS_STREAM_FEED__FEED_NAME:
+				return getFeedName();
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_VERSION:
+				return getFeedVersion();
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_DESCRIPTION:
+				return getFeedDescription();
+			case StreamPackage.DATABUS_STREAM_FEED__ASPR_CLASSIFICATION:
+				return getAsprClassification();
+			case StreamPackage.DATABUS_STREAM_FEED__OWNER:
+				return getOwner();
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_ID:
+				return getFeedId();
+			case StreamPackage.DATABUS_STREAM_FEED__LOG_URL:
+				return getLogURL();
+			case StreamPackage.DATABUS_STREAM_FEED__PUBLISH_URL:
+				return getPublishURL();
+			case StreamPackage.DATABUS_STREAM_FEED__SUBSCRIBE_URL:
+				return getSubscribeURL();
+			case StreamPackage.DATABUS_STREAM_FEED__STATUS:
+				return getStatus();
+			case StreamPackage.DATABUS_STREAM_FEED__SUSPENDED:
+				return getSuspended();
+			case StreamPackage.DATABUS_STREAM_FEED__PUBLISHERS:
+				return getPublishers();
+			case StreamPackage.DATABUS_STREAM_FEED__SUBSCRIBERS:
+				return getSubscribers();
+		}
+		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 StreamPackage.DATABUS_STREAM_FEED__FEED_NAME:
+				setFeedName((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_VERSION:
+				setFeedVersion((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_DESCRIPTION:
+				setFeedDescription((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__ASPR_CLASSIFICATION:
+				setAsprClassification((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__OWNER:
+				setOwner((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_ID:
+				setFeedId((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__LOG_URL:
+				setLogURL((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__PUBLISH_URL:
+				setPublishURL((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__SUBSCRIBE_URL:
+				setSubscribeURL((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__STATUS:
+				setStatus((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__SUSPENDED:
+				setSuspended((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__PUBLISHERS:
+				getPublishers().clear();
+				getPublishers().addAll((Collection<? extends DatabusStreamFeedPublisher>)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__SUBSCRIBERS:
+				getSubscribers().clear();
+				getSubscribers().addAll((Collection<? extends DatabusStreamFeedSubscriber>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_NAME:
+				setFeedName(FEED_NAME_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_VERSION:
+				setFeedVersion(FEED_VERSION_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_DESCRIPTION:
+				setFeedDescription(FEED_DESCRIPTION_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__ASPR_CLASSIFICATION:
+				setAsprClassification(ASPR_CLASSIFICATION_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__OWNER:
+				setOwner(OWNER_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_ID:
+				setFeedId(FEED_ID_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__LOG_URL:
+				setLogURL(LOG_URL_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__PUBLISH_URL:
+				setPublishURL(PUBLISH_URL_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__SUBSCRIBE_URL:
+				setSubscribeURL(SUBSCRIBE_URL_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__STATUS:
+				setStatus(STATUS_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__SUSPENDED:
+				setSuspended(SUSPENDED_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__PUBLISHERS:
+				getPublishers().clear();
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED__SUBSCRIBERS:
+				getSubscribers().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_NAME:
+				return FEED_NAME_EDEFAULT == null ? feedName != null : !FEED_NAME_EDEFAULT.equals(feedName);
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_VERSION:
+				return FEED_VERSION_EDEFAULT == null ? feedVersion != null : !FEED_VERSION_EDEFAULT.equals(feedVersion);
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_DESCRIPTION:
+				return FEED_DESCRIPTION_EDEFAULT == null ? feedDescription != null : !FEED_DESCRIPTION_EDEFAULT.equals(feedDescription);
+			case StreamPackage.DATABUS_STREAM_FEED__ASPR_CLASSIFICATION:
+				return ASPR_CLASSIFICATION_EDEFAULT == null ? asprClassification != null : !ASPR_CLASSIFICATION_EDEFAULT.equals(asprClassification);
+			case StreamPackage.DATABUS_STREAM_FEED__OWNER:
+				return OWNER_EDEFAULT == null ? owner != null : !OWNER_EDEFAULT.equals(owner);
+			case StreamPackage.DATABUS_STREAM_FEED__FEED_ID:
+				return FEED_ID_EDEFAULT == null ? feedId != null : !FEED_ID_EDEFAULT.equals(feedId);
+			case StreamPackage.DATABUS_STREAM_FEED__LOG_URL:
+				return LOG_URL_EDEFAULT == null ? logURL != null : !LOG_URL_EDEFAULT.equals(logURL);
+			case StreamPackage.DATABUS_STREAM_FEED__PUBLISH_URL:
+				return PUBLISH_URL_EDEFAULT == null ? publishURL != null : !PUBLISH_URL_EDEFAULT.equals(publishURL);
+			case StreamPackage.DATABUS_STREAM_FEED__SUBSCRIBE_URL:
+				return SUBSCRIBE_URL_EDEFAULT == null ? subscribeURL != null : !SUBSCRIBE_URL_EDEFAULT.equals(subscribeURL);
+			case StreamPackage.DATABUS_STREAM_FEED__STATUS:
+				return STATUS_EDEFAULT == null ? status != null : !STATUS_EDEFAULT.equals(status);
+			case StreamPackage.DATABUS_STREAM_FEED__SUSPENDED:
+				return SUSPENDED_EDEFAULT == null ? suspended != null : !SUSPENDED_EDEFAULT.equals(suspended);
+			case StreamPackage.DATABUS_STREAM_FEED__PUBLISHERS:
+				return publishers != null && !publishers.isEmpty();
+			case StreamPackage.DATABUS_STREAM_FEED__SUBSCRIBERS:
+				return subscribers != null && !subscribers.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(" (feedName: ");
+		result.append(feedName);
+		result.append(", feedVersion: ");
+		result.append(feedVersion);
+		result.append(", feedDescription: ");
+		result.append(feedDescription);
+		result.append(", asprClassification: ");
+		result.append(asprClassification);
+		result.append(", owner: ");
+		result.append(owner);
+		result.append(", feedId: ");
+		result.append(feedId);
+		result.append(", logURL: ");
+		result.append(logURL);
+		result.append(", publishURL: ");
+		result.append(publishURL);
+		result.append(", subscribeURL: ");
+		result.append(subscribeURL);
+		result.append(", status: ");
+		result.append(status);
+		result.append(", suspended: ");
+		result.append(suspended);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DatabusStreamFeedImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamFeedPublisherImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamFeedPublisherImpl.java
new file mode 100644
index 0000000..bf33b26
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamFeedPublisherImpl.java
@@ -0,0 +1,505 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Databus Stream Feed Publisher</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedPublisherImpl#getLocalStreamId <em>Local Stream Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedPublisherImpl#getDcaeLocationName <em>Dcae Location Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedPublisherImpl#getFeedId <em>Feed Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedPublisherImpl#getPubId <em>Pub Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedPublisherImpl#getStatus <em>Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedPublisherImpl#getUsername <em>Username</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedPublisherImpl#getUserpwd <em>Userpwd</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DatabusStreamFeedPublisherImpl extends NamedEntityImpl implements DatabusStreamFeedPublisher {
+	/**
+	 * The default value of the '{@link #getLocalStreamId() <em>Local Stream Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalStreamId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LOCAL_STREAM_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLocalStreamId() <em>Local Stream Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalStreamId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String localStreamId = LOCAL_STREAM_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDcaeLocationName() <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DCAE_LOCATION_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDcaeLocationName() <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dcaeLocationName = DCAE_LOCATION_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFeedId() <em>Feed Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFeedId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FEED_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getFeedId() <em>Feed Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFeedId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String feedId = FEED_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPubId() <em>Pub Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPubId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String PUB_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPubId() <em>Pub Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPubId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String pubId = PUB_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getStatus() <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STATUS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getStatus() <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected String status = STATUS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getUsername() <em>Username</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUsername()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String USERNAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getUsername() <em>Username</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUsername()
+	 * @generated
+	 * @ordered
+	 */
+	protected String username = USERNAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getUserpwd() <em>Userpwd</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUserpwd()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String USERPWD_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getUserpwd() <em>Userpwd</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUserpwd()
+	 * @generated
+	 * @ordered
+	 */
+	protected String userpwd = USERPWD_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DatabusStreamFeedPublisherImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DATABUS_STREAM_FEED_PUBLISHER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLocalStreamId() {
+		return localStreamId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLocalStreamId(String newLocalStreamId) {
+		String oldLocalStreamId = localStreamId;
+		localStreamId = newLocalStreamId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__LOCAL_STREAM_ID, oldLocalStreamId, localStreamId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDcaeLocationName() {
+		return dcaeLocationName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDcaeLocationName(String newDcaeLocationName) {
+		String oldDcaeLocationName = dcaeLocationName;
+		dcaeLocationName = newDcaeLocationName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__DCAE_LOCATION_NAME, oldDcaeLocationName, dcaeLocationName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFeedId() {
+		return feedId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFeedId(String newFeedId) {
+		String oldFeedId = feedId;
+		feedId = newFeedId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__FEED_ID, oldFeedId, feedId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPubId() {
+		return pubId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPubId(String newPubId) {
+		String oldPubId = pubId;
+		pubId = newPubId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__PUB_ID, oldPubId, pubId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getStatus() {
+		return status;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatus(String newStatus) {
+		String oldStatus = status;
+		status = newStatus;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__STATUS, oldStatus, status));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getUsername() {
+		return username;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUsername(String newUsername) {
+		String oldUsername = username;
+		username = newUsername;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__USERNAME, oldUsername, username));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getUserpwd() {
+		return userpwd;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUserpwd(String newUserpwd) {
+		String oldUserpwd = userpwd;
+		userpwd = newUserpwd;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__USERPWD, oldUserpwd, userpwd));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__LOCAL_STREAM_ID:
+				return getLocalStreamId();
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__DCAE_LOCATION_NAME:
+				return getDcaeLocationName();
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__FEED_ID:
+				return getFeedId();
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__PUB_ID:
+				return getPubId();
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__STATUS:
+				return getStatus();
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__USERNAME:
+				return getUsername();
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__USERPWD:
+				return getUserpwd();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__LOCAL_STREAM_ID:
+				setLocalStreamId((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__DCAE_LOCATION_NAME:
+				setDcaeLocationName((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__FEED_ID:
+				setFeedId((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__PUB_ID:
+				setPubId((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__STATUS:
+				setStatus((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__USERNAME:
+				setUsername((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__USERPWD:
+				setUserpwd((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__LOCAL_STREAM_ID:
+				setLocalStreamId(LOCAL_STREAM_ID_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__DCAE_LOCATION_NAME:
+				setDcaeLocationName(DCAE_LOCATION_NAME_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__FEED_ID:
+				setFeedId(FEED_ID_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__PUB_ID:
+				setPubId(PUB_ID_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__STATUS:
+				setStatus(STATUS_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__USERNAME:
+				setUsername(USERNAME_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__USERPWD:
+				setUserpwd(USERPWD_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__LOCAL_STREAM_ID:
+				return LOCAL_STREAM_ID_EDEFAULT == null ? localStreamId != null : !LOCAL_STREAM_ID_EDEFAULT.equals(localStreamId);
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__DCAE_LOCATION_NAME:
+				return DCAE_LOCATION_NAME_EDEFAULT == null ? dcaeLocationName != null : !DCAE_LOCATION_NAME_EDEFAULT.equals(dcaeLocationName);
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__FEED_ID:
+				return FEED_ID_EDEFAULT == null ? feedId != null : !FEED_ID_EDEFAULT.equals(feedId);
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__PUB_ID:
+				return PUB_ID_EDEFAULT == null ? pubId != null : !PUB_ID_EDEFAULT.equals(pubId);
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__STATUS:
+				return STATUS_EDEFAULT == null ? status != null : !STATUS_EDEFAULT.equals(status);
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__USERNAME:
+				return USERNAME_EDEFAULT == null ? username != null : !USERNAME_EDEFAULT.equals(username);
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER__USERPWD:
+				return USERPWD_EDEFAULT == null ? userpwd != null : !USERPWD_EDEFAULT.equals(userpwd);
+		}
+		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(" (localStreamId: ");
+		result.append(localStreamId);
+		result.append(", dcaeLocationName: ");
+		result.append(dcaeLocationName);
+		result.append(", feedId: ");
+		result.append(feedId);
+		result.append(", pubId: ");
+		result.append(pubId);
+		result.append(", status: ");
+		result.append(status);
+		result.append(", username: ");
+		result.append(username);
+		result.append(", userpwd: ");
+		result.append(userpwd);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DatabusStreamFeedPublisherImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamFeedSubscriberImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamFeedSubscriberImpl.java
new file mode 100644
index 0000000..ea2427b
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamFeedSubscriberImpl.java
@@ -0,0 +1,775 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Databus Stream Feed Subscriber</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl#getLocalStreamId <em>Local Stream Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl#getDcaeLocationName <em>Dcae Location Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl#getOtherFeedName <em>Other Feed Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl#getFeedId <em>Feed Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl#getLogURL <em>Log URL</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl#getSubId <em>Sub Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl#isSuspended <em>Suspended</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl#isUse100 <em>Use100</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl#getUsername <em>Username</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl#getUserpwd <em>Userpwd</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamFeedSubscriberImpl#getDeliveryURL <em>Delivery URL</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DatabusStreamFeedSubscriberImpl extends NamedEntityImpl implements DatabusStreamFeedSubscriber {
+	/**
+	 * The default value of the '{@link #getLocalStreamId() <em>Local Stream Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalStreamId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LOCAL_STREAM_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLocalStreamId() <em>Local Stream Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalStreamId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String localStreamId = LOCAL_STREAM_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDcaeLocationName() <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DCAE_LOCATION_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDcaeLocationName() <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dcaeLocationName = DCAE_LOCATION_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getOtherFeedName() <em>Other Feed Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOtherFeedName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String OTHER_FEED_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getOtherFeedName() <em>Other Feed Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOtherFeedName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String otherFeedName = OTHER_FEED_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFeedId() <em>Feed Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFeedId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FEED_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getFeedId() <em>Feed Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFeedId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String feedId = FEED_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getLogURL() <em>Log URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLogURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LOG_URL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLogURL() <em>Log URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLogURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected String logURL = LOG_URL_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getOwner() <em>Owner</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwner()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String OWNER_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getOwner() <em>Owner</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwner()
+	 * @generated
+	 * @ordered
+	 */
+	protected String owner = OWNER_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getSubId() <em>Sub Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSubId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SUB_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getSubId() <em>Sub Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSubId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String subId = SUB_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isSuspended() <em>Suspended</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSuspended()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean SUSPENDED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isSuspended() <em>Suspended</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSuspended()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean suspended = SUSPENDED_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isUse100() <em>Use100</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isUse100()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean USE100_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isUse100() <em>Use100</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isUse100()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean use100 = USE100_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getUsername() <em>Username</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUsername()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String USERNAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getUsername() <em>Username</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUsername()
+	 * @generated
+	 * @ordered
+	 */
+	protected String username = USERNAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getUserpwd() <em>Userpwd</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUserpwd()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String USERPWD_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getUserpwd() <em>Userpwd</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUserpwd()
+	 * @generated
+	 * @ordered
+	 */
+	protected String userpwd = USERPWD_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDeliveryURL() <em>Delivery URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeliveryURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DELIVERY_URL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDeliveryURL() <em>Delivery URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeliveryURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected String deliveryURL = DELIVERY_URL_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DatabusStreamFeedSubscriberImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DATABUS_STREAM_FEED_SUBSCRIBER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLocalStreamId() {
+		return localStreamId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLocalStreamId(String newLocalStreamId) {
+		String oldLocalStreamId = localStreamId;
+		localStreamId = newLocalStreamId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__LOCAL_STREAM_ID, oldLocalStreamId, localStreamId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDcaeLocationName() {
+		return dcaeLocationName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDcaeLocationName(String newDcaeLocationName) {
+		String oldDcaeLocationName = dcaeLocationName;
+		dcaeLocationName = newDcaeLocationName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__DCAE_LOCATION_NAME, oldDcaeLocationName, dcaeLocationName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getOtherFeedName() {
+		return otherFeedName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOtherFeedName(String newOtherFeedName) {
+		String oldOtherFeedName = otherFeedName;
+		otherFeedName = newOtherFeedName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__OTHER_FEED_NAME, oldOtherFeedName, otherFeedName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFeedId() {
+		return feedId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFeedId(String newFeedId) {
+		String oldFeedId = feedId;
+		feedId = newFeedId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__FEED_ID, oldFeedId, feedId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLogURL() {
+		return logURL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLogURL(String newLogURL) {
+		String oldLogURL = logURL;
+		logURL = newLogURL;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__LOG_URL, oldLogURL, logURL));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getOwner() {
+		return owner;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOwner(String newOwner) {
+		String oldOwner = owner;
+		owner = newOwner;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__OWNER, oldOwner, owner));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getSubId() {
+		return subId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSubId(String newSubId) {
+		String oldSubId = subId;
+		subId = newSubId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__SUB_ID, oldSubId, subId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSuspended() {
+		return suspended;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSuspended(boolean newSuspended) {
+		boolean oldSuspended = suspended;
+		suspended = newSuspended;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__SUSPENDED, oldSuspended, suspended));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isUse100() {
+		return use100;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUse100(boolean newUse100) {
+		boolean oldUse100 = use100;
+		use100 = newUse100;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USE100, oldUse100, use100));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getUsername() {
+		return username;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUsername(String newUsername) {
+		String oldUsername = username;
+		username = newUsername;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USERNAME, oldUsername, username));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getUserpwd() {
+		return userpwd;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUserpwd(String newUserpwd) {
+		String oldUserpwd = userpwd;
+		userpwd = newUserpwd;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USERPWD, oldUserpwd, userpwd));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDeliveryURL() {
+		return deliveryURL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDeliveryURL(String newDeliveryURL) {
+		String oldDeliveryURL = deliveryURL;
+		deliveryURL = newDeliveryURL;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__DELIVERY_URL, oldDeliveryURL, deliveryURL));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__LOCAL_STREAM_ID:
+				return getLocalStreamId();
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__DCAE_LOCATION_NAME:
+				return getDcaeLocationName();
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__OTHER_FEED_NAME:
+				return getOtherFeedName();
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__FEED_ID:
+				return getFeedId();
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__LOG_URL:
+				return getLogURL();
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__OWNER:
+				return getOwner();
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__SUB_ID:
+				return getSubId();
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__SUSPENDED:
+				return isSuspended();
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USE100:
+				return isUse100();
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USERNAME:
+				return getUsername();
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USERPWD:
+				return getUserpwd();
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__DELIVERY_URL:
+				return getDeliveryURL();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__LOCAL_STREAM_ID:
+				setLocalStreamId((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__DCAE_LOCATION_NAME:
+				setDcaeLocationName((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__OTHER_FEED_NAME:
+				setOtherFeedName((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__FEED_ID:
+				setFeedId((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__LOG_URL:
+				setLogURL((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__OWNER:
+				setOwner((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__SUB_ID:
+				setSubId((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__SUSPENDED:
+				setSuspended((Boolean)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USE100:
+				setUse100((Boolean)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USERNAME:
+				setUsername((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USERPWD:
+				setUserpwd((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__DELIVERY_URL:
+				setDeliveryURL((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__LOCAL_STREAM_ID:
+				setLocalStreamId(LOCAL_STREAM_ID_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__DCAE_LOCATION_NAME:
+				setDcaeLocationName(DCAE_LOCATION_NAME_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__OTHER_FEED_NAME:
+				setOtherFeedName(OTHER_FEED_NAME_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__FEED_ID:
+				setFeedId(FEED_ID_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__LOG_URL:
+				setLogURL(LOG_URL_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__OWNER:
+				setOwner(OWNER_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__SUB_ID:
+				setSubId(SUB_ID_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__SUSPENDED:
+				setSuspended(SUSPENDED_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USE100:
+				setUse100(USE100_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USERNAME:
+				setUsername(USERNAME_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USERPWD:
+				setUserpwd(USERPWD_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__DELIVERY_URL:
+				setDeliveryURL(DELIVERY_URL_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__LOCAL_STREAM_ID:
+				return LOCAL_STREAM_ID_EDEFAULT == null ? localStreamId != null : !LOCAL_STREAM_ID_EDEFAULT.equals(localStreamId);
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__DCAE_LOCATION_NAME:
+				return DCAE_LOCATION_NAME_EDEFAULT == null ? dcaeLocationName != null : !DCAE_LOCATION_NAME_EDEFAULT.equals(dcaeLocationName);
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__OTHER_FEED_NAME:
+				return OTHER_FEED_NAME_EDEFAULT == null ? otherFeedName != null : !OTHER_FEED_NAME_EDEFAULT.equals(otherFeedName);
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__FEED_ID:
+				return FEED_ID_EDEFAULT == null ? feedId != null : !FEED_ID_EDEFAULT.equals(feedId);
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__LOG_URL:
+				return LOG_URL_EDEFAULT == null ? logURL != null : !LOG_URL_EDEFAULT.equals(logURL);
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__OWNER:
+				return OWNER_EDEFAULT == null ? owner != null : !OWNER_EDEFAULT.equals(owner);
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__SUB_ID:
+				return SUB_ID_EDEFAULT == null ? subId != null : !SUB_ID_EDEFAULT.equals(subId);
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__SUSPENDED:
+				return suspended != SUSPENDED_EDEFAULT;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USE100:
+				return use100 != USE100_EDEFAULT;
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USERNAME:
+				return USERNAME_EDEFAULT == null ? username != null : !USERNAME_EDEFAULT.equals(username);
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__USERPWD:
+				return USERPWD_EDEFAULT == null ? userpwd != null : !USERPWD_EDEFAULT.equals(userpwd);
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER__DELIVERY_URL:
+				return DELIVERY_URL_EDEFAULT == null ? deliveryURL != null : !DELIVERY_URL_EDEFAULT.equals(deliveryURL);
+		}
+		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(" (localStreamId: ");
+		result.append(localStreamId);
+		result.append(", dcaeLocationName: ");
+		result.append(dcaeLocationName);
+		result.append(", otherFeedName: ");
+		result.append(otherFeedName);
+		result.append(", feedId: ");
+		result.append(feedId);
+		result.append(", logURL: ");
+		result.append(logURL);
+		result.append(", owner: ");
+		result.append(owner);
+		result.append(", subId: ");
+		result.append(subId);
+		result.append(", suspended: ");
+		result.append(suspended);
+		result.append(", use100: ");
+		result.append(use100);
+		result.append(", username: ");
+		result.append(username);
+		result.append(", userpwd: ");
+		result.append(userpwd);
+		result.append(", deliveryURL: ");
+		result.append(deliveryURL);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DatabusStreamFeedSubscriberImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamImpl.java
new file mode 100644
index 0000000..40a142a
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamImpl.java
@@ -0,0 +1,62 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DatabusStream;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Databus Stream</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class DatabusStreamImpl extends NamedEntityImpl implements DatabusStream {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DatabusStreamImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DATABUS_STREAM;
+	}
+
+} //DatabusStreamImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamTopicClientImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamTopicClientImpl.java
new file mode 100644
index 0000000..b412b3e
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamTopicClientImpl.java
@@ -0,0 +1,605 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DatabusStreamTopicAction;
+import org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EDataTypeEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Databus Stream Topic Client</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicClientImpl#getLocalStreamId <em>Local Stream Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicClientImpl#getDcaeLocationName <em>Dcae Location Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicClientImpl#getClientRole <em>Client Role</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicClientImpl#getAction <em>Action</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicClientImpl#getUsername <em>Username</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicClientImpl#getUserpwd <em>Userpwd</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicClientImpl#getFqtn <em>Fqtn</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicClientImpl#getMrClientId <em>Mr Client Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicClientImpl#getTopicURL <em>Topic URL</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DatabusStreamTopicClientImpl extends DatabusStreamImpl implements DatabusStreamTopicClient {
+	/**
+	 * The default value of the '{@link #getLocalStreamId() <em>Local Stream Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalStreamId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LOCAL_STREAM_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLocalStreamId() <em>Local Stream Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalStreamId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String localStreamId = LOCAL_STREAM_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDcaeLocationName() <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DCAE_LOCATION_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDcaeLocationName() <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dcaeLocationName = DCAE_LOCATION_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getClientRole() <em>Client Role</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getClientRole()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CLIENT_ROLE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getClientRole() <em>Client Role</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getClientRole()
+	 * @generated
+	 * @ordered
+	 */
+	protected String clientRole = CLIENT_ROLE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getAction() <em>Action</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAction()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<DatabusStreamTopicAction> action;
+
+	/**
+	 * The default value of the '{@link #getUsername() <em>Username</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUsername()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String USERNAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getUsername() <em>Username</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUsername()
+	 * @generated
+	 * @ordered
+	 */
+	protected String username = USERNAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getUserpwd() <em>Userpwd</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUserpwd()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String USERPWD_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getUserpwd() <em>Userpwd</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUserpwd()
+	 * @generated
+	 * @ordered
+	 */
+	protected String userpwd = USERPWD_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFqtn() <em>Fqtn</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFqtn()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FQTN_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getFqtn() <em>Fqtn</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFqtn()
+	 * @generated
+	 * @ordered
+	 */
+	protected String fqtn = FQTN_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getMrClientId() <em>Mr Client Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMrClientId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String MR_CLIENT_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getMrClientId() <em>Mr Client Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMrClientId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String mrClientId = MR_CLIENT_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getTopicURL() <em>Topic URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTopicURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TOPIC_URL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTopicURL() <em>Topic URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTopicURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected String topicURL = TOPIC_URL_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DatabusStreamTopicClientImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DATABUS_STREAM_TOPIC_CLIENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLocalStreamId() {
+		return localStreamId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLocalStreamId(String newLocalStreamId) {
+		String oldLocalStreamId = localStreamId;
+		localStreamId = newLocalStreamId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__LOCAL_STREAM_ID, oldLocalStreamId, localStreamId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDcaeLocationName() {
+		return dcaeLocationName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDcaeLocationName(String newDcaeLocationName) {
+		String oldDcaeLocationName = dcaeLocationName;
+		dcaeLocationName = newDcaeLocationName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__DCAE_LOCATION_NAME, oldDcaeLocationName, dcaeLocationName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getClientRole() {
+		return clientRole;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setClientRole(String newClientRole) {
+		String oldClientRole = clientRole;
+		clientRole = newClientRole;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__CLIENT_ROLE, oldClientRole, clientRole));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<DatabusStreamTopicAction> getAction() {
+		if (action == null) {
+			action = new EDataTypeEList<DatabusStreamTopicAction>(DatabusStreamTopicAction.class, this, StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__ACTION);
+		}
+		return action;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getUsername() {
+		return username;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUsername(String newUsername) {
+		String oldUsername = username;
+		username = newUsername;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__USERNAME, oldUsername, username));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getUserpwd() {
+		return userpwd;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUserpwd(String newUserpwd) {
+		String oldUserpwd = userpwd;
+		userpwd = newUserpwd;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__USERPWD, oldUserpwd, userpwd));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFqtn() {
+		return fqtn;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFqtn(String newFqtn) {
+		String oldFqtn = fqtn;
+		fqtn = newFqtn;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__FQTN, oldFqtn, fqtn));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getMrClientId() {
+		return mrClientId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMrClientId(String newMrClientId) {
+		String oldMrClientId = mrClientId;
+		mrClientId = newMrClientId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__MR_CLIENT_ID, oldMrClientId, mrClientId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getTopicURL() {
+		return topicURL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTopicURL(String newTopicURL) {
+		String oldTopicURL = topicURL;
+		topicURL = newTopicURL;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__TOPIC_URL, oldTopicURL, topicURL));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__LOCAL_STREAM_ID:
+				return getLocalStreamId();
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__DCAE_LOCATION_NAME:
+				return getDcaeLocationName();
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__CLIENT_ROLE:
+				return getClientRole();
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__ACTION:
+				return getAction();
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__USERNAME:
+				return getUsername();
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__USERPWD:
+				return getUserpwd();
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__FQTN:
+				return getFqtn();
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__MR_CLIENT_ID:
+				return getMrClientId();
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__TOPIC_URL:
+				return getTopicURL();
+		}
+		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 StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__LOCAL_STREAM_ID:
+				setLocalStreamId((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__DCAE_LOCATION_NAME:
+				setDcaeLocationName((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__CLIENT_ROLE:
+				setClientRole((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__ACTION:
+				getAction().clear();
+				getAction().addAll((Collection<? extends DatabusStreamTopicAction>)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__USERNAME:
+				setUsername((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__USERPWD:
+				setUserpwd((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__FQTN:
+				setFqtn((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__MR_CLIENT_ID:
+				setMrClientId((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__TOPIC_URL:
+				setTopicURL((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__LOCAL_STREAM_ID:
+				setLocalStreamId(LOCAL_STREAM_ID_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__DCAE_LOCATION_NAME:
+				setDcaeLocationName(DCAE_LOCATION_NAME_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__CLIENT_ROLE:
+				setClientRole(CLIENT_ROLE_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__ACTION:
+				getAction().clear();
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__USERNAME:
+				setUsername(USERNAME_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__USERPWD:
+				setUserpwd(USERPWD_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__FQTN:
+				setFqtn(FQTN_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__MR_CLIENT_ID:
+				setMrClientId(MR_CLIENT_ID_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__TOPIC_URL:
+				setTopicURL(TOPIC_URL_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__LOCAL_STREAM_ID:
+				return LOCAL_STREAM_ID_EDEFAULT == null ? localStreamId != null : !LOCAL_STREAM_ID_EDEFAULT.equals(localStreamId);
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__DCAE_LOCATION_NAME:
+				return DCAE_LOCATION_NAME_EDEFAULT == null ? dcaeLocationName != null : !DCAE_LOCATION_NAME_EDEFAULT.equals(dcaeLocationName);
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__CLIENT_ROLE:
+				return CLIENT_ROLE_EDEFAULT == null ? clientRole != null : !CLIENT_ROLE_EDEFAULT.equals(clientRole);
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__ACTION:
+				return action != null && !action.isEmpty();
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__USERNAME:
+				return USERNAME_EDEFAULT == null ? username != null : !USERNAME_EDEFAULT.equals(username);
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__USERPWD:
+				return USERPWD_EDEFAULT == null ? userpwd != null : !USERPWD_EDEFAULT.equals(userpwd);
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__FQTN:
+				return FQTN_EDEFAULT == null ? fqtn != null : !FQTN_EDEFAULT.equals(fqtn);
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__MR_CLIENT_ID:
+				return MR_CLIENT_ID_EDEFAULT == null ? mrClientId != null : !MR_CLIENT_ID_EDEFAULT.equals(mrClientId);
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT__TOPIC_URL:
+				return TOPIC_URL_EDEFAULT == null ? topicURL != null : !TOPIC_URL_EDEFAULT.equals(topicURL);
+		}
+		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(" (localStreamId: ");
+		result.append(localStreamId);
+		result.append(", dcaeLocationName: ");
+		result.append(dcaeLocationName);
+		result.append(", clientRole: ");
+		result.append(clientRole);
+		result.append(", action: ");
+		result.append(action);
+		result.append(", username: ");
+		result.append(username);
+		result.append(", userpwd: ");
+		result.append(userpwd);
+		result.append(", fqtn: ");
+		result.append(fqtn);
+		result.append(", mrClientId: ");
+		result.append(mrClientId);
+		result.append(", topicURL: ");
+		result.append(topicURL);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DatabusStreamTopicClientImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamTopicImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamTopicImpl.java
new file mode 100644
index 0000000..38eaff3
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamTopicImpl.java
@@ -0,0 +1,760 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DatabusStreamTopic;
+import org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.openecomp.dcae.controller.core.stream.StreamAuthentication;
+import java.util.Collection;
+import java.util.Date;
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Databus Stream Topic</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl#getTopicName <em>Topic Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl#getTopicDescription <em>Topic Description</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl#getDcaeLocationName <em>Dcae Location Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl#isTxenabled <em>Txenabled</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl#getFqtn <em>Fqtn</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl#getLastMod <em>Last Mod</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl#getStatus <em>Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl#getClients <em>Clients</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl#getPublishURL <em>Publish URL</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl#getSubscribeURL <em>Subscribe URL</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DatabusStreamTopicImpl#getAuthenticationMethod <em>Authentication Method</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DatabusStreamTopicImpl extends DatabusStreamImpl implements DatabusStreamTopic {
+	/**
+	 * The default value of the '{@link #getTopicName() <em>Topic Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTopicName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TOPIC_NAME_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getTopicName() <em>Topic Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTopicName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String topicName = TOPIC_NAME_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getTopicDescription() <em>Topic Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTopicDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TOPIC_DESCRIPTION_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getTopicDescription() <em>Topic Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTopicDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String topicDescription = TOPIC_DESCRIPTION_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getDcaeLocationName() <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DCAE_LOCATION_NAME_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getDcaeLocationName() <em>Dcae Location Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDcaeLocationName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dcaeLocationName = DCAE_LOCATION_NAME_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getOwner() <em>Owner</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwner()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String OWNER_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getOwner() <em>Owner</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwner()
+	 * @generated
+	 * @ordered
+	 */
+	protected String owner = OWNER_EDEFAULT;
+	/**
+	 * The default value of the '{@link #isTxenabled() <em>Txenabled</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isTxenabled()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean TXENABLED_EDEFAULT = false;
+	/**
+	 * The cached value of the '{@link #isTxenabled() <em>Txenabled</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isTxenabled()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean txenabled = TXENABLED_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFqtn() <em>Fqtn</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFqtn()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FQTN_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getFqtn() <em>Fqtn</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFqtn()
+	 * @generated
+	 * @ordered
+	 */
+	protected String fqtn = FQTN_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getLastMod() <em>Last Mod</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastMod()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Date LAST_MOD_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getLastMod() <em>Last Mod</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastMod()
+	 * @generated
+	 * @ordered
+	 */
+	protected Date lastMod = LAST_MOD_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getStatus() <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STATUS_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getStatus() <em>Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected String status = STATUS_EDEFAULT;
+	/**
+	 * The cached value of the '{@link #getClients() <em>Clients</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getClients()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<DatabusStreamTopicClient> clients;
+
+	/**
+	 * The default value of the '{@link #getPublishURL() <em>Publish URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPublishURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String PUBLISH_URL_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getPublishURL() <em>Publish URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPublishURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected String publishURL = PUBLISH_URL_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getSubscribeURL() <em>Subscribe URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSubscribeURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SUBSCRIBE_URL_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getSubscribeURL() <em>Subscribe URL</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSubscribeURL()
+	 * @generated
+	 * @ordered
+	 */
+	protected String subscribeURL = SUBSCRIBE_URL_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getAuthenticationMethod() <em>Authentication Method</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAuthenticationMethod()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final StreamAuthentication AUTHENTICATION_METHOD_EDEFAULT = StreamAuthentication.AAF;
+	/**
+	 * The cached value of the '{@link #getAuthenticationMethod() <em>Authentication Method</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAuthenticationMethod()
+	 * @generated
+	 * @ordered
+	 */
+	protected StreamAuthentication authenticationMethod = AUTHENTICATION_METHOD_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DatabusStreamTopicImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DATABUS_STREAM_TOPIC;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getTopicName() {
+		return topicName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTopicName(String newTopicName) {
+		String oldTopicName = topicName;
+		topicName = newTopicName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC__TOPIC_NAME, oldTopicName, topicName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getTopicDescription() {
+		return topicDescription;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTopicDescription(String newTopicDescription) {
+		String oldTopicDescription = topicDescription;
+		topicDescription = newTopicDescription;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC__TOPIC_DESCRIPTION, oldTopicDescription, topicDescription));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDcaeLocationName() {
+		return dcaeLocationName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDcaeLocationName(String newDcaeLocationName) {
+		String oldDcaeLocationName = dcaeLocationName;
+		dcaeLocationName = newDcaeLocationName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC__DCAE_LOCATION_NAME, oldDcaeLocationName, dcaeLocationName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getOwner() {
+		return owner;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOwner(String newOwner) {
+		String oldOwner = owner;
+		owner = newOwner;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC__OWNER, oldOwner, owner));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isTxenabled() {
+		return txenabled;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTxenabled(boolean newTxenabled) {
+		boolean oldTxenabled = txenabled;
+		txenabled = newTxenabled;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC__TXENABLED, oldTxenabled, txenabled));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFqtn() {
+		return fqtn;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFqtn(String newFqtn) {
+		String oldFqtn = fqtn;
+		fqtn = newFqtn;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC__FQTN, oldFqtn, fqtn));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Date getLastMod() {
+		return lastMod;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLastMod(Date newLastMod) {
+		Date oldLastMod = lastMod;
+		lastMod = newLastMod;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC__LAST_MOD, oldLastMod, lastMod));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getStatus() {
+		return status;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatus(String newStatus) {
+		String oldStatus = status;
+		status = newStatus;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC__STATUS, oldStatus, status));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<DatabusStreamTopicClient> getClients() {
+		if (clients == null) {
+			clients = new EObjectContainmentEList<DatabusStreamTopicClient>(DatabusStreamTopicClient.class, this, StreamPackage.DATABUS_STREAM_TOPIC__CLIENTS);
+		}
+		return clients;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPublishURL() {
+		return publishURL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPublishURL(String newPublishURL) {
+		String oldPublishURL = publishURL;
+		publishURL = newPublishURL;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC__PUBLISH_URL, oldPublishURL, publishURL));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getSubscribeURL() {
+		return subscribeURL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSubscribeURL(String newSubscribeURL) {
+		String oldSubscribeURL = subscribeURL;
+		subscribeURL = newSubscribeURL;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC__SUBSCRIBE_URL, oldSubscribeURL, subscribeURL));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StreamAuthentication getAuthenticationMethod() {
+		return authenticationMethod;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAuthenticationMethod(StreamAuthentication newAuthenticationMethod) {
+		StreamAuthentication oldAuthenticationMethod = authenticationMethod;
+		authenticationMethod = newAuthenticationMethod == null ? AUTHENTICATION_METHOD_EDEFAULT : newAuthenticationMethod;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DATABUS_STREAM_TOPIC__AUTHENTICATION_METHOD, oldAuthenticationMethod, authenticationMethod));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_TOPIC__CLIENTS:
+				return ((InternalEList<?>)getClients()).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 StreamPackage.DATABUS_STREAM_TOPIC__TOPIC_NAME:
+				return getTopicName();
+			case StreamPackage.DATABUS_STREAM_TOPIC__TOPIC_DESCRIPTION:
+				return getTopicDescription();
+			case StreamPackage.DATABUS_STREAM_TOPIC__DCAE_LOCATION_NAME:
+				return getDcaeLocationName();
+			case StreamPackage.DATABUS_STREAM_TOPIC__OWNER:
+				return getOwner();
+			case StreamPackage.DATABUS_STREAM_TOPIC__TXENABLED:
+				return isTxenabled();
+			case StreamPackage.DATABUS_STREAM_TOPIC__FQTN:
+				return getFqtn();
+			case StreamPackage.DATABUS_STREAM_TOPIC__LAST_MOD:
+				return getLastMod();
+			case StreamPackage.DATABUS_STREAM_TOPIC__STATUS:
+				return getStatus();
+			case StreamPackage.DATABUS_STREAM_TOPIC__CLIENTS:
+				return getClients();
+			case StreamPackage.DATABUS_STREAM_TOPIC__PUBLISH_URL:
+				return getPublishURL();
+			case StreamPackage.DATABUS_STREAM_TOPIC__SUBSCRIBE_URL:
+				return getSubscribeURL();
+			case StreamPackage.DATABUS_STREAM_TOPIC__AUTHENTICATION_METHOD:
+				return getAuthenticationMethod();
+		}
+		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 StreamPackage.DATABUS_STREAM_TOPIC__TOPIC_NAME:
+				setTopicName((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__TOPIC_DESCRIPTION:
+				setTopicDescription((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__DCAE_LOCATION_NAME:
+				setDcaeLocationName((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__OWNER:
+				setOwner((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__TXENABLED:
+				setTxenabled((Boolean)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__FQTN:
+				setFqtn((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__LAST_MOD:
+				setLastMod((Date)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__STATUS:
+				setStatus((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__CLIENTS:
+				getClients().clear();
+				getClients().addAll((Collection<? extends DatabusStreamTopicClient>)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__PUBLISH_URL:
+				setPublishURL((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__SUBSCRIBE_URL:
+				setSubscribeURL((String)newValue);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__AUTHENTICATION_METHOD:
+				setAuthenticationMethod((StreamAuthentication)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_TOPIC__TOPIC_NAME:
+				setTopicName(TOPIC_NAME_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__TOPIC_DESCRIPTION:
+				setTopicDescription(TOPIC_DESCRIPTION_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__DCAE_LOCATION_NAME:
+				setDcaeLocationName(DCAE_LOCATION_NAME_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__OWNER:
+				setOwner(OWNER_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__TXENABLED:
+				setTxenabled(TXENABLED_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__FQTN:
+				setFqtn(FQTN_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__LAST_MOD:
+				setLastMod(LAST_MOD_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__STATUS:
+				setStatus(STATUS_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__CLIENTS:
+				getClients().clear();
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__PUBLISH_URL:
+				setPublishURL(PUBLISH_URL_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__SUBSCRIBE_URL:
+				setSubscribeURL(SUBSCRIBE_URL_EDEFAULT);
+				return;
+			case StreamPackage.DATABUS_STREAM_TOPIC__AUTHENTICATION_METHOD:
+				setAuthenticationMethod(AUTHENTICATION_METHOD_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DATABUS_STREAM_TOPIC__TOPIC_NAME:
+				return TOPIC_NAME_EDEFAULT == null ? topicName != null : !TOPIC_NAME_EDEFAULT.equals(topicName);
+			case StreamPackage.DATABUS_STREAM_TOPIC__TOPIC_DESCRIPTION:
+				return TOPIC_DESCRIPTION_EDEFAULT == null ? topicDescription != null : !TOPIC_DESCRIPTION_EDEFAULT.equals(topicDescription);
+			case StreamPackage.DATABUS_STREAM_TOPIC__DCAE_LOCATION_NAME:
+				return DCAE_LOCATION_NAME_EDEFAULT == null ? dcaeLocationName != null : !DCAE_LOCATION_NAME_EDEFAULT.equals(dcaeLocationName);
+			case StreamPackage.DATABUS_STREAM_TOPIC__OWNER:
+				return OWNER_EDEFAULT == null ? owner != null : !OWNER_EDEFAULT.equals(owner);
+			case StreamPackage.DATABUS_STREAM_TOPIC__TXENABLED:
+				return txenabled != TXENABLED_EDEFAULT;
+			case StreamPackage.DATABUS_STREAM_TOPIC__FQTN:
+				return FQTN_EDEFAULT == null ? fqtn != null : !FQTN_EDEFAULT.equals(fqtn);
+			case StreamPackage.DATABUS_STREAM_TOPIC__LAST_MOD:
+				return LAST_MOD_EDEFAULT == null ? lastMod != null : !LAST_MOD_EDEFAULT.equals(lastMod);
+			case StreamPackage.DATABUS_STREAM_TOPIC__STATUS:
+				return STATUS_EDEFAULT == null ? status != null : !STATUS_EDEFAULT.equals(status);
+			case StreamPackage.DATABUS_STREAM_TOPIC__CLIENTS:
+				return clients != null && !clients.isEmpty();
+			case StreamPackage.DATABUS_STREAM_TOPIC__PUBLISH_URL:
+				return PUBLISH_URL_EDEFAULT == null ? publishURL != null : !PUBLISH_URL_EDEFAULT.equals(publishURL);
+			case StreamPackage.DATABUS_STREAM_TOPIC__SUBSCRIBE_URL:
+				return SUBSCRIBE_URL_EDEFAULT == null ? subscribeURL != null : !SUBSCRIBE_URL_EDEFAULT.equals(subscribeURL);
+			case StreamPackage.DATABUS_STREAM_TOPIC__AUTHENTICATION_METHOD:
+				return authenticationMethod != AUTHENTICATION_METHOD_EDEFAULT;
+		}
+		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(" (topicName: ");
+		result.append(topicName);
+		result.append(", topicDescription: ");
+		result.append(topicDescription);
+		result.append(", dcaeLocationName: ");
+		result.append(dcaeLocationName);
+		result.append(", owner: ");
+		result.append(owner);
+		result.append(", txenabled: ");
+		result.append(txenabled);
+		result.append(", fqtn: ");
+		result.append(fqtn);
+		result.append(", lastMod: ");
+		result.append(lastMod);
+		result.append(", status: ");
+		result.append(status);
+		result.append(", publishURL: ");
+		result.append(publishURL);
+		result.append(", subscribeURL: ");
+		result.append(subscribeURL);
+		result.append(", authenticationMethod: ");
+		result.append(authenticationMethod);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DatabusStreamTopicImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamDefinitionImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamDefinitionImpl.java
new file mode 100644
index 0000000..39e69f2
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamDefinitionImpl.java
@@ -0,0 +1,334 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamPublisher;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriber;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Stream Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamDefinitionImpl#getStreamType <em>Stream Type</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamDefinitionImpl#getDatabusType <em>Databus Type</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamDefinitionImpl#getPublishers <em>Publishers</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamDefinitionImpl#getSubscribers <em>Subscribers</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DcaeStreamDefinitionImpl extends NamedEntityImpl implements DcaeStreamDefinition {
+	/**
+	 * The default value of the '{@link #getStreamType() <em>Stream Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStreamType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STREAM_TYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getStreamType() <em>Stream Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStreamType()
+	 * @generated
+	 * @ordered
+	 */
+	protected String streamType = STREAM_TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDatabusType() <em>Databus Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDatabusType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DATABUS_TYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDatabusType() <em>Databus Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDatabusType()
+	 * @generated
+	 * @ordered
+	 */
+	protected String databusType = DATABUS_TYPE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getPublishers() <em>Publishers</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPublishers()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<DcaeStreamPublisher> publishers;
+
+	/**
+	 * The cached value of the '{@link #getSubscribers() <em>Subscribers</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSubscribers()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<DcaeStreamSubscriber> subscribers;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeStreamDefinitionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DCAE_STREAM_DEFINITION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getStreamType() {
+		return streamType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStreamType(String newStreamType) {
+		String oldStreamType = streamType;
+		streamType = newStreamType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_DEFINITION__STREAM_TYPE, oldStreamType, streamType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDatabusType() {
+		return databusType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDatabusType(String newDatabusType) {
+		String oldDatabusType = databusType;
+		databusType = newDatabusType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_DEFINITION__DATABUS_TYPE, oldDatabusType, databusType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<DcaeStreamPublisher> getPublishers() {
+		if (publishers == null) {
+			publishers = new EObjectContainmentEList<DcaeStreamPublisher>(DcaeStreamPublisher.class, this, StreamPackage.DCAE_STREAM_DEFINITION__PUBLISHERS);
+		}
+		return publishers;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<DcaeStreamSubscriber> getSubscribers() {
+		if (subscribers == null) {
+			subscribers = new EObjectContainmentEList<DcaeStreamSubscriber>(DcaeStreamSubscriber.class, this, StreamPackage.DCAE_STREAM_DEFINITION__SUBSCRIBERS);
+		}
+		return subscribers;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_DEFINITION__PUBLISHERS:
+				return ((InternalEList<?>)getPublishers()).basicRemove(otherEnd, msgs);
+			case StreamPackage.DCAE_STREAM_DEFINITION__SUBSCRIBERS:
+				return ((InternalEList<?>)getSubscribers()).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 StreamPackage.DCAE_STREAM_DEFINITION__STREAM_TYPE:
+				return getStreamType();
+			case StreamPackage.DCAE_STREAM_DEFINITION__DATABUS_TYPE:
+				return getDatabusType();
+			case StreamPackage.DCAE_STREAM_DEFINITION__PUBLISHERS:
+				return getPublishers();
+			case StreamPackage.DCAE_STREAM_DEFINITION__SUBSCRIBERS:
+				return getSubscribers();
+		}
+		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 StreamPackage.DCAE_STREAM_DEFINITION__STREAM_TYPE:
+				setStreamType((String)newValue);
+				return;
+			case StreamPackage.DCAE_STREAM_DEFINITION__DATABUS_TYPE:
+				setDatabusType((String)newValue);
+				return;
+			case StreamPackage.DCAE_STREAM_DEFINITION__PUBLISHERS:
+				getPublishers().clear();
+				getPublishers().addAll((Collection<? extends DcaeStreamPublisher>)newValue);
+				return;
+			case StreamPackage.DCAE_STREAM_DEFINITION__SUBSCRIBERS:
+				getSubscribers().clear();
+				getSubscribers().addAll((Collection<? extends DcaeStreamSubscriber>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_DEFINITION__STREAM_TYPE:
+				setStreamType(STREAM_TYPE_EDEFAULT);
+				return;
+			case StreamPackage.DCAE_STREAM_DEFINITION__DATABUS_TYPE:
+				setDatabusType(DATABUS_TYPE_EDEFAULT);
+				return;
+			case StreamPackage.DCAE_STREAM_DEFINITION__PUBLISHERS:
+				getPublishers().clear();
+				return;
+			case StreamPackage.DCAE_STREAM_DEFINITION__SUBSCRIBERS:
+				getSubscribers().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_DEFINITION__STREAM_TYPE:
+				return STREAM_TYPE_EDEFAULT == null ? streamType != null : !STREAM_TYPE_EDEFAULT.equals(streamType);
+			case StreamPackage.DCAE_STREAM_DEFINITION__DATABUS_TYPE:
+				return DATABUS_TYPE_EDEFAULT == null ? databusType != null : !DATABUS_TYPE_EDEFAULT.equals(databusType);
+			case StreamPackage.DCAE_STREAM_DEFINITION__PUBLISHERS:
+				return publishers != null && !publishers.isEmpty();
+			case StreamPackage.DCAE_STREAM_DEFINITION__SUBSCRIBERS:
+				return subscribers != null && !subscribers.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(" (streamType: ");
+		result.append(streamType);
+		result.append(", databusType: ");
+		result.append(databusType);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DcaeStreamDefinitionImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamExternalEndPointImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamExternalEndPointImpl.java
new file mode 100644
index 0000000..41eb02d
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamExternalEndPointImpl.java
@@ -0,0 +1,292 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Stream External End Point</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamExternalEndPointImpl#getUser <em>User</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamExternalEndPointImpl#getPassword <em>Password</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamExternalEndPointImpl#getUrl <em>Url</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DcaeStreamExternalEndPointImpl extends MinimalEObjectImpl.Container implements DcaeStreamExternalEndPoint {
+	/**
+	 * The default value of the '{@link #getUser() <em>User</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUser()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String USER_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getUser() <em>User</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUser()
+	 * @generated
+	 * @ordered
+	 */
+	protected String user = USER_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPassword() <em>Password</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPassword()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String PASSWORD_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPassword()
+	 * @generated
+	 * @ordered
+	 */
+	protected String password = PASSWORD_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getUrl() <em>Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String URL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected String url = URL_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeStreamExternalEndPointImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DCAE_STREAM_EXTERNAL_END_POINT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getUser() {
+		return user;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUser(String newUser) {
+		String oldUser = user;
+		user = newUser;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__USER, oldUser, user));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPassword() {
+		return password;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPassword(String newPassword) {
+		String oldPassword = password;
+		password = newPassword;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__PASSWORD, oldPassword, password));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getUrl() {
+		return url;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUrl(String newUrl) {
+		String oldUrl = url;
+		url = newUrl;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__URL, oldUrl, url));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__USER:
+				return getUser();
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__PASSWORD:
+				return getPassword();
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__URL:
+				return getUrl();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__USER:
+				setUser((String)newValue);
+				return;
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__PASSWORD:
+				setPassword((String)newValue);
+				return;
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__URL:
+				setUrl((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__USER:
+				setUser(USER_EDEFAULT);
+				return;
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__PASSWORD:
+				setPassword(PASSWORD_EDEFAULT);
+				return;
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__URL:
+				setUrl(URL_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__USER:
+				return USER_EDEFAULT == null ? user != null : !USER_EDEFAULT.equals(user);
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__PASSWORD:
+				return PASSWORD_EDEFAULT == null ? password != null : !PASSWORD_EDEFAULT.equals(password);
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__URL:
+				return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);
+		}
+		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(" (user: ");
+		result.append(user);
+		result.append(", password: ");
+		result.append(password);
+		result.append(", url: ");
+		result.append(url);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DcaeStreamExternalEndPointImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamImpl.java
new file mode 100644
index 0000000..69a342d
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamImpl.java
@@ -0,0 +1,62 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DcaeStream;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Stream</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class DcaeStreamImpl extends NamedEntityImpl implements DcaeStream {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeStreamImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DCAE_STREAM;
+	}
+
+} //DcaeStreamImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamInternalEndPointImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamInternalEndPointImpl.java
new file mode 100644
index 0000000..4286bab
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamInternalEndPointImpl.java
@@ -0,0 +1,238 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Stream Internal End Point</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamInternalEndPointImpl#getLocalName <em>Local Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamInternalEndPointImpl#getServiceName <em>Service Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DcaeStreamInternalEndPointImpl extends MinimalEObjectImpl.Container implements DcaeStreamInternalEndPoint {
+	/**
+	 * The default value of the '{@link #getLocalName() <em>Local Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LOCAL_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLocalName() <em>Local Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String localName = LOCAL_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getServiceName() <em>Service Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SERVICE_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getServiceName() <em>Service Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String serviceName = SERVICE_NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeStreamInternalEndPointImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DCAE_STREAM_INTERNAL_END_POINT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLocalName() {
+		return localName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLocalName(String newLocalName) {
+		String oldLocalName = localName;
+		localName = newLocalName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__LOCAL_NAME, oldLocalName, localName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getServiceName() {
+		return serviceName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServiceName(String newServiceName) {
+		String oldServiceName = serviceName;
+		serviceName = newServiceName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__SERVICE_NAME, oldServiceName, serviceName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__LOCAL_NAME:
+				return getLocalName();
+			case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__SERVICE_NAME:
+				return getServiceName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__LOCAL_NAME:
+				setLocalName((String)newValue);
+				return;
+			case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__SERVICE_NAME:
+				setServiceName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__LOCAL_NAME:
+				setLocalName(LOCAL_NAME_EDEFAULT);
+				return;
+			case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__SERVICE_NAME:
+				setServiceName(SERVICE_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__LOCAL_NAME:
+				return LOCAL_NAME_EDEFAULT == null ? localName != null : !LOCAL_NAME_EDEFAULT.equals(localName);
+			case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__SERVICE_NAME:
+				return SERVICE_NAME_EDEFAULT == null ? serviceName != null : !SERVICE_NAME_EDEFAULT.equals(serviceName);
+		}
+		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(" (localName: ");
+		result.append(localName);
+		result.append(", serviceName: ");
+		result.append(serviceName);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DcaeStreamInternalEndPointImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamPublisherExternalImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamPublisherExternalImpl.java
new file mode 100644
index 0000000..eccb2f7
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamPublisherExternalImpl.java
@@ -0,0 +1,328 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamPublisherExternal;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Stream Publisher External</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherExternalImpl#getUser <em>User</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherExternalImpl#getPassword <em>Password</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherExternalImpl#getUrl <em>Url</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DcaeStreamPublisherExternalImpl extends DcaeStreamPublisherImpl implements DcaeStreamPublisherExternal {
+	/**
+	 * The default value of the '{@link #getUser() <em>User</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUser()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String USER_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getUser() <em>User</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUser()
+	 * @generated
+	 * @ordered
+	 */
+	protected String user = USER_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getPassword() <em>Password</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPassword()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String PASSWORD_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPassword()
+	 * @generated
+	 * @ordered
+	 */
+	protected String password = PASSWORD_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getUrl() <em>Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String URL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected String url = URL_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeStreamPublisherExternalImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DCAE_STREAM_PUBLISHER_EXTERNAL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getUser() {
+		return user;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUser(String newUser) {
+		String oldUser = user;
+		user = newUser;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__USER, oldUser, user));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPassword() {
+		return password;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPassword(String newPassword) {
+		String oldPassword = password;
+		password = newPassword;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__PASSWORD, oldPassword, password));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getUrl() {
+		return url;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUrl(String newUrl) {
+		String oldUrl = url;
+		url = newUrl;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__URL, oldUrl, url));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__USER:
+				return getUser();
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__PASSWORD:
+				return getPassword();
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__URL:
+				return getUrl();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__USER:
+				setUser((String)newValue);
+				return;
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__PASSWORD:
+				setPassword((String)newValue);
+				return;
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__URL:
+				setUrl((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__USER:
+				setUser(USER_EDEFAULT);
+				return;
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__PASSWORD:
+				setPassword(PASSWORD_EDEFAULT);
+				return;
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__URL:
+				setUrl(URL_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__USER:
+				return USER_EDEFAULT == null ? user != null : !USER_EDEFAULT.equals(user);
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__PASSWORD:
+				return PASSWORD_EDEFAULT == null ? password != null : !PASSWORD_EDEFAULT.equals(password);
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__URL:
+				return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == DcaeStreamExternalEndPoint.class) {
+			switch (derivedFeatureID) {
+				case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__USER: return StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__USER;
+				case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__PASSWORD: return StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__PASSWORD;
+				case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__URL: return StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__URL;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == DcaeStreamExternalEndPoint.class) {
+			switch (baseFeatureID) {
+				case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__USER: return StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__USER;
+				case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__PASSWORD: return StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__PASSWORD;
+				case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__URL: return StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL__URL;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (user: ");
+		result.append(user);
+		result.append(", password: ");
+		result.append(password);
+		result.append(", url: ");
+		result.append(url);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DcaeStreamPublisherExternalImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamPublisherImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamPublisherImpl.java
new file mode 100644
index 0000000..bbcaf85
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamPublisherImpl.java
@@ -0,0 +1,62 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DcaeStreamPublisher;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Stream Publisher</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class DcaeStreamPublisherImpl extends NamedEntityImpl implements DcaeStreamPublisher {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeStreamPublisherImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DCAE_STREAM_PUBLISHER;
+	}
+
+} //DcaeStreamPublisherImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamPublisherInternalImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamPublisherInternalImpl.java
new file mode 100644
index 0000000..480d1d3
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamPublisherInternalImpl.java
@@ -0,0 +1,272 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamPublisherInternal;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Stream Publisher Internal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherInternalImpl#getLocalName <em>Local Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamPublisherInternalImpl#getServiceName <em>Service Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DcaeStreamPublisherInternalImpl extends DcaeStreamPublisherImpl implements DcaeStreamPublisherInternal {
+	/**
+	 * The default value of the '{@link #getLocalName() <em>Local Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LOCAL_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLocalName() <em>Local Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String localName = LOCAL_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getServiceName() <em>Service Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SERVICE_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getServiceName() <em>Service Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String serviceName = SERVICE_NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeStreamPublisherInternalImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DCAE_STREAM_PUBLISHER_INTERNAL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLocalName() {
+		return localName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLocalName(String newLocalName) {
+		String oldLocalName = localName;
+		localName = newLocalName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__LOCAL_NAME, oldLocalName, localName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getServiceName() {
+		return serviceName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServiceName(String newServiceName) {
+		String oldServiceName = serviceName;
+		serviceName = newServiceName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__SERVICE_NAME, oldServiceName, serviceName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__LOCAL_NAME:
+				return getLocalName();
+			case StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__SERVICE_NAME:
+				return getServiceName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__LOCAL_NAME:
+				setLocalName((String)newValue);
+				return;
+			case StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__SERVICE_NAME:
+				setServiceName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__LOCAL_NAME:
+				setLocalName(LOCAL_NAME_EDEFAULT);
+				return;
+			case StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__SERVICE_NAME:
+				setServiceName(SERVICE_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__LOCAL_NAME:
+				return LOCAL_NAME_EDEFAULT == null ? localName != null : !LOCAL_NAME_EDEFAULT.equals(localName);
+			case StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__SERVICE_NAME:
+				return SERVICE_NAME_EDEFAULT == null ? serviceName != null : !SERVICE_NAME_EDEFAULT.equals(serviceName);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == DcaeStreamInternalEndPoint.class) {
+			switch (derivedFeatureID) {
+				case StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__LOCAL_NAME: return StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__LOCAL_NAME;
+				case StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__SERVICE_NAME: return StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__SERVICE_NAME;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == DcaeStreamInternalEndPoint.class) {
+			switch (baseFeatureID) {
+				case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__LOCAL_NAME: return StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__LOCAL_NAME;
+				case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__SERVICE_NAME: return StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL__SERVICE_NAME;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (localName: ");
+		result.append(localName);
+		result.append(", serviceName: ");
+		result.append(serviceName);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DcaeStreamPublisherInternalImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamSubscriberExternalImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamSubscriberExternalImpl.java
new file mode 100644
index 0000000..130a016
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamSubscriberExternalImpl.java
@@ -0,0 +1,321 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriberExternal;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Stream Subscriber External</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberExternalImpl#getUser <em>User</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberExternalImpl#getPassword <em>Password</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberExternalImpl#getUrl <em>Url</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DcaeStreamSubscriberExternalImpl extends DcaeStreamSubscriberImpl implements DcaeStreamSubscriberExternal {
+	/**
+	 * The default value of the '{@link #getUser() <em>User</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUser()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String USER_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getUser() <em>User</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUser()
+	 * @generated
+	 * @ordered
+	 */
+	protected String user = USER_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getPassword() <em>Password</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPassword()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String PASSWORD_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPassword()
+	 * @generated
+	 * @ordered
+	 */
+	protected String password = PASSWORD_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getUrl() <em>Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String URL_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected String url = URL_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeStreamSubscriberExternalImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DCAE_STREAM_SUBSCRIBER_EXTERNAL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getUser() {
+		return user;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUser(String newUser) {
+		String oldUser = user;
+		user = newUser;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__USER, oldUser, user));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getPassword() {
+		return password;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPassword(String newPassword) {
+		String oldPassword = password;
+		password = newPassword;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__PASSWORD, oldPassword, password));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getUrl() {
+		return url;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setUrl(String newUrl) {
+		String oldUrl = url;
+		url = newUrl;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__URL, oldUrl, url));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__USER:
+				return getUser();
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__PASSWORD:
+				return getPassword();
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__URL:
+				return getUrl();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__USER:
+				setUser((String)newValue);
+				return;
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__PASSWORD:
+				setPassword((String)newValue);
+				return;
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__URL:
+				setUrl((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__USER:
+				setUser(USER_EDEFAULT);
+				return;
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__PASSWORD:
+				setPassword(PASSWORD_EDEFAULT);
+				return;
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__URL:
+				setUrl(URL_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__USER:
+				return USER_EDEFAULT == null ? user != null : !USER_EDEFAULT.equals(user);
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__PASSWORD:
+				return PASSWORD_EDEFAULT == null ? password != null : !PASSWORD_EDEFAULT.equals(password);
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__URL:
+				return URL_EDEFAULT == null ? url != null : !URL_EDEFAULT.equals(url);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == DcaeStreamExternalEndPoint.class) {
+			switch (derivedFeatureID) {
+				case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__USER: return StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__USER;
+				case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__PASSWORD: return StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__PASSWORD;
+				case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__URL: return StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__URL;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == DcaeStreamExternalEndPoint.class) {
+			switch (baseFeatureID) {
+				case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__USER: return StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__USER;
+				case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__PASSWORD: return StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__PASSWORD;
+				case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT__URL: return StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL__URL;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (user: ");
+		result.append(user);
+		result.append(", password: ");
+		result.append(password);
+		result.append(", url: ");
+		result.append(url);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DcaeStreamSubscriberExternalImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamSubscriberImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamSubscriberImpl.java
new file mode 100644
index 0000000..b136cfd
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamSubscriberImpl.java
@@ -0,0 +1,60 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriber;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Stream Subscriber</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class DcaeStreamSubscriberImpl extends NamedEntityImpl implements DcaeStreamSubscriber {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeStreamSubscriberImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DCAE_STREAM_SUBSCRIBER;
+	}
+
+} //DcaeStreamSubscriberImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamSubscriberInternalImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamSubscriberInternalImpl.java
new file mode 100644
index 0000000..075fa66
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DcaeStreamSubscriberInternalImpl.java
@@ -0,0 +1,267 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriberInternal;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dcae Stream Subscriber Internal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberInternalImpl#getLocalName <em>Local Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DcaeStreamSubscriberInternalImpl#getServiceName <em>Service Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DcaeStreamSubscriberInternalImpl extends DcaeStreamSubscriberImpl implements DcaeStreamSubscriberInternal {
+	/**
+	 * The default value of the '{@link #getLocalName() <em>Local Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LOCAL_NAME_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getLocalName() <em>Local Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String localName = LOCAL_NAME_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getServiceName() <em>Service Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SERVICE_NAME_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getServiceName() <em>Service Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String serviceName = SERVICE_NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DcaeStreamSubscriberInternalImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DCAE_STREAM_SUBSCRIBER_INTERNAL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLocalName() {
+		return localName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLocalName(String newLocalName) {
+		String oldLocalName = localName;
+		localName = newLocalName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__LOCAL_NAME, oldLocalName, localName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getServiceName() {
+		return serviceName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServiceName(String newServiceName) {
+		String oldServiceName = serviceName;
+		serviceName = newServiceName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__SERVICE_NAME, oldServiceName, serviceName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__LOCAL_NAME:
+				return getLocalName();
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__SERVICE_NAME:
+				return getServiceName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__LOCAL_NAME:
+				setLocalName((String)newValue);
+				return;
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__SERVICE_NAME:
+				setServiceName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__LOCAL_NAME:
+				setLocalName(LOCAL_NAME_EDEFAULT);
+				return;
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__SERVICE_NAME:
+				setServiceName(SERVICE_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__LOCAL_NAME:
+				return LOCAL_NAME_EDEFAULT == null ? localName != null : !LOCAL_NAME_EDEFAULT.equals(localName);
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__SERVICE_NAME:
+				return SERVICE_NAME_EDEFAULT == null ? serviceName != null : !SERVICE_NAME_EDEFAULT.equals(serviceName);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == DcaeStreamInternalEndPoint.class) {
+			switch (derivedFeatureID) {
+				case StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__LOCAL_NAME: return StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__LOCAL_NAME;
+				case StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__SERVICE_NAME: return StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__SERVICE_NAME;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == DcaeStreamInternalEndPoint.class) {
+			switch (baseFeatureID) {
+				case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__LOCAL_NAME: return StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__LOCAL_NAME;
+				case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT__SERVICE_NAME: return StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL__SERVICE_NAME;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (localName: ");
+		result.append(localName);
+		result.append(", serviceName: ");
+		result.append(serviceName);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DcaeStreamSubscriberInternalImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DmaapStreamImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DmaapStreamImpl.java
new file mode 100644
index 0000000..a365d18
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DmaapStreamImpl.java
@@ -0,0 +1,453 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DmaapStream;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dmaap Stream</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DmaapStreamImpl#getDmaapDataType <em>Dmaap Data Type</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DmaapStreamImpl#getDmaapAction <em>Dmaap Action</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DmaapStreamImpl#getDmaapUrl <em>Dmaap Url</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DmaapStreamImpl#getDmaapUserName <em>Dmaap User Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DmaapStreamImpl#getDmaapPassword <em>Dmaap Password</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.stream.impl.DmaapStreamImpl#getDmaapAuthMethod <em>Dmaap Auth Method</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DmaapStreamImpl extends DcaeStreamImpl implements DmaapStream {
+	/**
+	 * The default value of the '{@link #getDmaapDataType() <em>Dmaap Data Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapDataType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_DATA_TYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapDataType() <em>Dmaap Data Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapDataType()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapDataType = DMAAP_DATA_TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapAction() <em>Dmaap Action</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapAction()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_ACTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapAction() <em>Dmaap Action</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapAction()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapAction = DMAAP_ACTION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapUrl() <em>Dmaap Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_URL_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapUrl() <em>Dmaap Url</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapUrl()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapUrl = DMAAP_URL_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapUserName() <em>Dmaap User Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapUserName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_USER_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapUserName() <em>Dmaap User Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapUserName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapUserName = DMAAP_USER_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapPassword() <em>Dmaap Password</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapPassword()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_PASSWORD_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapPassword() <em>Dmaap Password</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapPassword()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapPassword = DMAAP_PASSWORD_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDmaapAuthMethod() <em>Dmaap Auth Method</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapAuthMethod()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DMAAP_AUTH_METHOD_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDmaapAuthMethod() <em>Dmaap Auth Method</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDmaapAuthMethod()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dmaapAuthMethod = DMAAP_AUTH_METHOD_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DmaapStreamImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StreamPackage.Literals.DMAAP_STREAM;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapDataType() {
+		return dmaapDataType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapDataType(String newDmaapDataType) {
+		String oldDmaapDataType = dmaapDataType;
+		dmaapDataType = newDmaapDataType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DMAAP_STREAM__DMAAP_DATA_TYPE, oldDmaapDataType, dmaapDataType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapAction() {
+		return dmaapAction;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapAction(String newDmaapAction) {
+		String oldDmaapAction = dmaapAction;
+		dmaapAction = newDmaapAction;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DMAAP_STREAM__DMAAP_ACTION, oldDmaapAction, dmaapAction));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapUrl() {
+		return dmaapUrl;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapUrl(String newDmaapUrl) {
+		String oldDmaapUrl = dmaapUrl;
+		dmaapUrl = newDmaapUrl;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DMAAP_STREAM__DMAAP_URL, oldDmaapUrl, dmaapUrl));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapUserName() {
+		return dmaapUserName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapUserName(String newDmaapUserName) {
+		String oldDmaapUserName = dmaapUserName;
+		dmaapUserName = newDmaapUserName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DMAAP_STREAM__DMAAP_USER_NAME, oldDmaapUserName, dmaapUserName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapPassword() {
+		return dmaapPassword;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapPassword(String newDmaapPassword) {
+		String oldDmaapPassword = dmaapPassword;
+		dmaapPassword = newDmaapPassword;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DMAAP_STREAM__DMAAP_PASSWORD, oldDmaapPassword, dmaapPassword));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDmaapAuthMethod() {
+		return dmaapAuthMethod;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDmaapAuthMethod(String newDmaapAuthMethod) {
+		String oldDmaapAuthMethod = dmaapAuthMethod;
+		dmaapAuthMethod = newDmaapAuthMethod;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StreamPackage.DMAAP_STREAM__DMAAP_AUTH_METHOD, oldDmaapAuthMethod, dmaapAuthMethod));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StreamPackage.DMAAP_STREAM__DMAAP_DATA_TYPE:
+				return getDmaapDataType();
+			case StreamPackage.DMAAP_STREAM__DMAAP_ACTION:
+				return getDmaapAction();
+			case StreamPackage.DMAAP_STREAM__DMAAP_URL:
+				return getDmaapUrl();
+			case StreamPackage.DMAAP_STREAM__DMAAP_USER_NAME:
+				return getDmaapUserName();
+			case StreamPackage.DMAAP_STREAM__DMAAP_PASSWORD:
+				return getDmaapPassword();
+			case StreamPackage.DMAAP_STREAM__DMAAP_AUTH_METHOD:
+				return getDmaapAuthMethod();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StreamPackage.DMAAP_STREAM__DMAAP_DATA_TYPE:
+				setDmaapDataType((String)newValue);
+				return;
+			case StreamPackage.DMAAP_STREAM__DMAAP_ACTION:
+				setDmaapAction((String)newValue);
+				return;
+			case StreamPackage.DMAAP_STREAM__DMAAP_URL:
+				setDmaapUrl((String)newValue);
+				return;
+			case StreamPackage.DMAAP_STREAM__DMAAP_USER_NAME:
+				setDmaapUserName((String)newValue);
+				return;
+			case StreamPackage.DMAAP_STREAM__DMAAP_PASSWORD:
+				setDmaapPassword((String)newValue);
+				return;
+			case StreamPackage.DMAAP_STREAM__DMAAP_AUTH_METHOD:
+				setDmaapAuthMethod((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DMAAP_STREAM__DMAAP_DATA_TYPE:
+				setDmaapDataType(DMAAP_DATA_TYPE_EDEFAULT);
+				return;
+			case StreamPackage.DMAAP_STREAM__DMAAP_ACTION:
+				setDmaapAction(DMAAP_ACTION_EDEFAULT);
+				return;
+			case StreamPackage.DMAAP_STREAM__DMAAP_URL:
+				setDmaapUrl(DMAAP_URL_EDEFAULT);
+				return;
+			case StreamPackage.DMAAP_STREAM__DMAAP_USER_NAME:
+				setDmaapUserName(DMAAP_USER_NAME_EDEFAULT);
+				return;
+			case StreamPackage.DMAAP_STREAM__DMAAP_PASSWORD:
+				setDmaapPassword(DMAAP_PASSWORD_EDEFAULT);
+				return;
+			case StreamPackage.DMAAP_STREAM__DMAAP_AUTH_METHOD:
+				setDmaapAuthMethod(DMAAP_AUTH_METHOD_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StreamPackage.DMAAP_STREAM__DMAAP_DATA_TYPE:
+				return DMAAP_DATA_TYPE_EDEFAULT == null ? dmaapDataType != null : !DMAAP_DATA_TYPE_EDEFAULT.equals(dmaapDataType);
+			case StreamPackage.DMAAP_STREAM__DMAAP_ACTION:
+				return DMAAP_ACTION_EDEFAULT == null ? dmaapAction != null : !DMAAP_ACTION_EDEFAULT.equals(dmaapAction);
+			case StreamPackage.DMAAP_STREAM__DMAAP_URL:
+				return DMAAP_URL_EDEFAULT == null ? dmaapUrl != null : !DMAAP_URL_EDEFAULT.equals(dmaapUrl);
+			case StreamPackage.DMAAP_STREAM__DMAAP_USER_NAME:
+				return DMAAP_USER_NAME_EDEFAULT == null ? dmaapUserName != null : !DMAAP_USER_NAME_EDEFAULT.equals(dmaapUserName);
+			case StreamPackage.DMAAP_STREAM__DMAAP_PASSWORD:
+				return DMAAP_PASSWORD_EDEFAULT == null ? dmaapPassword != null : !DMAAP_PASSWORD_EDEFAULT.equals(dmaapPassword);
+			case StreamPackage.DMAAP_STREAM__DMAAP_AUTH_METHOD:
+				return DMAAP_AUTH_METHOD_EDEFAULT == null ? dmaapAuthMethod != null : !DMAAP_AUTH_METHOD_EDEFAULT.equals(dmaapAuthMethod);
+		}
+		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(" (dmaapDataType: ");
+		result.append(dmaapDataType);
+		result.append(", dmaapAction: ");
+		result.append(dmaapAction);
+		result.append(", dmaapUrl: ");
+		result.append(dmaapUrl);
+		result.append(", dmaapUserName: ");
+		result.append(dmaapUserName);
+		result.append(", dmaapPassword: ");
+		result.append(dmaapPassword);
+		result.append(", dmaapAuthMethod: ");
+		result.append(dmaapAuthMethod);
+		result.append(')');
+		return result.toString();
+	}
+
+} //DmaapStreamImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/StreamFactoryImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/StreamFactoryImpl.java
new file mode 100644
index 0000000..a0f0649
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/StreamFactoryImpl.java
@@ -0,0 +1,378 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.*;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StreamFactoryImpl extends EFactoryImpl implements StreamFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static StreamFactory init() {
+		try {
+			StreamFactory theStreamFactory = (StreamFactory)EPackage.Registry.INSTANCE.getEFactory(StreamPackage.eNS_URI);
+			if (theStreamFactory != null) {
+				return theStreamFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new StreamFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StreamFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case StreamPackage.DCAE_STREAM: return createDcaeStream();
+			case StreamPackage.DMAAP_STREAM: return createDmaapStream();
+			case StreamPackage.DCAE_STREAM_DEFINITION: return createDcaeStreamDefinition();
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL: return createDcaeStreamPublisherExternal();
+			case StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL: return createDcaeStreamPublisherInternal();
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL: return createDcaeStreamSubscriberExternal();
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL: return createDcaeStreamSubscriberInternal();
+			case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT: return createDcaeStreamInternalEndPoint();
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT: return createDcaeStreamExternalEndPoint();
+			case StreamPackage.DATABUS_STREAM_TOPIC: return createDatabusStreamTopic();
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT: return createDatabusStreamTopicClient();
+			case StreamPackage.DATABUS_STREAM_FEED: return createDatabusStreamFeed();
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER: return createDatabusStreamFeedPublisher();
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER: return createDatabusStreamFeedSubscriber();
+			case StreamPackage.DATABUS_ENTITY: return createDatabusEntity();
+			case StreamPackage.DATABUS_LOCATION: return createDatabusLocation();
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER: return createDatabusMessageRouterCluster();
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE: return createDatabusDataRouterNode();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+			case StreamPackage.DATABUS_STREAM_TOPIC_ACTION:
+				return createDatabusStreamTopicActionFromString(eDataType, initialValue);
+			case StreamPackage.STREAM_AUTHENTICATION:
+				return createStreamAuthenticationFromString(eDataType, initialValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+			case StreamPackage.DATABUS_STREAM_TOPIC_ACTION:
+				return convertDatabusStreamTopicActionToString(eDataType, instanceValue);
+			case StreamPackage.STREAM_AUTHENTICATION:
+				return convertStreamAuthenticationToString(eDataType, instanceValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeStream createDcaeStream() {
+		DcaeStreamImpl dcaeStream = new DcaeStreamImpl();
+		return dcaeStream;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DmaapStream createDmaapStream() {
+		DmaapStreamImpl dmaapStream = new DmaapStreamImpl();
+		return dmaapStream;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeStreamDefinition createDcaeStreamDefinition() {
+		DcaeStreamDefinitionImpl dcaeStreamDefinition = new DcaeStreamDefinitionImpl();
+		return dcaeStreamDefinition;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeStreamPublisherExternal createDcaeStreamPublisherExternal() {
+		DcaeStreamPublisherExternalImpl dcaeStreamPublisherExternal = new DcaeStreamPublisherExternalImpl();
+		return dcaeStreamPublisherExternal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeStreamPublisherInternal createDcaeStreamPublisherInternal() {
+		DcaeStreamPublisherInternalImpl dcaeStreamPublisherInternal = new DcaeStreamPublisherInternalImpl();
+		return dcaeStreamPublisherInternal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeStreamSubscriberExternal createDcaeStreamSubscriberExternal() {
+		DcaeStreamSubscriberExternalImpl dcaeStreamSubscriberExternal = new DcaeStreamSubscriberExternalImpl();
+		return dcaeStreamSubscriberExternal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeStreamSubscriberInternal createDcaeStreamSubscriberInternal() {
+		DcaeStreamSubscriberInternalImpl dcaeStreamSubscriberInternal = new DcaeStreamSubscriberInternalImpl();
+		return dcaeStreamSubscriberInternal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeStreamInternalEndPoint createDcaeStreamInternalEndPoint() {
+		DcaeStreamInternalEndPointImpl dcaeStreamInternalEndPoint = new DcaeStreamInternalEndPointImpl();
+		return dcaeStreamInternalEndPoint;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DcaeStreamExternalEndPoint createDcaeStreamExternalEndPoint() {
+		DcaeStreamExternalEndPointImpl dcaeStreamExternalEndPoint = new DcaeStreamExternalEndPointImpl();
+		return dcaeStreamExternalEndPoint;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DatabusStreamTopic createDatabusStreamTopic() {
+		DatabusStreamTopicImpl databusStreamTopic = new DatabusStreamTopicImpl();
+		return databusStreamTopic;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DatabusStreamTopicClient createDatabusStreamTopicClient() {
+		DatabusStreamTopicClientImpl databusStreamTopicClient = new DatabusStreamTopicClientImpl();
+		return databusStreamTopicClient;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DatabusStreamFeed createDatabusStreamFeed() {
+		DatabusStreamFeedImpl databusStreamFeed = new DatabusStreamFeedImpl();
+		return databusStreamFeed;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DatabusStreamFeedPublisher createDatabusStreamFeedPublisher() {
+		DatabusStreamFeedPublisherImpl databusStreamFeedPublisher = new DatabusStreamFeedPublisherImpl();
+		return databusStreamFeedPublisher;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DatabusStreamFeedSubscriber createDatabusStreamFeedSubscriber() {
+		DatabusStreamFeedSubscriberImpl databusStreamFeedSubscriber = new DatabusStreamFeedSubscriberImpl();
+		return databusStreamFeedSubscriber;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DatabusEntity createDatabusEntity() {
+		DatabusEntityImpl databusEntity = new DatabusEntityImpl();
+		return databusEntity;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DatabusLocation createDatabusLocation() {
+		DatabusLocationImpl databusLocation = new DatabusLocationImpl();
+		return databusLocation;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DatabusMessageRouterCluster createDatabusMessageRouterCluster() {
+		DatabusMessageRouterClusterImpl databusMessageRouterCluster = new DatabusMessageRouterClusterImpl();
+		return databusMessageRouterCluster;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DatabusDataRouterNode createDatabusDataRouterNode() {
+		DatabusDataRouterNodeImpl databusDataRouterNode = new DatabusDataRouterNodeImpl();
+		return databusDataRouterNode;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DatabusStreamTopicAction createDatabusStreamTopicActionFromString(EDataType eDataType, String initialValue) {
+		DatabusStreamTopicAction result = DatabusStreamTopicAction.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertDatabusStreamTopicActionToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StreamAuthentication createStreamAuthenticationFromString(EDataType eDataType, String initialValue) {
+		StreamAuthentication result = StreamAuthentication.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertStreamAuthenticationToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StreamPackage getStreamPackage() {
+		return (StreamPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static StreamPackage getPackage() {
+		return StreamPackage.eINSTANCE;
+	}
+
+} //StreamFactoryImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/StreamPackageImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/StreamPackageImpl.java
new file mode 100644
index 0000000..9523175
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/StreamPackageImpl.java
@@ -0,0 +1,1571 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.impl;
+
+import org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode;
+import org.openecomp.dcae.controller.core.stream.DatabusEntity;
+import org.openecomp.dcae.controller.core.stream.DatabusLocation;
+import org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster;
+import org.openecomp.dcae.controller.core.stream.DatabusStream;
+import org.openecomp.dcae.controller.core.stream.DatabusStreamFeed;
+import org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher;
+import org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber;
+import org.openecomp.dcae.controller.core.stream.DatabusStreamTopic;
+import org.openecomp.dcae.controller.core.stream.DatabusStreamTopicAction;
+import org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient;
+import org.openecomp.dcae.controller.core.stream.DcaeStream;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamPublisher;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamPublisherExternal;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamPublisherInternal;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriber;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriberExternal;
+import org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriberInternal;
+import org.openecomp.dcae.controller.core.stream.DmaapStream;
+import org.openecomp.dcae.controller.core.stream.StreamFactory;
+import org.openecomp.dcae.controller.core.stream.StreamPackage;
+
+import org.openecomp.dcae.controller.core.stream.StreamAuthentication;
+import org.openecomp.ncomp.core.CorePackage;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StreamPackageImpl extends EPackageImpl implements StreamPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeStreamEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dmaapStreamEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeStreamDefinitionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeStreamPublisherEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeStreamSubscriberEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeStreamPublisherExternalEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeStreamPublisherInternalEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeStreamSubscriberExternalEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeStreamSubscriberInternalEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeStreamInternalEndPointEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass dcaeStreamExternalEndPointEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass databusStreamEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass databusStreamTopicEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass databusStreamTopicClientEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass databusStreamFeedEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass databusStreamFeedPublisherEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass databusStreamFeedSubscriberEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass databusEntityEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass databusLocationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass databusMessageRouterClusterEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass databusDataRouterNodeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum databusStreamTopicActionEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum streamAuthenticationEEnum = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.openecomp.dcae.controller.core.stream.StreamPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private StreamPackageImpl() {
+		super(eNS_URI, StreamFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link StreamPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static StreamPackage init() {
+		if (isInited) return (StreamPackage)EPackage.Registry.INSTANCE.getEPackage(StreamPackage.eNS_URI);
+
+		// Obtain or create and register package
+		StreamPackageImpl theStreamPackage = (StreamPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof StreamPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new StreamPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		CorePackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theStreamPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theStreamPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theStreamPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(StreamPackage.eNS_URI, theStreamPackage);
+		return theStreamPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeStream() {
+		return dcaeStreamEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDmaapStream() {
+		return dmaapStreamEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDmaapStream_DmaapDataType() {
+		return (EAttribute)dmaapStreamEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDmaapStream_DmaapAction() {
+		return (EAttribute)dmaapStreamEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDmaapStream_DmaapUrl() {
+		return (EAttribute)dmaapStreamEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDmaapStream_DmaapUserName() {
+		return (EAttribute)dmaapStreamEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDmaapStream_DmaapPassword() {
+		return (EAttribute)dmaapStreamEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDmaapStream_DmaapAuthMethod() {
+		return (EAttribute)dmaapStreamEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeStreamDefinition() {
+		return dcaeStreamDefinitionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeStreamDefinition_StreamType() {
+		return (EAttribute)dcaeStreamDefinitionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeStreamDefinition_DatabusType() {
+		return (EAttribute)dcaeStreamDefinitionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeStreamDefinition_Publishers() {
+		return (EReference)dcaeStreamDefinitionEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDcaeStreamDefinition_Subscribers() {
+		return (EReference)dcaeStreamDefinitionEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeStreamPublisher() {
+		return dcaeStreamPublisherEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeStreamSubscriber() {
+		return dcaeStreamSubscriberEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeStreamPublisherExternal() {
+		return dcaeStreamPublisherExternalEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeStreamPublisherInternal() {
+		return dcaeStreamPublisherInternalEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeStreamSubscriberExternal() {
+		return dcaeStreamSubscriberExternalEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeStreamSubscriberInternal() {
+		return dcaeStreamSubscriberInternalEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeStreamInternalEndPoint() {
+		return dcaeStreamInternalEndPointEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeStreamInternalEndPoint_LocalName() {
+		return (EAttribute)dcaeStreamInternalEndPointEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeStreamInternalEndPoint_ServiceName() {
+		return (EAttribute)dcaeStreamInternalEndPointEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDcaeStreamExternalEndPoint() {
+		return dcaeStreamExternalEndPointEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeStreamExternalEndPoint_User() {
+		return (EAttribute)dcaeStreamExternalEndPointEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeStreamExternalEndPoint_Password() {
+		return (EAttribute)dcaeStreamExternalEndPointEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeStreamExternalEndPoint_Url() {
+		return (EAttribute)dcaeStreamExternalEndPointEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDatabusStream() {
+		return databusStreamEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDatabusStreamTopic() {
+		return databusStreamTopicEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopic_TopicName() {
+		return (EAttribute)databusStreamTopicEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopic_TopicDescription() {
+		return (EAttribute)databusStreamTopicEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopic_DcaeLocationName() {
+		return (EAttribute)databusStreamTopicEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopic_Owner() {
+		return (EAttribute)databusStreamTopicEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopic_Txenabled() {
+		return (EAttribute)databusStreamTopicEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopic_Fqtn() {
+		return (EAttribute)databusStreamTopicEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopic_LastMod() {
+		return (EAttribute)databusStreamTopicEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopic_Status() {
+		return (EAttribute)databusStreamTopicEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDatabusStreamTopic_Clients() {
+		return (EReference)databusStreamTopicEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopic_PublishURL() {
+		return (EAttribute)databusStreamTopicEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopic_SubscribeURL() {
+		return (EAttribute)databusStreamTopicEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopic_AuthenticationMethod() {
+		return (EAttribute)databusStreamTopicEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDatabusStreamTopicClient() {
+		return databusStreamTopicClientEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopicClient_LocalStreamId() {
+		return (EAttribute)databusStreamTopicClientEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopicClient_DcaeLocationName() {
+		return (EAttribute)databusStreamTopicClientEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopicClient_ClientRole() {
+		return (EAttribute)databusStreamTopicClientEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopicClient_Action() {
+		return (EAttribute)databusStreamTopicClientEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopicClient_Username() {
+		return (EAttribute)databusStreamTopicClientEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopicClient_Userpwd() {
+		return (EAttribute)databusStreamTopicClientEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopicClient_Fqtn() {
+		return (EAttribute)databusStreamTopicClientEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopicClient_MrClientId() {
+		return (EAttribute)databusStreamTopicClientEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamTopicClient_TopicURL() {
+		return (EAttribute)databusStreamTopicClientEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDatabusStreamFeed() {
+		return databusStreamFeedEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeed_FeedName() {
+		return (EAttribute)databusStreamFeedEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeed_FeedVersion() {
+		return (EAttribute)databusStreamFeedEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeed_FeedDescription() {
+		return (EAttribute)databusStreamFeedEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeed_AsprClassification() {
+		return (EAttribute)databusStreamFeedEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeed_Owner() {
+		return (EAttribute)databusStreamFeedEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeed_FeedId() {
+		return (EAttribute)databusStreamFeedEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeed_LogURL() {
+		return (EAttribute)databusStreamFeedEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeed_PublishURL() {
+		return (EAttribute)databusStreamFeedEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeed_SubscribeURL() {
+		return (EAttribute)databusStreamFeedEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeed_Status() {
+		return (EAttribute)databusStreamFeedEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeed_Suspended() {
+		return (EAttribute)databusStreamFeedEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDatabusStreamFeed_Publishers() {
+		return (EReference)databusStreamFeedEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDatabusStreamFeed_Subscribers() {
+		return (EReference)databusStreamFeedEClass.getEStructuralFeatures().get(12);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDatabusStreamFeedPublisher() {
+		return databusStreamFeedPublisherEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedPublisher_LocalStreamId() {
+		return (EAttribute)databusStreamFeedPublisherEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedPublisher_DcaeLocationName() {
+		return (EAttribute)databusStreamFeedPublisherEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedPublisher_FeedId() {
+		return (EAttribute)databusStreamFeedPublisherEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedPublisher_PubId() {
+		return (EAttribute)databusStreamFeedPublisherEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedPublisher_Status() {
+		return (EAttribute)databusStreamFeedPublisherEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedPublisher_Username() {
+		return (EAttribute)databusStreamFeedPublisherEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedPublisher_Userpwd() {
+		return (EAttribute)databusStreamFeedPublisherEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDatabusStreamFeedSubscriber() {
+		return databusStreamFeedSubscriberEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedSubscriber_LocalStreamId() {
+		return (EAttribute)databusStreamFeedSubscriberEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedSubscriber_DcaeLocationName() {
+		return (EAttribute)databusStreamFeedSubscriberEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedSubscriber_OtherFeedName() {
+		return (EAttribute)databusStreamFeedSubscriberEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedSubscriber_FeedId() {
+		return (EAttribute)databusStreamFeedSubscriberEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedSubscriber_LogURL() {
+		return (EAttribute)databusStreamFeedSubscriberEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedSubscriber_Owner() {
+		return (EAttribute)databusStreamFeedSubscriberEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedSubscriber_SubId() {
+		return (EAttribute)databusStreamFeedSubscriberEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedSubscriber_Suspended() {
+		return (EAttribute)databusStreamFeedSubscriberEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedSubscriber_Use100() {
+		return (EAttribute)databusStreamFeedSubscriberEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedSubscriber_Username() {
+		return (EAttribute)databusStreamFeedSubscriberEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedSubscriber_Userpwd() {
+		return (EAttribute)databusStreamFeedSubscriberEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusStreamFeedSubscriber_DeliveryURL() {
+		return (EAttribute)databusStreamFeedSubscriberEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDatabusEntity() {
+		return databusEntityEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusEntity_Status() {
+		return (EAttribute)databusEntityEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusEntity_LastModified() {
+		return (EAttribute)databusEntityEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusEntity_Type() {
+		return (EAttribute)databusEntityEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDatabusLocation() {
+		return databusLocationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusLocation_DcaeLayer() {
+		return (EAttribute)databusLocationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDatabusMessageRouterCluster() {
+		return databusMessageRouterClusterEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusMessageRouterCluster_DcaeLocationName() {
+		return (EAttribute)databusMessageRouterClusterEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusMessageRouterCluster_ServiceFqdn() {
+		return (EAttribute)databusMessageRouterClusterEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusMessageRouterCluster_HostFqdn() {
+		return (EAttribute)databusMessageRouterClusterEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusMessageRouterCluster_TopicPort() {
+		return (EAttribute)databusMessageRouterClusterEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusMessageRouterCluster_TopicProtocol() {
+		return (EAttribute)databusMessageRouterClusterEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDatabusDataRouterNode() {
+		return databusDataRouterNodeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusDataRouterNode_DcaeLocationName() {
+		return (EAttribute)databusDataRouterNodeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusDataRouterNode_HostFqdn() {
+		return (EAttribute)databusDataRouterNodeEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDatabusDataRouterNode_Version() {
+		return (EAttribute)databusDataRouterNodeEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EEnum getDatabusStreamTopicAction() {
+		return databusStreamTopicActionEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EEnum getStreamAuthentication() {
+		return streamAuthenticationEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StreamFactory getStreamFactory() {
+		return (StreamFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		dcaeStreamEClass = createEClass(DCAE_STREAM);
+
+		dmaapStreamEClass = createEClass(DMAAP_STREAM);
+		createEAttribute(dmaapStreamEClass, DMAAP_STREAM__DMAAP_DATA_TYPE);
+		createEAttribute(dmaapStreamEClass, DMAAP_STREAM__DMAAP_ACTION);
+		createEAttribute(dmaapStreamEClass, DMAAP_STREAM__DMAAP_URL);
+		createEAttribute(dmaapStreamEClass, DMAAP_STREAM__DMAAP_USER_NAME);
+		createEAttribute(dmaapStreamEClass, DMAAP_STREAM__DMAAP_PASSWORD);
+		createEAttribute(dmaapStreamEClass, DMAAP_STREAM__DMAAP_AUTH_METHOD);
+
+		dcaeStreamDefinitionEClass = createEClass(DCAE_STREAM_DEFINITION);
+		createEAttribute(dcaeStreamDefinitionEClass, DCAE_STREAM_DEFINITION__STREAM_TYPE);
+		createEAttribute(dcaeStreamDefinitionEClass, DCAE_STREAM_DEFINITION__DATABUS_TYPE);
+		createEReference(dcaeStreamDefinitionEClass, DCAE_STREAM_DEFINITION__PUBLISHERS);
+		createEReference(dcaeStreamDefinitionEClass, DCAE_STREAM_DEFINITION__SUBSCRIBERS);
+
+		dcaeStreamPublisherEClass = createEClass(DCAE_STREAM_PUBLISHER);
+
+		dcaeStreamSubscriberEClass = createEClass(DCAE_STREAM_SUBSCRIBER);
+
+		dcaeStreamPublisherExternalEClass = createEClass(DCAE_STREAM_PUBLISHER_EXTERNAL);
+
+		dcaeStreamPublisherInternalEClass = createEClass(DCAE_STREAM_PUBLISHER_INTERNAL);
+
+		dcaeStreamSubscriberExternalEClass = createEClass(DCAE_STREAM_SUBSCRIBER_EXTERNAL);
+
+		dcaeStreamSubscriberInternalEClass = createEClass(DCAE_STREAM_SUBSCRIBER_INTERNAL);
+
+		dcaeStreamInternalEndPointEClass = createEClass(DCAE_STREAM_INTERNAL_END_POINT);
+		createEAttribute(dcaeStreamInternalEndPointEClass, DCAE_STREAM_INTERNAL_END_POINT__LOCAL_NAME);
+		createEAttribute(dcaeStreamInternalEndPointEClass, DCAE_STREAM_INTERNAL_END_POINT__SERVICE_NAME);
+
+		dcaeStreamExternalEndPointEClass = createEClass(DCAE_STREAM_EXTERNAL_END_POINT);
+		createEAttribute(dcaeStreamExternalEndPointEClass, DCAE_STREAM_EXTERNAL_END_POINT__USER);
+		createEAttribute(dcaeStreamExternalEndPointEClass, DCAE_STREAM_EXTERNAL_END_POINT__PASSWORD);
+		createEAttribute(dcaeStreamExternalEndPointEClass, DCAE_STREAM_EXTERNAL_END_POINT__URL);
+
+		databusStreamEClass = createEClass(DATABUS_STREAM);
+
+		databusStreamTopicEClass = createEClass(DATABUS_STREAM_TOPIC);
+		createEAttribute(databusStreamTopicEClass, DATABUS_STREAM_TOPIC__TOPIC_NAME);
+		createEAttribute(databusStreamTopicEClass, DATABUS_STREAM_TOPIC__TOPIC_DESCRIPTION);
+		createEAttribute(databusStreamTopicEClass, DATABUS_STREAM_TOPIC__DCAE_LOCATION_NAME);
+		createEAttribute(databusStreamTopicEClass, DATABUS_STREAM_TOPIC__OWNER);
+		createEAttribute(databusStreamTopicEClass, DATABUS_STREAM_TOPIC__TXENABLED);
+		createEAttribute(databusStreamTopicEClass, DATABUS_STREAM_TOPIC__FQTN);
+		createEAttribute(databusStreamTopicEClass, DATABUS_STREAM_TOPIC__LAST_MOD);
+		createEAttribute(databusStreamTopicEClass, DATABUS_STREAM_TOPIC__STATUS);
+		createEReference(databusStreamTopicEClass, DATABUS_STREAM_TOPIC__CLIENTS);
+		createEAttribute(databusStreamTopicEClass, DATABUS_STREAM_TOPIC__PUBLISH_URL);
+		createEAttribute(databusStreamTopicEClass, DATABUS_STREAM_TOPIC__SUBSCRIBE_URL);
+		createEAttribute(databusStreamTopicEClass, DATABUS_STREAM_TOPIC__AUTHENTICATION_METHOD);
+
+		databusStreamTopicClientEClass = createEClass(DATABUS_STREAM_TOPIC_CLIENT);
+		createEAttribute(databusStreamTopicClientEClass, DATABUS_STREAM_TOPIC_CLIENT__LOCAL_STREAM_ID);
+		createEAttribute(databusStreamTopicClientEClass, DATABUS_STREAM_TOPIC_CLIENT__DCAE_LOCATION_NAME);
+		createEAttribute(databusStreamTopicClientEClass, DATABUS_STREAM_TOPIC_CLIENT__CLIENT_ROLE);
+		createEAttribute(databusStreamTopicClientEClass, DATABUS_STREAM_TOPIC_CLIENT__ACTION);
+		createEAttribute(databusStreamTopicClientEClass, DATABUS_STREAM_TOPIC_CLIENT__USERNAME);
+		createEAttribute(databusStreamTopicClientEClass, DATABUS_STREAM_TOPIC_CLIENT__USERPWD);
+		createEAttribute(databusStreamTopicClientEClass, DATABUS_STREAM_TOPIC_CLIENT__FQTN);
+		createEAttribute(databusStreamTopicClientEClass, DATABUS_STREAM_TOPIC_CLIENT__MR_CLIENT_ID);
+		createEAttribute(databusStreamTopicClientEClass, DATABUS_STREAM_TOPIC_CLIENT__TOPIC_URL);
+
+		databusStreamFeedEClass = createEClass(DATABUS_STREAM_FEED);
+		createEAttribute(databusStreamFeedEClass, DATABUS_STREAM_FEED__FEED_NAME);
+		createEAttribute(databusStreamFeedEClass, DATABUS_STREAM_FEED__FEED_VERSION);
+		createEAttribute(databusStreamFeedEClass, DATABUS_STREAM_FEED__FEED_DESCRIPTION);
+		createEAttribute(databusStreamFeedEClass, DATABUS_STREAM_FEED__ASPR_CLASSIFICATION);
+		createEAttribute(databusStreamFeedEClass, DATABUS_STREAM_FEED__OWNER);
+		createEAttribute(databusStreamFeedEClass, DATABUS_STREAM_FEED__FEED_ID);
+		createEAttribute(databusStreamFeedEClass, DATABUS_STREAM_FEED__LOG_URL);
+		createEAttribute(databusStreamFeedEClass, DATABUS_STREAM_FEED__PUBLISH_URL);
+		createEAttribute(databusStreamFeedEClass, DATABUS_STREAM_FEED__SUBSCRIBE_URL);
+		createEAttribute(databusStreamFeedEClass, DATABUS_STREAM_FEED__STATUS);
+		createEAttribute(databusStreamFeedEClass, DATABUS_STREAM_FEED__SUSPENDED);
+		createEReference(databusStreamFeedEClass, DATABUS_STREAM_FEED__PUBLISHERS);
+		createEReference(databusStreamFeedEClass, DATABUS_STREAM_FEED__SUBSCRIBERS);
+
+		databusStreamFeedPublisherEClass = createEClass(DATABUS_STREAM_FEED_PUBLISHER);
+		createEAttribute(databusStreamFeedPublisherEClass, DATABUS_STREAM_FEED_PUBLISHER__LOCAL_STREAM_ID);
+		createEAttribute(databusStreamFeedPublisherEClass, DATABUS_STREAM_FEED_PUBLISHER__DCAE_LOCATION_NAME);
+		createEAttribute(databusStreamFeedPublisherEClass, DATABUS_STREAM_FEED_PUBLISHER__FEED_ID);
+		createEAttribute(databusStreamFeedPublisherEClass, DATABUS_STREAM_FEED_PUBLISHER__PUB_ID);
+		createEAttribute(databusStreamFeedPublisherEClass, DATABUS_STREAM_FEED_PUBLISHER__STATUS);
+		createEAttribute(databusStreamFeedPublisherEClass, DATABUS_STREAM_FEED_PUBLISHER__USERNAME);
+		createEAttribute(databusStreamFeedPublisherEClass, DATABUS_STREAM_FEED_PUBLISHER__USERPWD);
+
+		databusStreamFeedSubscriberEClass = createEClass(DATABUS_STREAM_FEED_SUBSCRIBER);
+		createEAttribute(databusStreamFeedSubscriberEClass, DATABUS_STREAM_FEED_SUBSCRIBER__LOCAL_STREAM_ID);
+		createEAttribute(databusStreamFeedSubscriberEClass, DATABUS_STREAM_FEED_SUBSCRIBER__DCAE_LOCATION_NAME);
+		createEAttribute(databusStreamFeedSubscriberEClass, DATABUS_STREAM_FEED_SUBSCRIBER__OTHER_FEED_NAME);
+		createEAttribute(databusStreamFeedSubscriberEClass, DATABUS_STREAM_FEED_SUBSCRIBER__FEED_ID);
+		createEAttribute(databusStreamFeedSubscriberEClass, DATABUS_STREAM_FEED_SUBSCRIBER__LOG_URL);
+		createEAttribute(databusStreamFeedSubscriberEClass, DATABUS_STREAM_FEED_SUBSCRIBER__OWNER);
+		createEAttribute(databusStreamFeedSubscriberEClass, DATABUS_STREAM_FEED_SUBSCRIBER__SUB_ID);
+		createEAttribute(databusStreamFeedSubscriberEClass, DATABUS_STREAM_FEED_SUBSCRIBER__SUSPENDED);
+		createEAttribute(databusStreamFeedSubscriberEClass, DATABUS_STREAM_FEED_SUBSCRIBER__USE100);
+		createEAttribute(databusStreamFeedSubscriberEClass, DATABUS_STREAM_FEED_SUBSCRIBER__USERNAME);
+		createEAttribute(databusStreamFeedSubscriberEClass, DATABUS_STREAM_FEED_SUBSCRIBER__USERPWD);
+		createEAttribute(databusStreamFeedSubscriberEClass, DATABUS_STREAM_FEED_SUBSCRIBER__DELIVERY_URL);
+
+		databusEntityEClass = createEClass(DATABUS_ENTITY);
+		createEAttribute(databusEntityEClass, DATABUS_ENTITY__STATUS);
+		createEAttribute(databusEntityEClass, DATABUS_ENTITY__LAST_MODIFIED);
+		createEAttribute(databusEntityEClass, DATABUS_ENTITY__TYPE);
+
+		databusLocationEClass = createEClass(DATABUS_LOCATION);
+		createEAttribute(databusLocationEClass, DATABUS_LOCATION__DCAE_LAYER);
+
+		databusMessageRouterClusterEClass = createEClass(DATABUS_MESSAGE_ROUTER_CLUSTER);
+		createEAttribute(databusMessageRouterClusterEClass, DATABUS_MESSAGE_ROUTER_CLUSTER__DCAE_LOCATION_NAME);
+		createEAttribute(databusMessageRouterClusterEClass, DATABUS_MESSAGE_ROUTER_CLUSTER__SERVICE_FQDN);
+		createEAttribute(databusMessageRouterClusterEClass, DATABUS_MESSAGE_ROUTER_CLUSTER__HOST_FQDN);
+		createEAttribute(databusMessageRouterClusterEClass, DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PORT);
+		createEAttribute(databusMessageRouterClusterEClass, DATABUS_MESSAGE_ROUTER_CLUSTER__TOPIC_PROTOCOL);
+
+		databusDataRouterNodeEClass = createEClass(DATABUS_DATA_ROUTER_NODE);
+		createEAttribute(databusDataRouterNodeEClass, DATABUS_DATA_ROUTER_NODE__DCAE_LOCATION_NAME);
+		createEAttribute(databusDataRouterNodeEClass, DATABUS_DATA_ROUTER_NODE__HOST_FQDN);
+		createEAttribute(databusDataRouterNodeEClass, DATABUS_DATA_ROUTER_NODE__VERSION);
+
+		// Create enums
+		databusStreamTopicActionEEnum = createEEnum(DATABUS_STREAM_TOPIC_ACTION);
+		streamAuthenticationEEnum = createEEnum(STREAM_AUTHENTICATION);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		CorePackage theCorePackage = (CorePackage)EPackage.Registry.INSTANCE.getEPackage(CorePackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		dcaeStreamEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		dmaapStreamEClass.getESuperTypes().add(this.getDcaeStream());
+		dcaeStreamDefinitionEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		dcaeStreamPublisherEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		dcaeStreamSubscriberEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		dcaeStreamPublisherExternalEClass.getESuperTypes().add(this.getDcaeStreamPublisher());
+		dcaeStreamPublisherExternalEClass.getESuperTypes().add(this.getDcaeStreamExternalEndPoint());
+		dcaeStreamPublisherInternalEClass.getESuperTypes().add(this.getDcaeStreamPublisher());
+		dcaeStreamPublisherInternalEClass.getESuperTypes().add(this.getDcaeStreamInternalEndPoint());
+		dcaeStreamSubscriberExternalEClass.getESuperTypes().add(this.getDcaeStreamSubscriber());
+		dcaeStreamSubscriberExternalEClass.getESuperTypes().add(this.getDcaeStreamExternalEndPoint());
+		dcaeStreamSubscriberInternalEClass.getESuperTypes().add(this.getDcaeStreamSubscriber());
+		dcaeStreamSubscriberInternalEClass.getESuperTypes().add(this.getDcaeStreamInternalEndPoint());
+		databusStreamEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		databusStreamTopicEClass.getESuperTypes().add(this.getDatabusStream());
+		databusStreamTopicClientEClass.getESuperTypes().add(this.getDatabusStream());
+		databusStreamFeedEClass.getESuperTypes().add(this.getDatabusStream());
+		databusStreamFeedPublisherEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		databusStreamFeedSubscriberEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		databusEntityEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		databusLocationEClass.getESuperTypes().add(this.getDatabusEntity());
+		databusMessageRouterClusterEClass.getESuperTypes().add(this.getDatabusEntity());
+		databusDataRouterNodeEClass.getESuperTypes().add(this.getDatabusEntity());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(dcaeStreamEClass, DcaeStream.class, "DcaeStream", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(dmaapStreamEClass, DmaapStream.class, "DmaapStream", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDmaapStream_DmaapDataType(), theEcorePackage.getEString(), "dmaapDataType", null, 0, 1, DmaapStream.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDmaapStream_DmaapAction(), theEcorePackage.getEString(), "dmaapAction", null, 0, 1, DmaapStream.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDmaapStream_DmaapUrl(), theEcorePackage.getEString(), "dmaapUrl", null, 0, 1, DmaapStream.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDmaapStream_DmaapUserName(), theEcorePackage.getEString(), "dmaapUserName", null, 0, 1, DmaapStream.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDmaapStream_DmaapPassword(), theEcorePackage.getEString(), "dmaapPassword", null, 0, 1, DmaapStream.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDmaapStream_DmaapAuthMethod(), theEcorePackage.getEString(), "dmaapAuthMethod", null, 0, 1, DmaapStream.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(dcaeStreamDefinitionEClass, DcaeStreamDefinition.class, "DcaeStreamDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDcaeStreamDefinition_StreamType(), theEcorePackage.getEString(), "streamType", null, 0, 1, DcaeStreamDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeStreamDefinition_DatabusType(), theEcorePackage.getEString(), "databusType", null, 0, 1, DcaeStreamDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDcaeStreamDefinition_Publishers(), this.getDcaeStreamPublisher(), null, "publishers", null, 0, -1, DcaeStreamDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDcaeStreamDefinition_Subscribers(), this.getDcaeStreamSubscriber(), null, "subscribers", null, 0, -1, DcaeStreamDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(dcaeStreamPublisherEClass, DcaeStreamPublisher.class, "DcaeStreamPublisher", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(dcaeStreamSubscriberEClass, DcaeStreamSubscriber.class, "DcaeStreamSubscriber", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(dcaeStreamPublisherExternalEClass, DcaeStreamPublisherExternal.class, "DcaeStreamPublisherExternal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(dcaeStreamPublisherInternalEClass, DcaeStreamPublisherInternal.class, "DcaeStreamPublisherInternal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(dcaeStreamSubscriberExternalEClass, DcaeStreamSubscriberExternal.class, "DcaeStreamSubscriberExternal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(dcaeStreamSubscriberInternalEClass, DcaeStreamSubscriberInternal.class, "DcaeStreamSubscriberInternal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(dcaeStreamInternalEndPointEClass, DcaeStreamInternalEndPoint.class, "DcaeStreamInternalEndPoint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDcaeStreamInternalEndPoint_LocalName(), theEcorePackage.getEString(), "localName", null, 0, 1, DcaeStreamInternalEndPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeStreamInternalEndPoint_ServiceName(), theEcorePackage.getEString(), "serviceName", null, 0, 1, DcaeStreamInternalEndPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(dcaeStreamExternalEndPointEClass, DcaeStreamExternalEndPoint.class, "DcaeStreamExternalEndPoint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDcaeStreamExternalEndPoint_User(), theEcorePackage.getEString(), "user", null, 0, 1, DcaeStreamExternalEndPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeStreamExternalEndPoint_Password(), theEcorePackage.getEString(), "password", null, 0, 1, DcaeStreamExternalEndPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeStreamExternalEndPoint_Url(), theEcorePackage.getEString(), "url", null, 0, 1, DcaeStreamExternalEndPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(databusStreamEClass, DatabusStream.class, "DatabusStream", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(databusStreamTopicEClass, DatabusStreamTopic.class, "DatabusStreamTopic", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDatabusStreamTopic_TopicName(), theEcorePackage.getEString(), "topicName", null, 0, 1, DatabusStreamTopic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopic_TopicDescription(), theEcorePackage.getEString(), "topicDescription", null, 0, 1, DatabusStreamTopic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopic_DcaeLocationName(), theEcorePackage.getEString(), "dcaeLocationName", null, 0, 1, DatabusStreamTopic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopic_Owner(), theEcorePackage.getEString(), "owner", null, 0, 1, DatabusStreamTopic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopic_Txenabled(), theEcorePackage.getEBoolean(), "txenabled", null, 0, 1, DatabusStreamTopic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopic_Fqtn(), theEcorePackage.getEString(), "fqtn", null, 0, 1, DatabusStreamTopic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopic_LastMod(), theEcorePackage.getEDate(), "lastMod", null, 0, 1, DatabusStreamTopic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopic_Status(), theEcorePackage.getEString(), "status", null, 0, 1, DatabusStreamTopic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDatabusStreamTopic_Clients(), this.getDatabusStreamTopicClient(), null, "clients", null, 0, -1, DatabusStreamTopic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopic_PublishURL(), theEcorePackage.getEString(), "publishURL", null, 0, 1, DatabusStreamTopic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopic_SubscribeURL(), theEcorePackage.getEString(), "subscribeURL", null, 0, 1, DatabusStreamTopic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopic_AuthenticationMethod(), this.getStreamAuthentication(), "authenticationMethod", null, 0, 1, DatabusStreamTopic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(databusStreamTopicClientEClass, DatabusStreamTopicClient.class, "DatabusStreamTopicClient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDatabusStreamTopicClient_LocalStreamId(), theEcorePackage.getEString(), "localStreamId", null, 0, 1, DatabusStreamTopicClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopicClient_DcaeLocationName(), theEcorePackage.getEString(), "dcaeLocationName", null, 0, 1, DatabusStreamTopicClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopicClient_ClientRole(), theEcorePackage.getEString(), "clientRole", null, 0, 1, DatabusStreamTopicClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopicClient_Action(), this.getDatabusStreamTopicAction(), "action", null, 0, -1, DatabusStreamTopicClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopicClient_Username(), theEcorePackage.getEString(), "username", null, 0, 1, DatabusStreamTopicClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopicClient_Userpwd(), theEcorePackage.getEString(), "userpwd", null, 0, 1, DatabusStreamTopicClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopicClient_Fqtn(), theEcorePackage.getEString(), "fqtn", null, 0, 1, DatabusStreamTopicClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopicClient_MrClientId(), theEcorePackage.getEString(), "mrClientId", null, 0, 1, DatabusStreamTopicClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamTopicClient_TopicURL(), theEcorePackage.getEString(), "topicURL", null, 0, 1, DatabusStreamTopicClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(databusStreamFeedEClass, DatabusStreamFeed.class, "DatabusStreamFeed", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDatabusStreamFeed_FeedName(), theEcorePackage.getEString(), "feedName", null, 0, 1, DatabusStreamFeed.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeed_FeedVersion(), theEcorePackage.getEString(), "feedVersion", null, 0, 1, DatabusStreamFeed.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeed_FeedDescription(), theEcorePackage.getEString(), "feedDescription", null, 0, 1, DatabusStreamFeed.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeed_AsprClassification(), theEcorePackage.getEString(), "asprClassification", null, 0, 1, DatabusStreamFeed.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeed_Owner(), theEcorePackage.getEString(), "owner", null, 0, 1, DatabusStreamFeed.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeed_FeedId(), theEcorePackage.getEString(), "feedId", null, 0, 1, DatabusStreamFeed.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeed_LogURL(), theEcorePackage.getEString(), "logURL", null, 0, 1, DatabusStreamFeed.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeed_PublishURL(), theEcorePackage.getEString(), "publishURL", null, 0, 1, DatabusStreamFeed.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeed_SubscribeURL(), theEcorePackage.getEString(), "subscribeURL", null, 0, 1, DatabusStreamFeed.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeed_Status(), theEcorePackage.getEString(), "status", null, 0, 1, DatabusStreamFeed.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeed_Suspended(), theEcorePackage.getEString(), "suspended", null, 0, 1, DatabusStreamFeed.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDatabusStreamFeed_Publishers(), this.getDatabusStreamFeedPublisher(), null, "publishers", null, 0, -1, DatabusStreamFeed.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDatabusStreamFeed_Subscribers(), this.getDatabusStreamFeedSubscriber(), null, "subscribers", null, 0, -1, DatabusStreamFeed.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(databusStreamFeedPublisherEClass, DatabusStreamFeedPublisher.class, "DatabusStreamFeedPublisher", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDatabusStreamFeedPublisher_LocalStreamId(), theEcorePackage.getEString(), "localStreamId", null, 0, 1, DatabusStreamFeedPublisher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedPublisher_DcaeLocationName(), theEcorePackage.getEString(), "dcaeLocationName", null, 0, 1, DatabusStreamFeedPublisher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedPublisher_FeedId(), theEcorePackage.getEString(), "feedId", null, 0, 1, DatabusStreamFeedPublisher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedPublisher_PubId(), theEcorePackage.getEString(), "pubId", null, 0, 1, DatabusStreamFeedPublisher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedPublisher_Status(), theEcorePackage.getEString(), "status", null, 0, 1, DatabusStreamFeedPublisher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedPublisher_Username(), theEcorePackage.getEString(), "username", null, 0, 1, DatabusStreamFeedPublisher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedPublisher_Userpwd(), theEcorePackage.getEString(), "userpwd", null, 0, 1, DatabusStreamFeedPublisher.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(databusStreamFeedSubscriberEClass, DatabusStreamFeedSubscriber.class, "DatabusStreamFeedSubscriber", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDatabusStreamFeedSubscriber_LocalStreamId(), theEcorePackage.getEString(), "localStreamId", null, 0, 1, DatabusStreamFeedSubscriber.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedSubscriber_DcaeLocationName(), theEcorePackage.getEString(), "dcaeLocationName", null, 0, 1, DatabusStreamFeedSubscriber.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedSubscriber_OtherFeedName(), theEcorePackage.getEString(), "otherFeedName", null, 0, 1, DatabusStreamFeedSubscriber.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedSubscriber_FeedId(), theEcorePackage.getEString(), "feedId", null, 0, 1, DatabusStreamFeedSubscriber.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedSubscriber_LogURL(), theEcorePackage.getEString(), "logURL", null, 0, 1, DatabusStreamFeedSubscriber.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedSubscriber_Owner(), theEcorePackage.getEString(), "owner", null, 0, 1, DatabusStreamFeedSubscriber.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedSubscriber_SubId(), theEcorePackage.getEString(), "subId", null, 0, 1, DatabusStreamFeedSubscriber.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedSubscriber_Suspended(), theEcorePackage.getEBoolean(), "suspended", null, 0, 1, DatabusStreamFeedSubscriber.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedSubscriber_Use100(), theEcorePackage.getEBoolean(), "use100", null, 0, 1, DatabusStreamFeedSubscriber.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedSubscriber_Username(), theEcorePackage.getEString(), "username", null, 0, 1, DatabusStreamFeedSubscriber.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedSubscriber_Userpwd(), theEcorePackage.getEString(), "userpwd", null, 0, 1, DatabusStreamFeedSubscriber.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusStreamFeedSubscriber_DeliveryURL(), theEcorePackage.getEString(), "deliveryURL", null, 0, 1, DatabusStreamFeedSubscriber.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(databusEntityEClass, DatabusEntity.class, "DatabusEntity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDatabusEntity_Status(), theEcorePackage.getEString(), "status", null, 0, 1, DatabusEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusEntity_LastModified(), theEcorePackage.getEDate(), "lastModified", null, 0, 1, DatabusEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusEntity_Type(), theEcorePackage.getEString(), "type", null, 0, 1, DatabusEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(databusLocationEClass, DatabusLocation.class, "DatabusLocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDatabusLocation_DcaeLayer(), theEcorePackage.getEString(), "dcaeLayer", null, 0, 1, DatabusLocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(databusMessageRouterClusterEClass, DatabusMessageRouterCluster.class, "DatabusMessageRouterCluster", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDatabusMessageRouterCluster_DcaeLocationName(), theEcorePackage.getEString(), "dcaeLocationName", null, 0, 1, DatabusMessageRouterCluster.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusMessageRouterCluster_ServiceFqdn(), theEcorePackage.getEString(), "serviceFqdn", null, 0, 1, DatabusMessageRouterCluster.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusMessageRouterCluster_HostFqdn(), theEcorePackage.getEString(), "hostFqdn", null, 0, -1, DatabusMessageRouterCluster.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusMessageRouterCluster_TopicPort(), theEcorePackage.getEString(), "topicPort", null, 0, 1, DatabusMessageRouterCluster.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusMessageRouterCluster_TopicProtocol(), theEcorePackage.getEString(), "topicProtocol", null, 0, 1, DatabusMessageRouterCluster.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(databusDataRouterNodeEClass, DatabusDataRouterNode.class, "DatabusDataRouterNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDatabusDataRouterNode_DcaeLocationName(), theEcorePackage.getEString(), "dcaeLocationName", null, 0, 1, DatabusDataRouterNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusDataRouterNode_HostFqdn(), theEcorePackage.getEString(), "hostFqdn", null, 0, 1, DatabusDataRouterNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDatabusDataRouterNode_Version(), theEcorePackage.getEString(), "version", null, 0, 1, DatabusDataRouterNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Initialize enums and add enum literals
+		initEEnum(databusStreamTopicActionEEnum, DatabusStreamTopicAction.class, "DatabusStreamTopicAction");
+		addEEnumLiteral(databusStreamTopicActionEEnum, DatabusStreamTopicAction.PUB);
+		addEEnumLiteral(databusStreamTopicActionEEnum, DatabusStreamTopicAction.SUB);
+		addEEnumLiteral(databusStreamTopicActionEEnum, DatabusStreamTopicAction.VIEW);
+
+		initEEnum(streamAuthenticationEEnum, StreamAuthentication.class, "StreamAuthentication");
+		addEEnumLiteral(streamAuthenticationEEnum, StreamAuthentication.AAF);
+		addEEnumLiteral(streamAuthenticationEEnum, StreamAuthentication.NONE);
+		addEEnumLiteral(streamAuthenticationEEnum, StreamAuthentication.PASSWORD);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //StreamPackageImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/util/StreamAdapterFactory.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/util/StreamAdapterFactory.java
new file mode 100644
index 0000000..118e807
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/util/StreamAdapterFactory.java
@@ -0,0 +1,521 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.util;
+
+import org.openecomp.dcae.controller.core.stream.*;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage
+ * @generated
+ */
+public class StreamAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static StreamPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StreamAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = StreamPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StreamSwitch<Adapter> modelSwitch =
+		new StreamSwitch<Adapter>() {
+			@Override
+			public Adapter caseDcaeStream(DcaeStream object) {
+				return createDcaeStreamAdapter();
+			}
+			@Override
+			public Adapter caseDmaapStream(DmaapStream object) {
+				return createDmaapStreamAdapter();
+			}
+			@Override
+			public Adapter caseDcaeStreamDefinition(DcaeStreamDefinition object) {
+				return createDcaeStreamDefinitionAdapter();
+			}
+			@Override
+			public Adapter caseDcaeStreamPublisher(DcaeStreamPublisher object) {
+				return createDcaeStreamPublisherAdapter();
+			}
+			@Override
+			public Adapter caseDcaeStreamSubscriber(DcaeStreamSubscriber object) {
+				return createDcaeStreamSubscriberAdapter();
+			}
+			@Override
+			public Adapter caseDcaeStreamPublisherExternal(DcaeStreamPublisherExternal object) {
+				return createDcaeStreamPublisherExternalAdapter();
+			}
+			@Override
+			public Adapter caseDcaeStreamPublisherInternal(DcaeStreamPublisherInternal object) {
+				return createDcaeStreamPublisherInternalAdapter();
+			}
+			@Override
+			public Adapter caseDcaeStreamSubscriberExternal(DcaeStreamSubscriberExternal object) {
+				return createDcaeStreamSubscriberExternalAdapter();
+			}
+			@Override
+			public Adapter caseDcaeStreamSubscriberInternal(DcaeStreamSubscriberInternal object) {
+				return createDcaeStreamSubscriberInternalAdapter();
+			}
+			@Override
+			public Adapter caseDcaeStreamInternalEndPoint(DcaeStreamInternalEndPoint object) {
+				return createDcaeStreamInternalEndPointAdapter();
+			}
+			@Override
+			public Adapter caseDcaeStreamExternalEndPoint(DcaeStreamExternalEndPoint object) {
+				return createDcaeStreamExternalEndPointAdapter();
+			}
+			@Override
+			public Adapter caseDatabusStream(DatabusStream object) {
+				return createDatabusStreamAdapter();
+			}
+			@Override
+			public Adapter caseDatabusStreamTopic(DatabusStreamTopic object) {
+				return createDatabusStreamTopicAdapter();
+			}
+			@Override
+			public Adapter caseDatabusStreamTopicClient(DatabusStreamTopicClient object) {
+				return createDatabusStreamTopicClientAdapter();
+			}
+			@Override
+			public Adapter caseDatabusStreamFeed(DatabusStreamFeed object) {
+				return createDatabusStreamFeedAdapter();
+			}
+			@Override
+			public Adapter caseDatabusStreamFeedPublisher(DatabusStreamFeedPublisher object) {
+				return createDatabusStreamFeedPublisherAdapter();
+			}
+			@Override
+			public Adapter caseDatabusStreamFeedSubscriber(DatabusStreamFeedSubscriber object) {
+				return createDatabusStreamFeedSubscriberAdapter();
+			}
+			@Override
+			public Adapter caseDatabusEntity(DatabusEntity object) {
+				return createDatabusEntityAdapter();
+			}
+			@Override
+			public Adapter caseDatabusLocation(DatabusLocation object) {
+				return createDatabusLocationAdapter();
+			}
+			@Override
+			public Adapter caseDatabusMessageRouterCluster(DatabusMessageRouterCluster object) {
+				return createDatabusMessageRouterClusterAdapter();
+			}
+			@Override
+			public Adapter caseDatabusDataRouterNode(DatabusDataRouterNode object) {
+				return createDatabusDataRouterNodeAdapter();
+			}
+			@Override
+			public Adapter caseNamedEntity(NamedEntity object) {
+				return createNamedEntityAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DcaeStream <em>Dcae Stream</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.dcae.controller.core.stream.DcaeStream
+	 * @generated
+	 */
+	public Adapter createDcaeStreamAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DmaapStream <em>Dmaap Stream</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.dcae.controller.core.stream.DmaapStream
+	 * @generated
+	 */
+	public Adapter createDmaapStreamAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamDefinition <em>Dcae Stream Definition</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.dcae.controller.core.stream.DcaeStreamDefinition
+	 * @generated
+	 */
+	public Adapter createDcaeStreamDefinitionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamPublisher <em>Dcae Stream Publisher</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.dcae.controller.core.stream.DcaeStreamPublisher
+	 * @generated
+	 */
+	public Adapter createDcaeStreamPublisherAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriber <em>Dcae Stream Subscriber</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.dcae.controller.core.stream.DcaeStreamSubscriber
+	 * @generated
+	 */
+	public Adapter createDcaeStreamSubscriberAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamPublisherExternal <em>Dcae Stream Publisher External</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.dcae.controller.core.stream.DcaeStreamPublisherExternal
+	 * @generated
+	 */
+	public Adapter createDcaeStreamPublisherExternalAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamPublisherInternal <em>Dcae Stream Publisher Internal</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.dcae.controller.core.stream.DcaeStreamPublisherInternal
+	 * @generated
+	 */
+	public Adapter createDcaeStreamPublisherInternalAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriberExternal <em>Dcae Stream Subscriber External</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.dcae.controller.core.stream.DcaeStreamSubscriberExternal
+	 * @generated
+	 */
+	public Adapter createDcaeStreamSubscriberExternalAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriberInternal <em>Dcae Stream Subscriber Internal</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.dcae.controller.core.stream.DcaeStreamSubscriberInternal
+	 * @generated
+	 */
+	public Adapter createDcaeStreamSubscriberInternalAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamInternalEndPoint <em>Dcae Stream Internal End Point</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.dcae.controller.core.stream.DcaeStreamInternalEndPoint
+	 * @generated
+	 */
+	public Adapter createDcaeStreamInternalEndPointAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DcaeStreamExternalEndPoint <em>Dcae Stream External End Point</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.dcae.controller.core.stream.DcaeStreamExternalEndPoint
+	 * @generated
+	 */
+	public Adapter createDcaeStreamExternalEndPointAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DatabusStream <em>Databus Stream</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.dcae.controller.core.stream.DatabusStream
+	 * @generated
+	 */
+	public Adapter createDatabusStreamAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopic <em>Databus Stream Topic</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.dcae.controller.core.stream.DatabusStreamTopic
+	 * @generated
+	 */
+	public Adapter createDatabusStreamTopicAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient <em>Databus Stream Topic Client</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.dcae.controller.core.stream.DatabusStreamTopicClient
+	 * @generated
+	 */
+	public Adapter createDatabusStreamTopicClientAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeed <em>Databus Stream Feed</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.dcae.controller.core.stream.DatabusStreamFeed
+	 * @generated
+	 */
+	public Adapter createDatabusStreamFeedAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedPublisher <em>Databus Stream Feed Publisher</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.dcae.controller.core.stream.DatabusStreamFeedPublisher
+	 * @generated
+	 */
+	public Adapter createDatabusStreamFeedPublisherAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DatabusStreamFeedSubscriber <em>Databus Stream Feed Subscriber</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.dcae.controller.core.stream.DatabusStreamFeedSubscriber
+	 * @generated
+	 */
+	public Adapter createDatabusStreamFeedSubscriberAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DatabusEntity <em>Databus 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.dcae.controller.core.stream.DatabusEntity
+	 * @generated
+	 */
+	public Adapter createDatabusEntityAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DatabusLocation <em>Databus Location</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.dcae.controller.core.stream.DatabusLocation
+	 * @generated
+	 */
+	public Adapter createDatabusLocationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DatabusMessageRouterCluster <em>Databus Message Router Cluster</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.dcae.controller.core.stream.DatabusMessageRouterCluster
+	 * @generated
+	 */
+	public Adapter createDatabusMessageRouterClusterAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.core.stream.DatabusDataRouterNode <em>Databus Data Router Node</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.dcae.controller.core.stream.DatabusDataRouterNode
+	 * @generated
+	 */
+	public Adapter createDatabusDataRouterNodeAdapter() {
+		return null;
+	}
+
+	/**
+	 * 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 the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //StreamAdapterFactory
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/util/StreamSwitch.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/util/StreamSwitch.java
new file mode 100644
index 0000000..4305d88
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/util/StreamSwitch.java
@@ -0,0 +1,602 @@
+
+/*-
+ * ============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.dcae.controller.core.stream.util;
+
+import org.openecomp.dcae.controller.core.stream.*;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.openecomp.dcae.controller.core.stream.StreamPackage
+ * @generated
+ */
+public class StreamSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static StreamPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StreamSwitch() {
+		if (modelPackage == null) {
+			modelPackage = StreamPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @parameter ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case StreamPackage.DCAE_STREAM: {
+				DcaeStream dcaeStream = (DcaeStream)theEObject;
+				T result = caseDcaeStream(dcaeStream);
+				if (result == null) result = caseNamedEntity(dcaeStream);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DMAAP_STREAM: {
+				DmaapStream dmaapStream = (DmaapStream)theEObject;
+				T result = caseDmaapStream(dmaapStream);
+				if (result == null) result = caseDcaeStream(dmaapStream);
+				if (result == null) result = caseNamedEntity(dmaapStream);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DCAE_STREAM_DEFINITION: {
+				DcaeStreamDefinition dcaeStreamDefinition = (DcaeStreamDefinition)theEObject;
+				T result = caseDcaeStreamDefinition(dcaeStreamDefinition);
+				if (result == null) result = caseNamedEntity(dcaeStreamDefinition);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DCAE_STREAM_PUBLISHER: {
+				DcaeStreamPublisher dcaeStreamPublisher = (DcaeStreamPublisher)theEObject;
+				T result = caseDcaeStreamPublisher(dcaeStreamPublisher);
+				if (result == null) result = caseNamedEntity(dcaeStreamPublisher);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER: {
+				DcaeStreamSubscriber dcaeStreamSubscriber = (DcaeStreamSubscriber)theEObject;
+				T result = caseDcaeStreamSubscriber(dcaeStreamSubscriber);
+				if (result == null) result = caseNamedEntity(dcaeStreamSubscriber);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DCAE_STREAM_PUBLISHER_EXTERNAL: {
+				DcaeStreamPublisherExternal dcaeStreamPublisherExternal = (DcaeStreamPublisherExternal)theEObject;
+				T result = caseDcaeStreamPublisherExternal(dcaeStreamPublisherExternal);
+				if (result == null) result = caseDcaeStreamPublisher(dcaeStreamPublisherExternal);
+				if (result == null) result = caseDcaeStreamExternalEndPoint(dcaeStreamPublisherExternal);
+				if (result == null) result = caseNamedEntity(dcaeStreamPublisherExternal);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DCAE_STREAM_PUBLISHER_INTERNAL: {
+				DcaeStreamPublisherInternal dcaeStreamPublisherInternal = (DcaeStreamPublisherInternal)theEObject;
+				T result = caseDcaeStreamPublisherInternal(dcaeStreamPublisherInternal);
+				if (result == null) result = caseDcaeStreamPublisher(dcaeStreamPublisherInternal);
+				if (result == null) result = caseDcaeStreamInternalEndPoint(dcaeStreamPublisherInternal);
+				if (result == null) result = caseNamedEntity(dcaeStreamPublisherInternal);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_EXTERNAL: {
+				DcaeStreamSubscriberExternal dcaeStreamSubscriberExternal = (DcaeStreamSubscriberExternal)theEObject;
+				T result = caseDcaeStreamSubscriberExternal(dcaeStreamSubscriberExternal);
+				if (result == null) result = caseDcaeStreamSubscriber(dcaeStreamSubscriberExternal);
+				if (result == null) result = caseDcaeStreamExternalEndPoint(dcaeStreamSubscriberExternal);
+				if (result == null) result = caseNamedEntity(dcaeStreamSubscriberExternal);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DCAE_STREAM_SUBSCRIBER_INTERNAL: {
+				DcaeStreamSubscriberInternal dcaeStreamSubscriberInternal = (DcaeStreamSubscriberInternal)theEObject;
+				T result = caseDcaeStreamSubscriberInternal(dcaeStreamSubscriberInternal);
+				if (result == null) result = caseDcaeStreamSubscriber(dcaeStreamSubscriberInternal);
+				if (result == null) result = caseDcaeStreamInternalEndPoint(dcaeStreamSubscriberInternal);
+				if (result == null) result = caseNamedEntity(dcaeStreamSubscriberInternal);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DCAE_STREAM_INTERNAL_END_POINT: {
+				DcaeStreamInternalEndPoint dcaeStreamInternalEndPoint = (DcaeStreamInternalEndPoint)theEObject;
+				T result = caseDcaeStreamInternalEndPoint(dcaeStreamInternalEndPoint);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DCAE_STREAM_EXTERNAL_END_POINT: {
+				DcaeStreamExternalEndPoint dcaeStreamExternalEndPoint = (DcaeStreamExternalEndPoint)theEObject;
+				T result = caseDcaeStreamExternalEndPoint(dcaeStreamExternalEndPoint);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DATABUS_STREAM: {
+				DatabusStream databusStream = (DatabusStream)theEObject;
+				T result = caseDatabusStream(databusStream);
+				if (result == null) result = caseNamedEntity(databusStream);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DATABUS_STREAM_TOPIC: {
+				DatabusStreamTopic databusStreamTopic = (DatabusStreamTopic)theEObject;
+				T result = caseDatabusStreamTopic(databusStreamTopic);
+				if (result == null) result = caseDatabusStream(databusStreamTopic);
+				if (result == null) result = caseNamedEntity(databusStreamTopic);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DATABUS_STREAM_TOPIC_CLIENT: {
+				DatabusStreamTopicClient databusStreamTopicClient = (DatabusStreamTopicClient)theEObject;
+				T result = caseDatabusStreamTopicClient(databusStreamTopicClient);
+				if (result == null) result = caseDatabusStream(databusStreamTopicClient);
+				if (result == null) result = caseNamedEntity(databusStreamTopicClient);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DATABUS_STREAM_FEED: {
+				DatabusStreamFeed databusStreamFeed = (DatabusStreamFeed)theEObject;
+				T result = caseDatabusStreamFeed(databusStreamFeed);
+				if (result == null) result = caseDatabusStream(databusStreamFeed);
+				if (result == null) result = caseNamedEntity(databusStreamFeed);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DATABUS_STREAM_FEED_PUBLISHER: {
+				DatabusStreamFeedPublisher databusStreamFeedPublisher = (DatabusStreamFeedPublisher)theEObject;
+				T result = caseDatabusStreamFeedPublisher(databusStreamFeedPublisher);
+				if (result == null) result = caseNamedEntity(databusStreamFeedPublisher);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DATABUS_STREAM_FEED_SUBSCRIBER: {
+				DatabusStreamFeedSubscriber databusStreamFeedSubscriber = (DatabusStreamFeedSubscriber)theEObject;
+				T result = caseDatabusStreamFeedSubscriber(databusStreamFeedSubscriber);
+				if (result == null) result = caseNamedEntity(databusStreamFeedSubscriber);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DATABUS_ENTITY: {
+				DatabusEntity databusEntity = (DatabusEntity)theEObject;
+				T result = caseDatabusEntity(databusEntity);
+				if (result == null) result = caseNamedEntity(databusEntity);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DATABUS_LOCATION: {
+				DatabusLocation databusLocation = (DatabusLocation)theEObject;
+				T result = caseDatabusLocation(databusLocation);
+				if (result == null) result = caseDatabusEntity(databusLocation);
+				if (result == null) result = caseNamedEntity(databusLocation);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DATABUS_MESSAGE_ROUTER_CLUSTER: {
+				DatabusMessageRouterCluster databusMessageRouterCluster = (DatabusMessageRouterCluster)theEObject;
+				T result = caseDatabusMessageRouterCluster(databusMessageRouterCluster);
+				if (result == null) result = caseDatabusEntity(databusMessageRouterCluster);
+				if (result == null) result = caseNamedEntity(databusMessageRouterCluster);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StreamPackage.DATABUS_DATA_ROUTER_NODE: {
+				DatabusDataRouterNode databusDataRouterNode = (DatabusDataRouterNode)theEObject;
+				T result = caseDatabusDataRouterNode(databusDataRouterNode);
+				if (result == null) result = caseDatabusEntity(databusDataRouterNode);
+				if (result == null) result = caseNamedEntity(databusDataRouterNode);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Stream</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>Dcae Stream</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeStream(DcaeStream object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dmaap Stream</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>Dmaap Stream</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDmaapStream(DmaapStream object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Stream Definition</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>Dcae Stream Definition</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeStreamDefinition(DcaeStreamDefinition object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Stream Publisher</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>Dcae Stream Publisher</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeStreamPublisher(DcaeStreamPublisher object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Stream Subscriber</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>Dcae Stream Subscriber</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeStreamSubscriber(DcaeStreamSubscriber object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Stream Publisher External</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>Dcae Stream Publisher External</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeStreamPublisherExternal(DcaeStreamPublisherExternal object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Stream Publisher Internal</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>Dcae Stream Publisher Internal</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeStreamPublisherInternal(DcaeStreamPublisherInternal object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Stream Subscriber External</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>Dcae Stream Subscriber External</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeStreamSubscriberExternal(DcaeStreamSubscriberExternal object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Stream Subscriber Internal</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>Dcae Stream Subscriber Internal</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeStreamSubscriberInternal(DcaeStreamSubscriberInternal object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Stream Internal End Point</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>Dcae Stream Internal End Point</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeStreamInternalEndPoint(DcaeStreamInternalEndPoint object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Dcae Stream External End Point</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>Dcae Stream External End Point</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDcaeStreamExternalEndPoint(DcaeStreamExternalEndPoint object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Databus Stream</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>Databus Stream</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDatabusStream(DatabusStream object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Databus Stream Topic</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>Databus Stream Topic</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDatabusStreamTopic(DatabusStreamTopic object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Databus Stream Topic Client</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>Databus Stream Topic Client</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDatabusStreamTopicClient(DatabusStreamTopicClient object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Databus Stream Feed</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>Databus Stream Feed</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDatabusStreamFeed(DatabusStreamFeed object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Databus Stream Feed Publisher</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>Databus Stream Feed Publisher</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDatabusStreamFeedPublisher(DatabusStreamFeedPublisher object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Databus Stream Feed Subscriber</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>Databus Stream Feed Subscriber</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDatabusStreamFeedSubscriber(DatabusStreamFeedSubscriber object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Databus 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>Databus Entity</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDatabusEntity(DatabusEntity object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Databus Location</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>Databus Location</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDatabusLocation(DatabusLocation object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Databus Message Router Cluster</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>Databus Message Router Cluster</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDatabusMessageRouterCluster(DatabusMessageRouterCluster object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Databus Data Router Node</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>Databus Data Router Node</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDatabusDataRouterNode(DatabusDataRouterNode object) {
+		return null;
+	}
+
+	/**
+	 * 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>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //StreamSwitch
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore/hypervisor.xcore b/dcae-controller-core/dcae-controller-core-model/src/main/xcore/hypervisor.xcore
new file mode 100644
index 0000000..5d4ad9c
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore/hypervisor.xcore
@@ -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============================================
+ */
+	
+@GenModel(modelDirectory="/dcae-controller-core-model/src/main/xcore-gen")
+
+package org.openecomp.dcae.controller.core.hypervisor
+
+import org.openecomp.ncomp.core.NamedEntity
+
+class Hypervisor extends NamedEntity { 
+	
+}
\ No newline at end of file
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore/manager.xcore b/dcae-controller-core/dcae-controller-core-model/src/main/xcore/manager.xcore
new file mode 100644
index 0000000..e6a3246
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore/manager.xcore
@@ -0,0 +1,45 @@
+
+/*-
+ * ============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============================================
+ */
+	
+@GenModel(modelDirectory="/dcae-controller-core-model/src/main/xcore-gen")

+

+

+package org.openecomp.dcae.controller.core.manager

+

+import org.openecomp.dcae.controller.core.stream.DcaeStream

+import org.openecomp.dcae.controller.core.service.HealthTestResponse

+

+annotation "http://openecomp.org" as ecomp

+

+abstract class DcaeManager { 

+	// operational requirements

+	op HealthTestResponse test()

+	op void suspend()	

+	op void resume()

+	// internal 

+	op String publicKey()

+	// trigger for any configuration push form controller

+	op void configurationChanged()

+	// stream information

+	contains DcaeStream[] inputStreams

+	contains DcaeStream[] outputStreams

+	op void updateStreams(DcaeStream[] inputStreams, DcaeStream[] outputStreams) 

+}

diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore/server.xcore b/dcae-controller-core/dcae-controller-core-model/src/main/xcore/server.xcore
new file mode 100644
index 0000000..0cfddf5
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore/server.xcore
@@ -0,0 +1,54 @@
+
+/*-
+ * ============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============================================
+ */
+	
+@GenModel(modelDirectory="/dcae-controller-core-model/src/main/xcore-gen")
+
+package org.openecomp.dcae.controller.core.server
+
+import org.openecomp.ncomp.core.HasOperationalState
+import org.openecomp.ncomp.core.logs.LogMessageContainer
+import org.openecomp.ncomp.sirius.manager.agent.collectd.CollectdServer
+import org.openecomp.ncomp.sirius.manager.properties.Module
+import org.openecomp.ncomp.core.DateMetricAttribute
+import org.openecomp.ncomp.core.NamedEntity
+import org.openecomp.ncomp.openstack.core.VirtualMachineType
+import org.openecomp.ncomp.openstack.compute.Server
+import org.openecomp.ncomp.openstack.location.Hypervisor
+
+class DcaeBasicServer extends NamedEntity, HasOperationalState, LogMessageContainer {
+	String privateIp
+	String publicIp
+	contains CollectdServer collectd
+	contains unordered Module[] modules
+	contains unordered DcaeBasicServerNetwork[] networks
+	transient DateMetricAttribute lastUpdate
+	boolean usingMonitoringAgent = "true"
+	refers Server server
+	refers Hypervisor hypervisor 
+	refers VirtualMachineType vmType
+	String certificatePassword
+}
+
+class DcaeBasicServerNetwork extends NamedEntity {
+	String ip
+	String dnsName
+}
+
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore/service.xcore b/dcae-controller-core/dcae-controller-core-model/src/main/xcore/service.xcore
new file mode 100644
index 0000000..a837430
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore/service.xcore
@@ -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============================================
+ */
+	
+@GenModel(modelDirectory="/dcae-controller-core-model/src/main/xcore-gen")

+ 

+package org.openecomp.dcae.controller.core.service

+ 

+import org.openecomp.ncomp.core.NamedEntity

+import org.openecomp.ncomp.core.DeploymentStatus

+import org.openecomp.dcae.controller.core.stream.DcaeStream

+import org.openecomp.ncomp.openstack.location.OpenStackProject

+import org.eclipse.emf.ecore.EObject

+import org.openecomp.ncomp.core.JsonObject

+import org.openecomp.ncomp.core.DateMetricAttribute

+

+

+annotation "http://openecomp.org" as ecomp

+annotation "http://openecomp.org/cdap" as cdap

+

+

+abstract class DcaeServiceContainer extends NamedEntity {    

+	refers DcaeServiceInstance[] instances opposite serviceContainer 

+}

+

+abstract class DcaeService extends NamedEntity {

+	// will contain a list of instances.

+	op void deploy(String instanceName, String containerPath)

+	op void undeploy(String instanceName)	

+	op HealthTestResponse test(String instanceName)

+	op void suspend(String instanceName)	

+	op void resume(String instanceName)

+	op void pushManagerConfiguration(String instanceName)

+	op void pollManagerConfiguration(String instanceName) 

+	op EObject managerConfiguration(String instanceName)

+	op JsonObject managerOperation(String instanceName, String operation, JsonObject parameters) 

+	op void updateConfigurationFromPolicy(String instanceName)

+	op void runHealthTests()

+} 

+

+abstract class DcaeServiceInstance extends NamedEntity {   

+	@ecomp(^type = "operational")

+	refers DcaeServiceContainer serviceContainer opposite instances

+	@ecomp(^type = "operational")

+	DeploymentStatus status

+	@ecomp(^type = "service")

+	contains DcaeStream[] inputStreams

+	@ecomp(^type = "service")

+	contains DcaeStream[] outputStreams

+	transient DateMetricAttribute lastHealthTest

+	HealthTestStatus healthTestStatus

+	String healthTestMessageCode

+}

+

+class DcaeLocation extends DcaeServiceContainer {

+	String locationType

+	refers OpenStackProject openstackProject

+}

+

+class DcaeServiceDescriptor extends NamedEntity {

+	String groupId

+	String artifact

+	String version

+}

+

+enum HealthTestStatus {

+	GREEN, YELLOW, RED

+}

+

+class HealthTestResponse {

+	HealthTestStatus status

+	String messageCode

+}

+

+abstract class DcaePolicyEntity {

+	@cdap( destination = "namespace-prefs::${path}.policyName")

+	String policyName

+	@cdap( destination = "namespace-prefs::${path}.policyDescription")

+	String policyDescription

+	@cdap( destination = "namespace-prefs::${path}.policyConfigName")

+	String policyConfigName

+	@cdap( destination = "namespace-prefs::${path}.policyTemplateVersion")

+	String policyTemplateVersion

+	@cdap( destination = "namespace-prefs::${path}.policyVersion")

+	String policyVersion

+	@cdap( destination = "namespace-prefs::${path}.policyPriority")

+	String policyPriority

+	@cdap( destination = "namespace-prefs::${path}.policyScope")

+	String policyScope

+}

+

diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore/stream.xcore b/dcae-controller-core/dcae-controller-core-model/src/main/xcore/stream.xcore
new file mode 100644
index 0000000..d6b0fcc
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore/stream.xcore
@@ -0,0 +1,177 @@
+
+/*-
+ * ============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============================================
+ */
+	
+@GenModel(modelDirectory="/dcae-controller-core-model/src/main/xcore-gen")
+package org.openecomp.dcae.controller.core.stream
+
+import org.openecomp.ncomp.core.NamedEntity
+
+class DcaeStream extends NamedEntity {
+}
+
+class DmaapStream extends DcaeStream {
+	String dmaapDataType
+	String dmaapAction
+	String dmaapUrl
+	String dmaapUserName
+	String dmaapPassword
+	String dmaapAuthMethod
+}
+
+class DcaeStreamDefinition extends NamedEntity {
+	String streamType
+	String  databusType
+	contains DcaeStreamPublisher[] publishers
+	contains DcaeStreamSubscriber[] subscribers
+}
+
+abstract class DcaeStreamPublisher extends NamedEntity {
+}
+
+abstract class DcaeStreamSubscriber extends NamedEntity {
+}
+
+class DcaeStreamPublisherExternal extends DcaeStreamPublisher, DcaeStreamExternalEndPoint {
+}
+
+class DcaeStreamPublisherInternal extends DcaeStreamPublisher, DcaeStreamInternalEndPoint {
+}
+
+class DcaeStreamSubscriberExternal extends DcaeStreamSubscriber, DcaeStreamExternalEndPoint {
+}
+
+class DcaeStreamSubscriberInternal extends DcaeStreamSubscriber, DcaeStreamInternalEndPoint {
+}
+
+class DcaeStreamInternalEndPoint {
+	String localName
+	String serviceName
+}
+
+class DcaeStreamExternalEndPoint {
+	String user
+	String password
+	String url
+}
+
+abstract class DatabusStream extends NamedEntity {
+}
+
+class DatabusStreamTopic extends DatabusStream {
+	String topicName
+	String topicDescription
+	String dcaeLocationName
+	String owner
+	boolean txenabled
+	String fqtn
+	Date lastMod
+	String status
+	contains DatabusStreamTopicClient[] clients
+	String publishURL
+	String subscribeURL
+	StreamAuthentication authenticationMethod
+}
+
+class DatabusStreamTopicClient extends DatabusStream {
+	String localStreamId
+	String dcaeLocationName
+	String clientRole
+	DatabusStreamTopicAction[] action
+	String username
+	String userpwd
+	String fqtn
+	String mrClientId
+	String topicURL
+}
+
+enum DatabusStreamTopicAction {
+	PUB as "pub", SUB as "sub", VIEW as "view"
+}
+
+enum StreamAuthentication {
+	AAF as "aaf", NONE as "none", PASSWORD as "password"
+}
+
+
+class DatabusStreamFeed extends DatabusStream {
+	String feedName
+	String feedVersion
+	String feedDescription
+	String asprClassification
+	String owner 
+	String feedId
+	String logURL
+	String publishURL
+	String subscribeURL
+	String status
+	String suspended 
+	contains DatabusStreamFeedPublisher[] publishers
+	contains DatabusStreamFeedSubscriber[] subscribers
+}
+
+class DatabusStreamFeedPublisher extends NamedEntity {
+	String localStreamId
+	String dcaeLocationName
+	String feedId
+	String pubId
+	String status
+	String username
+	String userpwd
+}
+
+class DatabusStreamFeedSubscriber extends NamedEntity {
+	String localStreamId
+	String dcaeLocationName
+	String otherFeedName
+	String feedId
+	String logURL
+	String owner
+	String subId
+	boolean suspended
+	boolean use100
+	String username
+	String userpwd
+	String deliveryURL
+}
+
+class DatabusEntity extends NamedEntity {
+	String status
+	Date lastModified
+	String ^type
+}
+
+class DatabusLocation extends DatabusEntity {
+	String dcaeLayer
+}
+
+class DatabusMessageRouterCluster extends DatabusEntity {
+	String dcaeLocationName
+	String serviceFqdn
+	String[] hostFqdn
+	String topicPort
+	String topicProtocol
+}
+
+class DatabusDataRouterNode extends DatabusEntity {
+	String dcaeLocationName
+	String hostFqdn
+	String version
+}
\ No newline at end of file