CORD-2510 Migrate vEE to dynamic load
Change-Id: I14bb8cb1b9ef33005bba12ace37618d74fa0d7d5
diff --git a/xos/synchronizer/Makefile b/xos/synchronizer/Makefile
deleted file mode 100644
index 9e7dd90..0000000
--- a/xos/synchronizer/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-synchronizer:
- sudo docker build --rm -f Dockerfile.synchronizer -t xosproject/vee-synchronizer .
-
-up:
- docker-compose -p vee up -d
\ No newline at end of file
diff --git a/xos/synchronizer/docker-compose.yml b/xos/synchronizer/docker-compose.yml
deleted file mode 100644
index fb7c46d..0000000
--- a/xos/synchronizer/docker-compose.yml
+++ /dev/null
@@ -1,38 +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.
-
-
-version: '2'
-
-networks:
- xos:
- external: true
-
-services:
- synchronizer:
- image: xosproject/vee-synchronizer
- networks:
- - xos
- #command: bash -c "sleep 86400"
- volumes:
- - /opt/cord_profile/node_key:/opt/cord_profile/node_key:ro
- - /opt/cord/build/platform-install/credentials/xosadmin@opencord.org:/opt/xos/services/vee/credentials/xosadmin@opencord.org
- external_links:
- - rcordbs_xos_redis_1:redis
- logging:
- driver: "json-file"
- options:
- max-size: "1000k"
- max-file: "5"
\ No newline at end of file
diff --git a/xos/synchronizer/manifest b/xos/synchronizer/manifest
deleted file mode 100644
index 821e76b..0000000
--- a/xos/synchronizer/manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-manifest
-vee_synchronizer_config
-start.sh
-stop.sh
-model-deps
-run.sh
-vee-synchronizer.py
diff --git a/xos/synchronizer/models/vee.xproto b/xos/synchronizer/models/vee.xproto
new file mode 100644
index 0000000..62fc3de
--- /dev/null
+++ b/xos/synchronizer/models/vee.xproto
@@ -0,0 +1,15 @@
+option name = "vee";
+option app_label = "vee";
+option verbose_name = "VEE Service";
+
+message VEEService(Service){
+ optional bool autoconfig = 1 [default = True, help_text="Autoconfigure VEE Service", null=False];
+}
+
+message VEEServiceInstance (ServiceInstance){
+ option kind = "vEE";
+ option verbose_name = "vEE ServiceInstance";
+
+ optional int32 s_tag = 1 [help_text = "s-tag", null = True, db_index = False, blank = True];
+ optional int32 c_tag = 2 [help_text = "c-tag", null = True, db_index = False, blank = True];
+}
diff --git a/xos/synchronizer/vee_config.yaml b/xos/synchronizer/vee_config.yaml
index 1c79c89..9ec479f 100644
--- a/xos/synchronizer/vee_config.yaml
+++ b/xos/synchronizer/vee_config.yaml
@@ -12,10 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-name: vee-synchronizer
+name: vee
accessor:
username: xosadmin@opencord.org
password: "@/opt/xos/services/vee/credentials/xosadmin@opencord.org"
+required_models:
+ - VEEService
+ - VEEServiceInstance
dependency_graph: "/opt/xos/synchronizers/vee/model-deps"
steps_dir: "/opt/xos/synchronizers/vee/steps"
sys_dir: "/opt/xos/synchronizers/vee/sys"
+models_dir: "/opt/xos/synchronizers/vee/models"
\ No newline at end of file