CORD-2509 migrate sdn-controller service from static to dynamic load
Change-Id: Ie9146708fc4262a2376d2071531a7b792ac35d54
diff --git a/xos/macros.m4 b/xos/macros.m4
deleted file mode 100644
index 49a9b08..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/sdncontroller-onboard.yaml b/xos/sdncontroller-onboard.yaml
deleted file mode 100644
index b5f5ae2..0000000
--- a/xos/sdncontroller-onboard.yaml
+++ /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
-
-description: Onboard the SDN-Controller service
-
-imports:
- - custom_types/xos.yaml
-
-topology_template:
- node_templates:
- servicecontroller#sdncontroller:
- type: tosca.nodes.ServiceController
- properties:
- base_url: file:///opt/xos_services/sdn-controller/xos/
- # The following will concatenate with base_url automatically, if
- # base_url is non-null.
- xproto: ./
- private_key: file:///opt/xos/key_import/mcord_rsa
- public_key: file:///opt/xos/key_import/mcord_rsa.pub
-
diff --git a/xos/sdncontroller.xproto b/xos/synchronizer/models/sdncontroller.xproto
similarity index 100%
rename from xos/sdncontroller.xproto
rename to xos/synchronizer/models/sdncontroller.xproto
diff --git a/xos/synchronizer/sdncontroller_config.yaml b/xos/synchronizer/sdncontroller_config.yaml
index 95eae7b..5d64988 100644
--- a/xos/synchronizer/sdncontroller_config.yaml
+++ b/xos/synchronizer/sdncontroller_config.yaml
@@ -13,11 +13,16 @@
# limitations under the License.
-name: sdncontroller-synchronizer
+name: sdncontroller
accessor:
username: xosadmin@opencord.org
password: "@/opt/xos/services/sdncontroller/credentials/xosadmin@opencord.org"
+required_models:
+ - SDNControllerService
+ - SDNControllerVendor
+ - SDNControllerServiceInstance
dependency_graph: "/opt/xos/synchronizers/sdncontroller/model-deps"
steps_dir: "/opt/xos/synchronizers/sdncontroller/steps"
sys_dir: "/opt/xos/synchronizers/sdncontroller/sys"
+models_dir: "/opt/xos/synchronizers/sdncontroller/models"
model_policies_dir: "/opt/xos/synchronizers/sdncontroller/model_policies"