diff options
| author |   sb5356 <sb5356@att.com> | 2018-05-15 11:58:17 -0400 |
|---|---|---|
| committer |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-06-06 15:26:06 -0400 |
| commit | 7893d08db0ef3fd29d64c9be759325fa18cc21fa (patch) | |
| tree | 6f4344818c4089df46c5f19a1ff480ab015ccea4 /resource-assignment/provider/src/main/resources/org | |
| parent | 52a06cedb172a1a446ecfaaaa96bf500a58c8fb5 (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')
2 files changed, 4 insertions, 15 deletions
diff --git a/resource-assignment/provider/src/main/resources/org/opendaylight/blueprint/resource-assignment-blueprint.xml b/resource-assignment/provider/src/main/resources/org/opendaylight/blueprint/resource-assignment-blueprint.xml index c2298af7d..11c284d64 100755 --- a/resource-assignment/provider/src/main/resources/org/opendaylight/blueprint/resource-assignment-blueprint.xml +++ b/resource-assignment/provider/src/main/resources/org/opendaylight/blueprint/resource-assignment-blueprint.xml @@ -26,4 +26,6 @@ <reference id="dblib.dataSource" interface="javax.sql.DataSource" filter="(objectClass=org.onap.ccsdk.sli.core.dblib.DbLibService)"/> + <service ref="resourceAllocator" interface="org.onap.ccsdk.sli.adaptors.ra.ResourceAllocator"/> + </blueprint> 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 6e11c664c..3fba3c781 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"> |