CORD-2476 migrate addressmanager service to dynamic load
Change-Id: I529d4f2ab1ed4601e2fe152fcd96f40243c84d63
diff --git a/xos/addressmanager-onboard.yaml b/xos/addressmanager-onboard.yaml
index c57c7f2..82af00b 100644
--- a/xos/addressmanager-onboard.yaml
+++ b/xos/addressmanager-onboard.yaml
@@ -29,6 +29,3 @@
base_url: file:///opt/xos_services/addressmanager/xos/
# The following will concatenate with base_url automatically, if
# base_url is non-null.
- xproto: ./
- tosca_custom_types: addressmanager.yaml
- tosca_resource: tosca/resources/addressmanagerservice.py
diff --git a/xos/addressmanager.m4 b/xos/addressmanager.m4
deleted file mode 100644
index 68efa17..0000000
--- a/xos/addressmanager.m4
+++ /dev/null
@@ -1,33 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-# compile this with "m4 addressmanager.m4 > addressmanager.yaml"
-
-# include macros
-include(macros.m4)
-
-node_types:
-
- tosca.nodes.AddressManagerService:
- derived_from: tosca.nodes.Root
- description: >
- CORD: The Address Manager Service.
- capabilities:
- xos_base_service_caps
- properties:
- xos_base_props
- xos_base_service_props
diff --git a/xos/addressmanager.yaml b/xos/addressmanager.yaml
deleted file mode 100644
index d6f8f7f..0000000
--- a/xos/addressmanager.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-# compile this with "m4 addressmanager.m4 > addressmanager.yaml"
-
-# include macros
-# Note: Tosca derived_from isn't working the way I think it should, it's not
-# inheriting from the parent template. Until we get that figured out, use
-# m4 macros do our inheritance
-
-
-# Service
-
-
-# Subscriber
-
-
-
-
-# end m4 macros
-
-
-
-node_types:
-
- tosca.nodes.AddressManagerService:
- derived_from: tosca.nodes.Root
- description: >
- CORD: The Address Manager Service.
- capabilities:
- scalable:
- type: tosca.capabilities.Scalable
- service:
- type: tosca.capabilities.xos.Service
- properties:
- no-delete:
- type: boolean
- default: false
- description: Do not allow Tosca to delete this object
- no-create:
- type: boolean
- default: false
- description: Do not allow Tosca to create this object
- no-update:
- type: boolean
- default: false
- description: Do not allow Tosca to update this object
- replaces:
- type: string
- required: false
- descrption: Replaces/renames this object
- kind:
- type: string
- default: generic
- description: Type of service.
- view_url:
- type: string
- required: false
- description: URL to follow when icon is clicked in the Service Directory.
- icon_url:
- type: string
- required: false
- description: ICON to display in the Service Directory.
- enabled:
- type: boolean
- default: true
- published:
- type: boolean
- default: true
- description: If True then display this Service in the Service Directory.
- public_key:
- type: string
- required: false
- description: Public key to install into Instances to allows Services to SSH into them.
- private_key_fn:
- type: string
- required: false
- description: Location of private key file
- versionNumber:
- type: string
- required: false
- description: Version number of Service.
diff --git a/xos/macros.m4 b/xos/macros.m4
deleted file mode 100644
index 1533457..0000000
--- a/xos/macros.m4
+++ /dev/null
@@ -1,99 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Note: Tosca derived_from isn't working the way I think it should, it's not
-# inheriting from the parent template. Until we get that figured out, use
-# m4 macros do our inheritance
-
-define(xos_base_props,
- no-delete:
- type: boolean
- default: false
- description: Do not allow Tosca to delete this object
- no-create:
- type: boolean
- default: false
- description: Do not allow Tosca to create this object
- no-update:
- type: boolean
- default: false
- description: Do not allow Tosca to update this object
- replaces:
- type: string
- required: false
- descrption: Replaces/renames this object)
-# Service
-define(xos_base_service_caps,
- scalable:
- type: tosca.capabilities.Scalable
- service:
- type: tosca.capabilities.xos.Service)
-define(xos_base_service_props,
- kind:
- type: string
- default: generic
- description: Type of service.
- view_url:
- type: string
- required: false
- description: URL to follow when icon is clicked in the Service Directory.
- icon_url:
- type: string
- required: false
- description: ICON to display in the Service Directory.
- enabled:
- type: boolean
- default: true
- published:
- type: boolean
- default: true
- description: If True then display this Service in the Service Directory.
- public_key:
- type: string
- required: false
- description: Public key to install into Instances to allows Services to SSH into them.
- private_key_fn:
- type: string
- required: false
- description: Location of private key file
- versionNumber:
- type: string
- required: false
- description: Version number of Service.)
-# Subscriber
-define(xos_base_subscriber_caps,
- subscriber:
- type: tosca.capabilities.xos.Subscriber)
-define(xos_base_subscriber_props,
- kind:
- type: string
- default: generic
- description: Kind of subscriber
- service_specific_id:
- type: string
- required: false
- description: Service specific ID opaque to XOS but meaningful to service)
-define(xos_base_tenant_props,
- kind:
- type: string
- default: generic
- description: Kind of tenant
- service_specific_id:
- type: string
- required: false
- description: Service specific ID opaque to XOS but meaningful to service)
-
-# end m4 macros
-
diff --git a/xos/synchronizer/addressmanager_config.yaml b/xos/synchronizer/addressmanager_config.yaml
index 9067bcd..74559d2 100644
--- a/xos/synchronizer/addressmanager_config.yaml
+++ b/xos/synchronizer/addressmanager_config.yaml
@@ -14,9 +14,12 @@
# limitations under the License.
-name: addressmanager-synchronizer
+name: addressmanager
accessor:
username: xosadmin@opencord.org
password: "@/opt/xos/services/addressmanager/credentials/xosadmin@opencord.org"
+required_models:
+ - AddressManagerServiceInstance
dependency_graph: "/opt/xos/synchronizers/addressmanager/model-deps"
-model_policies_dir: "/opt/xos/synchronizers/addressmanager/model_policies"
\ No newline at end of file
+model_policies_dir: "/opt/xos/synchronizers/addressmanager/model_policies"
+models_dir: "/opt/xos/synchronizers/addressmanager/models"
\ No newline at end of file
diff --git a/xos/addressmanager.xproto b/xos/synchronizer/models/addressmanager.xproto
similarity index 100%
rename from xos/addressmanager.xproto
rename to xos/synchronizer/models/addressmanager.xproto
diff --git a/xos/models.py b/xos/synchronizer/models/models.py
similarity index 100%
rename from xos/models.py
rename to xos/synchronizer/models/models.py
diff --git a/xos/tosca/resources/addressmanagerservice.py b/xos/tosca/resources/addressmanagerservice.py
deleted file mode 100644
index f578c8f..0000000
--- a/xos/tosca/resources/addressmanagerservice.py
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from service import XOSService
-from services.addressmanager.models import *
-
-
-class XOSAddressManagerService(XOSService):
- provides = "tosca.nodes.AddressManagerService"
- xos_model = AddressManagerService
- copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "versionNumber", ]