summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-10-17 12:00:56 -0400
committerDan Timoney <dtimoney@att.com>2017-10-17 12:01:00 -0400
commit50dd7801068958f82094614b8566e59c0cf0fbf0 (patch)
treef4e4edff62fe3ba3ffbca386f821983e6a91edcd
parentf80bc74d3e61c6f73a9b764eb6f7f05f8c8fa65a (diff)
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>
-rwxr-xr-xresource-assignment/provider/src/main/resources/org/opendaylight/blueprint/resource-assignment.xml16
1 files changed, 14 insertions, 2 deletions
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">