[DCAE-15] Final update for rebased code.

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

11 files changed, 1039 insertions, 2 deletions

diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/DcaeInventory.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/DcaeInventory.java
index 2677c30..658ee14 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/DcaeInventory.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/DcaeInventory.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EObject;
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.inventory.DcaeInventory#getServiceTypes <em>Service Types</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.inventory.DcaeInventory#getServices <em>Services</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.inventory.DcaeInventory#getRules <em>Rules</em>}</li>
  * </ul>
  *
  * @see org.openecomp.dcae.controller.inventory.InventoryPackage#getDcaeInventory()
@@ -57,6 +58,22 @@ public interface DcaeInventory extends EObject {
 	EList<DCAEService> getServices();
 
 	/**
+	 * Returns the value of the '<em><b>Rules</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Rules</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>Rules</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.inventory.InventoryPackage#getDcaeInventory_Rules()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<InventoryConfigurationRule> getRules();
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @model unique="false" typeNameUnique="false" onlyLatestUnique="false" onlyActiveUnique="false" vnfTypeUnique="false" serviceIdUnique="false" serviceLocationUnique="false" asdcServiceIdUnique="false" asdcResourceIdUnique="false" offsetUnique="false"
@@ -136,4 +153,12 @@ public interface DcaeInventory extends EObject {
 	 */
 	void poll();
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @model
+	 * @generated
+	 */
+	void updateConfiguration();
+
 } // DcaeInventory
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryConfigurationRule.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryConfigurationRule.java
new file mode 100644
index 0000000..50aa0b2
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryConfigurationRule.java
@@ -0,0 +1,131 @@
+/**
+ */
+package org.openecomp.dcae.controller.inventory;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Configuration Rule</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getTypeNameMatch <em>Type Name Match</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getServiceNameMatch <em>Service Name Match</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getInstanceNameMatch <em>Instance Name Match</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getBpNodeNameMatch <em>Bp Node Name Match</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.inventory.InventoryPackage#getInventoryConfigurationRule()
+ * @model
+ * @generated
+ */
+public interface InventoryConfigurationRule extends NamedEntity {
+	/**
+	 * Returns the value of the '<em><b>Type Name Match</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Type Name Match</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 Name Match</em>' attribute.
+	 * @see #setTypeNameMatch(String)
+	 * @see org.openecomp.dcae.controller.inventory.InventoryPackage#getInventoryConfigurationRule_TypeNameMatch()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getTypeNameMatch();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getTypeNameMatch <em>Type Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Type Name Match</em>' attribute.
+	 * @see #getTypeNameMatch()
+	 * @generated
+	 */
+	void setTypeNameMatch(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Service Name Match</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service Name Match</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 Match</em>' attribute.
+	 * @see #setServiceNameMatch(String)
+	 * @see org.openecomp.dcae.controller.inventory.InventoryPackage#getInventoryConfigurationRule_ServiceNameMatch()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getServiceNameMatch();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getServiceNameMatch <em>Service Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service Name Match</em>' attribute.
+	 * @see #getServiceNameMatch()
+	 * @generated
+	 */
+	void setServiceNameMatch(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Instance Name Match</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Instance Name Match</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Instance Name Match</em>' attribute.
+	 * @see #setInstanceNameMatch(String)
+	 * @see org.openecomp.dcae.controller.inventory.InventoryPackage#getInventoryConfigurationRule_InstanceNameMatch()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getInstanceNameMatch();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getInstanceNameMatch <em>Instance Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Instance Name Match</em>' attribute.
+	 * @see #getInstanceNameMatch()
+	 * @generated
+	 */
+	void setInstanceNameMatch(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Bp Node Name Match</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Bp Node Name Match</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Bp Node Name Match</em>' attribute.
+	 * @see #setBpNodeNameMatch(String)
+	 * @see org.openecomp.dcae.controller.inventory.InventoryPackage#getInventoryConfigurationRule_BpNodeNameMatch()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getBpNodeNameMatch();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getBpNodeNameMatch <em>Bp Node Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Bp Node Name Match</em>' attribute.
+	 * @see #getBpNodeNameMatch()
+	 * @generated
+	 */
+	void setBpNodeNameMatch(String value);
+
+} // InventoryConfigurationRule
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryConfigurationRules.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryConfigurationRules.java
new file mode 100644
index 0000000..eaf072e
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryConfigurationRules.java
@@ -0,0 +1,104 @@
+/**
+ */
+package org.openecomp.dcae.controller.inventory;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Configuration Rules</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRules#getTypeNameMatch <em>Type Name Match</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRules#getServiceNameMatch <em>Service Name Match</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRules#getInstanceNameMatch <em>Instance Name Match</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.inventory.InventoryPackage#getInventoryConfigurationRules()
+ * @model
+ * @generated
+ */
+public interface InventoryConfigurationRules extends NamedEntity {
+	/**
+	 * Returns the value of the '<em><b>Type Name Match</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Type Name Match</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 Name Match</em>' attribute.
+	 * @see #setTypeNameMatch(String)
+	 * @see org.openecomp.dcae.controller.inventory.InventoryPackage#getInventoryConfigurationRules_TypeNameMatch()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getTypeNameMatch();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRules#getTypeNameMatch <em>Type Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Type Name Match</em>' attribute.
+	 * @see #getTypeNameMatch()
+	 * @generated
+	 */
+	void setTypeNameMatch(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Service Name Match</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service Name Match</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 Match</em>' attribute.
+	 * @see #setServiceNameMatch(String)
+	 * @see org.openecomp.dcae.controller.inventory.InventoryPackage#getInventoryConfigurationRules_ServiceNameMatch()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getServiceNameMatch();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRules#getServiceNameMatch <em>Service Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service Name Match</em>' attribute.
+	 * @see #getServiceNameMatch()
+	 * @generated
+	 */
+	void setServiceNameMatch(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Instance Name Match</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Instance Name Match</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Instance Name Match</em>' attribute.
+	 * @see #setInstanceNameMatch(String)
+	 * @see org.openecomp.dcae.controller.inventory.InventoryPackage#getInventoryConfigurationRules_InstanceNameMatch()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getInstanceNameMatch();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRules#getInstanceNameMatch <em>Instance Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Instance Name Match</em>' attribute.
+	 * @see #getInstanceNameMatch()
+	 * @generated
+	 */
+	void setInstanceNameMatch(String value);
+
+} // InventoryConfigurationRules
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryFactory.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryFactory.java
index ca0e968..968a460 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryFactory.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryFactory.java
@@ -157,6 +157,15 @@ public interface InventoryFactory extends EFactory {
 	UriBuilder createUriBuilder();
 
 	/**
+	 * Returns a new object of class '<em>Configuration Rule</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Configuration Rule</em>'.
+	 * @generated
+	 */
+	InventoryConfigurationRule createInventoryConfigurationRule();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryPackage.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryPackage.java
index c454c29..682ef6a 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryPackage.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/InventoryPackage.java
@@ -107,13 +107,22 @@ public interface InventoryPackage extends EPackage {
 	int DCAE_INVENTORY__SERVICES = 1;
 
 	/**
+	 * The feature id for the '<em><b>Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_INVENTORY__RULES = 2;
+
+	/**
 	 * The number of structural features of the '<em>Dcae Inventory</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DCAE_INVENTORY_FEATURE_COUNT = 2;
+	int DCAE_INVENTORY_FEATURE_COUNT = 3;
 
 	/**
 	 * The operation id for the '<em>Get Dcae Service Types</em>' operation.
@@ -206,13 +215,22 @@ public interface InventoryPackage extends EPackage {
 	int DCAE_INVENTORY___POLL = 9;
 
 	/**
+	 * The operation id for the '<em>Update Configuration</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_INVENTORY___UPDATE_CONFIGURATION = 10;
+
+	/**
 	 * The number of operations of the '<em>Dcae Inventory</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DCAE_INVENTORY_OPERATION_COUNT = 10;
+	int DCAE_INVENTORY_OPERATION_COUNT = 11;
 
 	/**
 	 * The meta object id for the '{@link org.openecomp.dcae.controller.inventory.impl.ApiResponseMessageImpl <em>Api Response Message</em>}' class.
@@ -1481,6 +1499,106 @@ public interface InventoryPackage extends EPackage {
 
 
 	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.inventory.impl.InventoryConfigurationRuleImpl <em>Configuration Rule</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.inventory.impl.InventoryConfigurationRuleImpl
+	 * @see org.openecomp.dcae.controller.inventory.impl.InventoryPackageImpl#getInventoryConfigurationRule()
+	 * @generated
+	 */
+	int INVENTORY_CONFIGURATION_RULE = 15;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVENTORY_CONFIGURATION_RULE__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 INVENTORY_CONFIGURATION_RULE__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 INVENTORY_CONFIGURATION_RULE__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 INVENTORY_CONFIGURATION_RULE__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Type Name Match</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVENTORY_CONFIGURATION_RULE__TYPE_NAME_MATCH = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Service Name Match</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVENTORY_CONFIGURATION_RULE__SERVICE_NAME_MATCH = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Instance Name Match</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVENTORY_CONFIGURATION_RULE__INSTANCE_NAME_MATCH = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Bp Node Name Match</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVENTORY_CONFIGURATION_RULE__BP_NODE_NAME_MATCH = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Configuration Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVENTORY_CONFIGURATION_RULE_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of operations of the '<em>Configuration Rule</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INVENTORY_CONFIGURATION_RULE_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+	/**
 	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.inventory.DcaeInventory <em>Dcae Inventory</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1513,6 +1631,17 @@ public interface InventoryPackage extends EPackage {
 	EReference getDcaeInventory_Services();
 
 	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.inventory.DcaeInventory#getRules <em>Rules</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Rules</em>'.
+	 * @see org.openecomp.dcae.controller.inventory.DcaeInventory#getRules()
+	 * @see #getDcaeInventory()
+	 * @generated
+	 */
+	EReference getDcaeInventory_Rules();
+
+	/**
 	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.inventory.DcaeInventory#getDcaeServiceTypes(java.lang.String, java.lang.Boolean, java.lang.Boolean, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Integer) <em>Get Dcae Service Types</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1613,6 +1742,16 @@ public interface InventoryPackage extends EPackage {
 	EOperation getDcaeInventory__Poll();
 
 	/**
+	 * Returns the meta object for the '{@link org.openecomp.dcae.controller.inventory.DcaeInventory#updateConfiguration() <em>Update Configuration</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Update Configuration</em>' operation.
+	 * @see org.openecomp.dcae.controller.inventory.DcaeInventory#updateConfiguration()
+	 * @generated
+	 */
+	EOperation getDcaeInventory__UpdateConfiguration();
+
+	/**
 	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.inventory.ApiResponseMessage <em>Api Response Message</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2600,6 +2739,60 @@ public interface InventoryPackage extends EPackage {
 	EClass getUriBuilder();
 
 	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule <em>Configuration Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Configuration Rule</em>'.
+	 * @see org.openecomp.dcae.controller.inventory.InventoryConfigurationRule
+	 * @generated
+	 */
+	EClass getInventoryConfigurationRule();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getTypeNameMatch <em>Type Name Match</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Type Name Match</em>'.
+	 * @see org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getTypeNameMatch()
+	 * @see #getInventoryConfigurationRule()
+	 * @generated
+	 */
+	EAttribute getInventoryConfigurationRule_TypeNameMatch();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getServiceNameMatch <em>Service Name Match</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Service Name Match</em>'.
+	 * @see org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getServiceNameMatch()
+	 * @see #getInventoryConfigurationRule()
+	 * @generated
+	 */
+	EAttribute getInventoryConfigurationRule_ServiceNameMatch();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getInstanceNameMatch <em>Instance Name Match</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Instance Name Match</em>'.
+	 * @see org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getInstanceNameMatch()
+	 * @see #getInventoryConfigurationRule()
+	 * @generated
+	 */
+	EAttribute getInventoryConfigurationRule_InstanceNameMatch();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getBpNodeNameMatch <em>Bp Node Name Match</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Bp Node Name Match</em>'.
+	 * @see org.openecomp.dcae.controller.inventory.InventoryConfigurationRule#getBpNodeNameMatch()
+	 * @see #getInventoryConfigurationRule()
+	 * @generated
+	 */
+	EAttribute getInventoryConfigurationRule_BpNodeNameMatch();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2649,6 +2842,14 @@ public interface InventoryPackage extends EPackage {
 		EReference DCAE_INVENTORY__SERVICES = eINSTANCE.getDcaeInventory_Services();
 
 		/**
+		 * The meta object literal for the '<em><b>Rules</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DCAE_INVENTORY__RULES = eINSTANCE.getDcaeInventory_Rules();
+
+		/**
 		 * The meta object literal for the '<em><b>Get Dcae Service Types</b></em>' operation.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -2729,6 +2930,14 @@ public interface InventoryPackage extends EPackage {
 		EOperation DCAE_INVENTORY___POLL = eINSTANCE.getDcaeInventory__Poll();
 
 		/**
+		 * The meta object literal for the '<em><b>Update Configuration</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation DCAE_INVENTORY___UPDATE_CONFIGURATION = eINSTANCE.getDcaeInventory__UpdateConfiguration();
+
+		/**
 		 * The meta object literal for the '{@link org.openecomp.dcae.controller.inventory.impl.ApiResponseMessageImpl <em>Api Response Message</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -3484,6 +3693,48 @@ public interface InventoryPackage extends EPackage {
 		 */
 		EClass URI_BUILDER = eINSTANCE.getUriBuilder();
 
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.inventory.impl.InventoryConfigurationRuleImpl <em>Configuration Rule</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.inventory.impl.InventoryConfigurationRuleImpl
+		 * @see org.openecomp.dcae.controller.inventory.impl.InventoryPackageImpl#getInventoryConfigurationRule()
+		 * @generated
+		 */
+		EClass INVENTORY_CONFIGURATION_RULE = eINSTANCE.getInventoryConfigurationRule();
+
+		/**
+		 * The meta object literal for the '<em><b>Type Name Match</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INVENTORY_CONFIGURATION_RULE__TYPE_NAME_MATCH = eINSTANCE.getInventoryConfigurationRule_TypeNameMatch();
+
+		/**
+		 * The meta object literal for the '<em><b>Service Name Match</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INVENTORY_CONFIGURATION_RULE__SERVICE_NAME_MATCH = eINSTANCE.getInventoryConfigurationRule_ServiceNameMatch();
+
+		/**
+		 * The meta object literal for the '<em><b>Instance Name Match</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INVENTORY_CONFIGURATION_RULE__INSTANCE_NAME_MATCH = eINSTANCE.getInventoryConfigurationRule_InstanceNameMatch();
+
+		/**
+		 * The meta object literal for the '<em><b>Bp Node Name Match</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INVENTORY_CONFIGURATION_RULE__BP_NODE_NAME_MATCH = eINSTANCE.getInventoryConfigurationRule_BpNodeNameMatch();
+
 	}
 
 } //InventoryPackage
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/DcaeInventoryImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/DcaeInventoryImpl.java
index 5e92c3a..f98c884 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/DcaeInventoryImpl.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/DcaeInventoryImpl.java
@@ -26,6 +26,7 @@ import org.openecomp.dcae.controller.inventory.DCAEServiceType;
 import org.openecomp.dcae.controller.inventory.DCAEServiceTypeRequest;
 import org.openecomp.dcae.controller.inventory.DcaeInventory;
 import org.openecomp.dcae.controller.inventory.DcaeServiceTypeResults;
+import org.openecomp.dcae.controller.inventory.InventoryConfigurationRule;
 import org.openecomp.dcae.controller.inventory.DcaeServiceResults;
 import org.openecomp.dcae.controller.inventory.InventoryPackage;
 
@@ -39,6 +40,7 @@ import org.openecomp.dcae.controller.inventory.InventoryPackage;
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.inventory.impl.DcaeInventoryImpl#getServiceTypes <em>Service Types</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.inventory.impl.DcaeInventoryImpl#getServices <em>Services</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.inventory.impl.DcaeInventoryImpl#getRules <em>Rules</em>}</li>
  * </ul>
  *
  * @generated
@@ -65,6 +67,16 @@ public class DcaeInventoryImpl extends MinimalEObjectImpl.Container implements D
 	protected EList<DCAEService> services;
 
 	/**
+	 * The cached value of the '{@link #getRules() <em>Rules</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRules()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<InventoryConfigurationRule> rules;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -112,6 +124,18 @@ public class DcaeInventoryImpl extends MinimalEObjectImpl.Container implements D
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EList<InventoryConfigurationRule> getRules() {
+		if (rules == null) {
+			rules = new EObjectContainmentEList<InventoryConfigurationRule>(InventoryConfigurationRule.class, this, InventoryPackage.DCAE_INVENTORY__RULES);
+		}
+		return rules;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public DcaeServiceTypeResults getDcaeServiceTypes(String typeName, Boolean onlyLatest, Boolean onlyActive, String vnfType, String serviceId, String serviceLocation, String asdcServiceId, String asdcResourceId, Integer offset) {
 		// TODO: implement this method
 		// Ensure that you remove @generated or mark it @generated NOT
@@ -222,6 +246,17 @@ public class DcaeInventoryImpl extends MinimalEObjectImpl.Container implements D
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public void updateConfiguration() {
+		// 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) {
@@ -229,6 +264,8 @@ public class DcaeInventoryImpl extends MinimalEObjectImpl.Container implements D
 				return ((InternalEList<?>)getServiceTypes()).basicRemove(otherEnd, msgs);
 			case InventoryPackage.DCAE_INVENTORY__SERVICES:
 				return ((InternalEList<?>)getServices()).basicRemove(otherEnd, msgs);
+			case InventoryPackage.DCAE_INVENTORY__RULES:
+				return ((InternalEList<?>)getRules()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -245,6 +282,8 @@ public class DcaeInventoryImpl extends MinimalEObjectImpl.Container implements D
 				return getServiceTypes();
 			case InventoryPackage.DCAE_INVENTORY__SERVICES:
 				return getServices();
+			case InventoryPackage.DCAE_INVENTORY__RULES:
+				return getRules();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -266,6 +305,10 @@ public class DcaeInventoryImpl extends MinimalEObjectImpl.Container implements D
 				getServices().clear();
 				getServices().addAll((Collection<? extends DCAEService>)newValue);
 				return;
+			case InventoryPackage.DCAE_INVENTORY__RULES:
+				getRules().clear();
+				getRules().addAll((Collection<? extends InventoryConfigurationRule>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -284,6 +327,9 @@ public class DcaeInventoryImpl extends MinimalEObjectImpl.Container implements D
 			case InventoryPackage.DCAE_INVENTORY__SERVICES:
 				getServices().clear();
 				return;
+			case InventoryPackage.DCAE_INVENTORY__RULES:
+				getRules().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -300,6 +346,8 @@ public class DcaeInventoryImpl extends MinimalEObjectImpl.Container implements D
 				return serviceTypes != null && !serviceTypes.isEmpty();
 			case InventoryPackage.DCAE_INVENTORY__SERVICES:
 				return services != null && !services.isEmpty();
+			case InventoryPackage.DCAE_INVENTORY__RULES:
+				return rules != null && !rules.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -334,6 +382,9 @@ public class DcaeInventoryImpl extends MinimalEObjectImpl.Container implements D
 			case InventoryPackage.DCAE_INVENTORY___POLL:
 				poll();
 				return null;
+			case InventoryPackage.DCAE_INVENTORY___UPDATE_CONFIGURATION:
+				updateConfiguration();
+				return null;
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/InventoryConfigurationRuleImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/InventoryConfigurationRuleImpl.java
new file mode 100644
index 0000000..702fd90
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/InventoryConfigurationRuleImpl.java
@@ -0,0 +1,326 @@
+/**
+ */
+package org.openecomp.dcae.controller.inventory.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.inventory.InventoryConfigurationRule;
+import org.openecomp.dcae.controller.inventory.InventoryPackage;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Configuration Rule</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.inventory.impl.InventoryConfigurationRuleImpl#getTypeNameMatch <em>Type Name Match</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.inventory.impl.InventoryConfigurationRuleImpl#getServiceNameMatch <em>Service Name Match</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.inventory.impl.InventoryConfigurationRuleImpl#getInstanceNameMatch <em>Instance Name Match</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.inventory.impl.InventoryConfigurationRuleImpl#getBpNodeNameMatch <em>Bp Node Name Match</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class InventoryConfigurationRuleImpl extends NamedEntityImpl implements InventoryConfigurationRule {
+	/**
+	 * The default value of the '{@link #getTypeNameMatch() <em>Type Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTypeNameMatch()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TYPE_NAME_MATCH_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTypeNameMatch() <em>Type Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTypeNameMatch()
+	 * @generated
+	 * @ordered
+	 */
+	protected String typeNameMatch = TYPE_NAME_MATCH_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getServiceNameMatch() <em>Service Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceNameMatch()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SERVICE_NAME_MATCH_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getServiceNameMatch() <em>Service Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceNameMatch()
+	 * @generated
+	 * @ordered
+	 */
+	protected String serviceNameMatch = SERVICE_NAME_MATCH_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getInstanceNameMatch() <em>Instance Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getInstanceNameMatch()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String INSTANCE_NAME_MATCH_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getInstanceNameMatch() <em>Instance Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getInstanceNameMatch()
+	 * @generated
+	 * @ordered
+	 */
+	protected String instanceNameMatch = INSTANCE_NAME_MATCH_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getBpNodeNameMatch() <em>Bp Node Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBpNodeNameMatch()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String BP_NODE_NAME_MATCH_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getBpNodeNameMatch() <em>Bp Node Name Match</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBpNodeNameMatch()
+	 * @generated
+	 * @ordered
+	 */
+	protected String bpNodeNameMatch = BP_NODE_NAME_MATCH_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected InventoryConfigurationRuleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return InventoryPackage.Literals.INVENTORY_CONFIGURATION_RULE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getTypeNameMatch() {
+		return typeNameMatch;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTypeNameMatch(String newTypeNameMatch) {
+		String oldTypeNameMatch = typeNameMatch;
+		typeNameMatch = newTypeNameMatch;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, InventoryPackage.INVENTORY_CONFIGURATION_RULE__TYPE_NAME_MATCH, oldTypeNameMatch, typeNameMatch));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getServiceNameMatch() {
+		return serviceNameMatch;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServiceNameMatch(String newServiceNameMatch) {
+		String oldServiceNameMatch = serviceNameMatch;
+		serviceNameMatch = newServiceNameMatch;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, InventoryPackage.INVENTORY_CONFIGURATION_RULE__SERVICE_NAME_MATCH, oldServiceNameMatch, serviceNameMatch));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getInstanceNameMatch() {
+		return instanceNameMatch;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setInstanceNameMatch(String newInstanceNameMatch) {
+		String oldInstanceNameMatch = instanceNameMatch;
+		instanceNameMatch = newInstanceNameMatch;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, InventoryPackage.INVENTORY_CONFIGURATION_RULE__INSTANCE_NAME_MATCH, oldInstanceNameMatch, instanceNameMatch));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getBpNodeNameMatch() {
+		return bpNodeNameMatch;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setBpNodeNameMatch(String newBpNodeNameMatch) {
+		String oldBpNodeNameMatch = bpNodeNameMatch;
+		bpNodeNameMatch = newBpNodeNameMatch;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, InventoryPackage.INVENTORY_CONFIGURATION_RULE__BP_NODE_NAME_MATCH, oldBpNodeNameMatch, bpNodeNameMatch));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__TYPE_NAME_MATCH:
+				return getTypeNameMatch();
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__SERVICE_NAME_MATCH:
+				return getServiceNameMatch();
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__INSTANCE_NAME_MATCH:
+				return getInstanceNameMatch();
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__BP_NODE_NAME_MATCH:
+				return getBpNodeNameMatch();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__TYPE_NAME_MATCH:
+				setTypeNameMatch((String)newValue);
+				return;
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__SERVICE_NAME_MATCH:
+				setServiceNameMatch((String)newValue);
+				return;
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__INSTANCE_NAME_MATCH:
+				setInstanceNameMatch((String)newValue);
+				return;
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__BP_NODE_NAME_MATCH:
+				setBpNodeNameMatch((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__TYPE_NAME_MATCH:
+				setTypeNameMatch(TYPE_NAME_MATCH_EDEFAULT);
+				return;
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__SERVICE_NAME_MATCH:
+				setServiceNameMatch(SERVICE_NAME_MATCH_EDEFAULT);
+				return;
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__INSTANCE_NAME_MATCH:
+				setInstanceNameMatch(INSTANCE_NAME_MATCH_EDEFAULT);
+				return;
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__BP_NODE_NAME_MATCH:
+				setBpNodeNameMatch(BP_NODE_NAME_MATCH_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__TYPE_NAME_MATCH:
+				return TYPE_NAME_MATCH_EDEFAULT == null ? typeNameMatch != null : !TYPE_NAME_MATCH_EDEFAULT.equals(typeNameMatch);
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__SERVICE_NAME_MATCH:
+				return SERVICE_NAME_MATCH_EDEFAULT == null ? serviceNameMatch != null : !SERVICE_NAME_MATCH_EDEFAULT.equals(serviceNameMatch);
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__INSTANCE_NAME_MATCH:
+				return INSTANCE_NAME_MATCH_EDEFAULT == null ? instanceNameMatch != null : !INSTANCE_NAME_MATCH_EDEFAULT.equals(instanceNameMatch);
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE__BP_NODE_NAME_MATCH:
+				return BP_NODE_NAME_MATCH_EDEFAULT == null ? bpNodeNameMatch != null : !BP_NODE_NAME_MATCH_EDEFAULT.equals(bpNodeNameMatch);
+		}
+		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(" (typeNameMatch: ");
+		result.append(typeNameMatch);
+		result.append(", serviceNameMatch: ");
+		result.append(serviceNameMatch);
+		result.append(", instanceNameMatch: ");
+		result.append(instanceNameMatch);
+		result.append(", bpNodeNameMatch: ");
+		result.append(bpNodeNameMatch);
+		result.append(')');
+		return result.toString();
+	}
+
+} //InventoryConfigurationRuleImpl
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/InventoryFactoryImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/InventoryFactoryImpl.java
index 5a25e6a..7678eaf 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/InventoryFactoryImpl.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/InventoryFactoryImpl.java
@@ -71,6 +71,7 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 			case InventoryPackage.LINK: return createLink();
 			case InventoryPackage.PARAMETER: return createParameter();
 			case InventoryPackage.URI_BUILDER: return createUriBuilder();
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE: return createInventoryConfigurationRule();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -231,6 +232,16 @@ public class InventoryFactoryImpl extends EFactoryImpl implements InventoryFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public InventoryConfigurationRule createInventoryConfigurationRule() {
+		InventoryConfigurationRuleImpl inventoryConfigurationRule = new InventoryConfigurationRuleImpl();
+		return inventoryConfigurationRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public InventoryPackage getInventoryPackage() {
 		return (InventoryPackage)getEPackage();
 	}
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/InventoryPackageImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/InventoryPackageImpl.java
index 9cfd0a8..f3f5f83 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/InventoryPackageImpl.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/impl/InventoryPackageImpl.java
@@ -22,6 +22,7 @@ import org.openecomp.dcae.controller.inventory.DCAEServiceType;
 import org.openecomp.dcae.controller.inventory.DCAEServiceTypeRequest;
 import org.openecomp.dcae.controller.inventory.DcaeInventory;
 import org.openecomp.dcae.controller.inventory.DcaeServiceTypeResults;
+import org.openecomp.dcae.controller.inventory.InventoryConfigurationRule;
 import org.openecomp.dcae.controller.inventory.DcaeServiceResults;
 import org.openecomp.dcae.controller.inventory.InventoryFactory;
 import org.openecomp.dcae.controller.inventory.InventoryPackage;
@@ -144,6 +145,13 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 	private EClass uriBuilderEClass = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass inventoryConfigurationRuleEClass = 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.
@@ -239,6 +247,15 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getDcaeInventory_Rules() {
+		return (EReference)dcaeInventoryEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EOperation getDcaeInventory__GetDcaeServiceTypes__String_Boolean_Boolean_String_String_String_String_String_Integer() {
 		return dcaeInventoryEClass.getEOperations().get(0);
 	}
@@ -329,6 +346,15 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EOperation getDcaeInventory__UpdateConfiguration() {
+		return dcaeInventoryEClass.getEOperations().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getApiResponseMessage() {
 		return apiResponseMessageEClass;
 	}
@@ -1148,6 +1174,51 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getInventoryConfigurationRule() {
+		return inventoryConfigurationRuleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getInventoryConfigurationRule_TypeNameMatch() {
+		return (EAttribute)inventoryConfigurationRuleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getInventoryConfigurationRule_ServiceNameMatch() {
+		return (EAttribute)inventoryConfigurationRuleEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getInventoryConfigurationRule_InstanceNameMatch() {
+		return (EAttribute)inventoryConfigurationRuleEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getInventoryConfigurationRule_BpNodeNameMatch() {
+		return (EAttribute)inventoryConfigurationRuleEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public InventoryFactory getInventoryFactory() {
 		return (InventoryFactory)getEFactoryInstance();
 	}
@@ -1174,6 +1245,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 		dcaeInventoryEClass = createEClass(DCAE_INVENTORY);
 		createEReference(dcaeInventoryEClass, DCAE_INVENTORY__SERVICE_TYPES);
 		createEReference(dcaeInventoryEClass, DCAE_INVENTORY__SERVICES);
+		createEReference(dcaeInventoryEClass, DCAE_INVENTORY__RULES);
 		createEOperation(dcaeInventoryEClass, DCAE_INVENTORY___GET_DCAE_SERVICE_TYPES__STRING_BOOLEAN_BOOLEAN_STRING_STRING_STRING_STRING_STRING_INTEGER);
 		createEOperation(dcaeInventoryEClass, DCAE_INVENTORY___DELETE_DCAE_SERVICE_TYPES_TYPE__STRING);
 		createEOperation(dcaeInventoryEClass, DCAE_INVENTORY___GET_DCAE_SERVICE_TYPES_TYPE__STRING);
@@ -1184,6 +1256,7 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 		createEOperation(dcaeInventoryEClass, DCAE_INVENTORY___GET_DCAE_SERVICES_SERVICE__STRING);
 		createEOperation(dcaeInventoryEClass, DCAE_INVENTORY___CREATE_DCAE_SERVICES_SERVICE__STRING_DCAESERVICEREQUEST);
 		createEOperation(dcaeInventoryEClass, DCAE_INVENTORY___POLL);
+		createEOperation(dcaeInventoryEClass, DCAE_INVENTORY___UPDATE_CONFIGURATION);
 
 		apiResponseMessageEClass = createEClass(API_RESPONSE_MESSAGE);
 		createEAttribute(apiResponseMessageEClass, API_RESPONSE_MESSAGE__CODE);
@@ -1289,6 +1362,12 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 		createEAttribute(parameterEClass, PARAMETER__VALUE);
 
 		uriBuilderEClass = createEClass(URI_BUILDER);
+
+		inventoryConfigurationRuleEClass = createEClass(INVENTORY_CONFIGURATION_RULE);
+		createEAttribute(inventoryConfigurationRuleEClass, INVENTORY_CONFIGURATION_RULE__TYPE_NAME_MATCH);
+		createEAttribute(inventoryConfigurationRuleEClass, INVENTORY_CONFIGURATION_RULE__SERVICE_NAME_MATCH);
+		createEAttribute(inventoryConfigurationRuleEClass, INVENTORY_CONFIGURATION_RULE__INSTANCE_NAME_MATCH);
+		createEAttribute(inventoryConfigurationRuleEClass, INVENTORY_CONFIGURATION_RULE__BP_NODE_NAME_MATCH);
 	}
 
 	/**
@@ -1328,11 +1407,13 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 		dcaeServiceTypeEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
 		linkEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
 		parameterEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		inventoryConfigurationRuleEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(dcaeInventoryEClass, DcaeInventory.class, "DcaeInventory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getDcaeInventory_ServiceTypes(), this.getDCAEServiceType(), null, "serviceTypes", null, 0, -1, DcaeInventory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getDcaeInventory_Services(), this.getDCAEService(), null, "services", null, 0, -1, DcaeInventory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDcaeInventory_Rules(), this.getInventoryConfigurationRule(), null, "rules", null, 0, -1, DcaeInventory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		EOperation op = initEOperation(getDcaeInventory__GetDcaeServiceTypes__String_Boolean_Boolean_String_String_String_String_String_Integer(), this.getDcaeServiceTypeResults(), "getDcaeServiceTypes", 0, 1, !IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, theEcorePackage.getEString(), "typeName", 0, 1, !IS_UNIQUE, IS_ORDERED);
@@ -1379,6 +1460,8 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
 		initEOperation(getDcaeInventory__Poll(), null, "poll", 0, 1, !IS_UNIQUE, IS_ORDERED);
 
+		initEOperation(getDcaeInventory__UpdateConfiguration(), null, "updateConfiguration", 0, 1, !IS_UNIQUE, IS_ORDERED);
+
 		initEClass(apiResponseMessageEClass, ApiResponseMessage.class, "ApiResponseMessage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getApiResponseMessage_Code(), theEcorePackage.getEIntegerObject(), "code", null, 0, 1, ApiResponseMessage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getApiResponseMessage_Type(), theEcorePackage.getEString(), "type", null, 0, 1, ApiResponseMessage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1484,6 +1567,12 @@ public class InventoryPackageImpl extends EPackageImpl implements InventoryPacka
 
 		initEClass(uriBuilderEClass, UriBuilder.class, "UriBuilder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
+		initEClass(inventoryConfigurationRuleEClass, InventoryConfigurationRule.class, "InventoryConfigurationRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getInventoryConfigurationRule_TypeNameMatch(), theEcorePackage.getEString(), "typeNameMatch", null, 0, 1, InventoryConfigurationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getInventoryConfigurationRule_ServiceNameMatch(), theEcorePackage.getEString(), "serviceNameMatch", null, 0, 1, InventoryConfigurationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getInventoryConfigurationRule_InstanceNameMatch(), theEcorePackage.getEString(), "instanceNameMatch", null, 0, 1, InventoryConfigurationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getInventoryConfigurationRule_BpNodeNameMatch(), theEcorePackage.getEString(), "bpNodeNameMatch", null, 0, 1, InventoryConfigurationRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		// Create resource
 		createResource(eNS_URI);
 	}
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/util/InventoryAdapterFactory.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/util/InventoryAdapterFactory.java
index a4ecd1f..f4225a2 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/util/InventoryAdapterFactory.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/util/InventoryAdapterFactory.java
@@ -130,6 +130,10 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl {
 				return createUriBuilderAdapter();
 			}
 			@Override
+			public Adapter caseInventoryConfigurationRule(InventoryConfigurationRule object) {
+				return createInventoryConfigurationRuleAdapter();
+			}
+			@Override
 			public Adapter caseNamedEntity(NamedEntity object) {
 				return createNamedEntityAdapter();
 			}
@@ -364,6 +368,20 @@ public class InventoryAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.inventory.InventoryConfigurationRule <em>Configuration Rule</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.inventory.InventoryConfigurationRule
+	 * @generated
+	 */
+	public Adapter createInventoryConfigurationRuleAdapter() {
+		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;
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/util/InventorySwitch.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/util/InventorySwitch.java
index bb72107..cca37d2 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/util/InventorySwitch.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/inventory/util/InventorySwitch.java
@@ -163,6 +163,13 @@ public class InventorySwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case InventoryPackage.INVENTORY_CONFIGURATION_RULE: {
+				InventoryConfigurationRule inventoryConfigurationRule = (InventoryConfigurationRule)theEObject;
+				T result = caseInventoryConfigurationRule(inventoryConfigurationRule);
+				if (result == null) result = caseNamedEntity(inventoryConfigurationRule);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -393,6 +400,21 @@ public class InventorySwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Configuration Rule</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>Configuration Rule</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseInventoryConfigurationRule(InventoryConfigurationRule 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;