diff options
| author |   Haddox, Anthony (ah0647) <ah0647@att.com> | 2019-12-09 18:16:01 +0000 |
|---|---|---|
| committer | Haddox, Anthony (ah0647) <ah0647@att.com> | 2019-12-09 18:16:01 +0000 |
| commit | 6930182013e32e9c39340968de64920933d6ac33 (patch) | |
| tree | 8a85d2fa574e55e9e075d433df5914af73d063d2 /grToolkit/provider/src/main/resources | |
| parent | 9b76e766b3adc72d7212ff6384cfa3421a5093fa (diff) | |
[CCSDK-1985]GR Toolkit Refactor
Refactor of the GR Toolkit provider module to allow for more
flexibility for different architectures. Health checking and
failover logic has been extracted into an abstract HealthResolver
class and several implementations for Single, Three, and Six
node controller architectures. Resolvers can be specified in
the gr-toolkit.properties file, or a fallback resolver can be
used if one is not specified.
Signed-off-by: Haddox, Anthony (ah0647) <ah0647@att.com>
Issue-ID: CCSDK-1985
Change-Id: I262407e9d8830d91c39c4e75134a9f1cb1d259fe
Diffstat (limited to 'grToolkit/provider/src/main/resources')
3 files changed, 2 insertions, 34 deletions
diff --git a/grToolkit/provider/src/main/resources/OSGI-INF/blueprint/GrToolkit.xml b/grToolkit/provider/src/main/resources/OSGI-INF/blueprint/GrToolkit.xml deleted file mode 100755 index 5a4492c56..000000000 --- a/grToolkit/provider/src/main/resources/OSGI-INF/blueprint/GrToolkit.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" - xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" - odl:use-default-for-reference-types="true"> - - <reference id="dataBroker" - interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" - odl:type="default" /> - - <reference id="notificationService" - interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService" - odl:type="default" /> - - <reference id="rpcRegistry" - interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" - odl:type="default" /> - - <reference id="dbLib" - interface="org.onap.ccsdk.sli.core.dblib.DbLibService" /> - - <reference id="configDatastore" interface="org.opendaylight.controller.cluster.datastore.DistributedDataStoreInterface" - odl:type="distributed-config"/> - - <bean id="provider" class="org.onap.ccsdk.sli.plugins.grtoolkit.GrToolkitProvider"> - <argument ref="dataBroker" /> - <argument ref="notificationService" /> - <argument ref="rpcRegistry" /> - <argument ref="dbLib" /> - <argument ref="configDatastore" /> - </bean> - - <odl:rpc-implementation ref="provider"/> -</blueprint> diff --git a/grToolkit/provider/src/main/resources/gr-toolkit.properties b/grToolkit/provider/src/main/resources/gr-toolkit.properties index c008eea98..e3463df08 100755 --- a/grToolkit/provider/src/main/resources/gr-toolkit.properties +++ b/grToolkit/provider/src/main/resources/gr-toolkit.properties @@ -17,6 +17,7 @@ # limitations under the License. # ============LICENSE_END========================================================= +resolver=org.onap.ccsdk.sli.plugins.grtoolkit.resolver.SingleNodeHealthResolver akka.conf.location=/opt/opendaylight/current/controller/configuration/initial/akka.conf adm.useSsl=true adm.fqdn= @@ -31,4 +32,4 @@ controller.port.akka=2550 mbean.cluster=/jolokia/read/akka:type=Cluster mbean.shardManager=/jolokia/read/org.opendaylight.controller:Category=ShardManager,name=shard-manager-config,type=DistributedConfigDatastore mbean.shard.config=/jolokia/read/org.opendaylight.controller:Category=Shards,name=%s,type=DistributedConfigDatastore -site.identifier=UniqueSiteNamehere +site.identifier=UniqueSiteNameHere diff --git a/grToolkit/provider/src/main/resources/org/opendaylight/blueprint/GrToolkit.xml b/grToolkit/provider/src/main/resources/org/opendaylight/blueprint/GrToolkit.xml index 5a4492c56..5a4492c56 100755..100644 --- a/grToolkit/provider/src/main/resources/org/opendaylight/blueprint/GrToolkit.xml +++ b/grToolkit/provider/src/main/resources/org/opendaylight/blueprint/GrToolkit.xml |