aboutsummaryrefslogtreecommitdiffstats
path: root/resource-assignment/provider/src/main/resources/org/opendaylight/blueprint/resource-assignment.xml
diff options
context:
space:
mode:
authorsb5356 <sb5356@att.com>2018-05-15 11:58:17 -0400
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-06-06 15:26:06 -0400
commit7893d08db0ef3fd29d64c9be759325fa18cc21fa (patch)
tree6f4344818c4089df46c5f19a1ff480ab015ccea4 /resource-assignment/provider/src/main/resources/org/opendaylight/blueprint/resource-assignment.xml
parent52a06cedb172a1a446ecfaaaa96bf500a58c8fb5 (diff)
[CCSDK-245] RA: Refactor RA to make it generic
Resource allocator is cleaned up and refactored so it does not contain any service specific logic. Issue-ID: CCSDK-245 Change-Id: Ib948eb813020fbe7dc779148e412de1e074b300b Signed-off-by: sb5356 <sb5356@att.com>
Diffstat (limited to 'resource-assignment/provider/src/main/resources/org/opendaylight/blueprint/resource-assignment.xml')
-rwxr-xr-xresource-assignment/provider/src/main/resources/org/opendaylight/blueprint/resource-assignment.xml17
1 files changed, 2 insertions, 15 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 6e11c664..3fba3c78 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
@@ -77,7 +77,6 @@
<bean id="resourceManager" class="org.onap.ccsdk.sli.adaptors.rm.comp.ResourceManagerImpl">
<property name="lockHelper" ref="lockHelper" />
<property name="resourceDao" ref="resourceDao" />
- <property name="applicationId" value="SDNC" />
<property name="lockTimeout" value="600" /> <!-- Seconds -->
</bean>
@@ -105,29 +104,17 @@
<bean id="endPointAllocator" class="org.onap.ccsdk.sli.adaptors.ra.comp.EndPointAllocatorImpl">
<property name="resourceManager" ref="resourceManager" />
- <property name="endPointAllocationDefinitionMap">
+ <property name="allocationRuleMap">
<map>
<entry key="DEFAULT">
<list>
- <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>
+ <ref component-id="dbAllocationRule" />
</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">