From: Dan Timoney <dtimoney@att.com>
Date: Tue, 17 Oct 2017 16:00:56 +0000 (-0400)
Subject: Fix resource-assignment blueprint
X-Git-Tag: v0.1.0~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=50dd7801068958f82094614b8566e59c0cf0fbf0;p=ccsdk%2Fsli%2Fadaptors.git

Fix resource-assignment blueprint

Some entries in resource-assignment blueprint that had been
copied from spring blueprint needed to be changed slightly
due to differences between Spring and Aries.

Change-Id: I196f88f2036f30673bee0f3d23773616f6c1ba1b
Issue-ID: CCSDK-120
Signed-off-by: Dan Timoney <dtimoney@att.com>
---

diff --git a/resource-assignment/provider/src/main/resources/org/opendaylight/blueprint/resource-assignment.xml b/resource-assignment/provider/src/main/resources/org/opendaylight/blueprint/resource-assignment.xml
index 9d3f3e99..6e11c664 100755
--- a/resource-assignment/provider/src/main/resources/org/opendaylight/blueprint/resource-assignment.xml
+++ b/resource-assignment/provider/src/main/resources/org/opendaylight/blueprint/resource-assignment.xml
@@ -105,17 +105,29 @@
 
 	<bean id="endPointAllocator" class="org.onap.ccsdk.sli.adaptors.ra.comp.EndPointAllocatorImpl">
 		<property name="resourceManager" ref="resourceManager" />
-		<property name="allocationRuleMap">
+		<property name="endPointAllocationDefinitionMap">
 			<map>
 				<entry key="DEFAULT">
 					<list>
-						<ref component-id="dbAllocationRule" />
+                        <bean class="org.onap.ccsdk.sli.adaptors.ra.comp.EndPointAllocationDefinition">
+                            <property name="serviceModel" value="DEFAULT" />
+                            <property name="endPointPosition" value="DEFAULT" />
+                            <property name="equipmentReader" ref="vnfReader" />
+                            <property name="allocationRuleList">
+                                <list>
+                                    <ref component-id="dbAllocationRule" />
+                                </list>
+                            </property>
+                        </bean>
 					</list>
 				</entry>
 			</map>
 		</property>
 	</bean>
 
+    <bean id="vnfReader" class="org.onap.ccsdk.sli.adaptors.ra.reader.VnfReader">
+    </bean>
+
 	<!-- Resource Allocation Rule Configuration -->
 
 	<bean id="dbAllocationRule" class="org.onap.ccsdk.sli.adaptors.ra.alloc.DbAllocationRule">