CORD-2509 migrate vmme service from static to dynamic load
Change-Id: I771dcbe22825b8f07ee469e53afe3ab2984dc847
diff --git a/xos/synchronizer/models/vmme.xproto b/xos/synchronizer/models/vmme.xproto
new file mode 100644
index 0000000..d8a4260
--- /dev/null
+++ b/xos/synchronizer/models/vmme.xproto
@@ -0,0 +1,22 @@
+option name = "vmme";
+option app_label = "vmme";
+
+message VMMEService (Service){
+ option verbose_name = "Virtual Mobility Management Entity Service";
+}
+
+message VMMEVendor (XOSBase){
+ option verbose_name = "Virtual Mobility Management Entity Vendor";
+
+ required string name = 1 [help_text = "vendor name", max_length = 32, null = False, db_index = False, blank = False];
+ required manytoone image->Image:+ = 2 [help_text = "select image for this vendor", db_index = True, null = False, blank = False];
+ required manytoone flavor->Flavor:+ = 3 [help_text = "select openstack flavor for vendor image", db_index = True, null = False, blank = False];
+}
+
+message VMMETenant (TenantWithContainer){
+ option verbose_name = "Virtual Mobility Management Entity Service Instance";
+
+ optional manytoone vmme_vendor->VMMEVendor:vendor_tenants = 1 [help_text = "select vendor of choice, leave blank for slice default", db_index = True, null = True, blank = True];
+ optional string enodeb_ip_addr = 2 [help_text = "external eNodeB IP address", max_length = 32, null = True, db_index = False, blank = True];
+}
+
diff --git a/xos/synchronizer/vmme_config.yaml b/xos/synchronizer/vmme_config.yaml
index 19adcb2..587736a 100644
--- a/xos/synchronizer/vmme_config.yaml
+++ b/xos/synchronizer/vmme_config.yaml
@@ -13,11 +13,16 @@
# limitations under the License.
-name: vmme-synchronizer
+name: vmme
accessor:
username: xosadmin@opencord.org
password: "@/opt/xos/services/vmme/credentials/xosadmin@opencord.org"
+required_models:
+ - VMMEService
+ - VMMEVendor
+ - VMMETenant
dependency_graph: "/opt/xos/synchronizers/vmme/model-deps"
steps_dir: "/opt/xos/synchronizers/vmme/steps"
sys_dir: "/opt/xos/synchronizers/vmme/sys"
+models_dir: "/opt/xos/synchronizers/vmme/models"
model_policies_dir: "/opt/xos/synchronizers/vmme/model_policies"
diff --git a/xos/synchronizer/vmme_from_api_config b/xos/synchronizer/vmme_from_api_config
deleted file mode 100644
index e53d5e3..0000000
--- a/xos/synchronizer/vmme_from_api_config
+++ /dev/null
@@ -1,20 +0,0 @@
-# Sets options for the synchronizer
-[observer]
-name=vmme
-dependency_graph=/opt/xos/synchronizers/vmme/model-deps
-steps_dir=/opt/xos/synchronizers/vmme/steps
-sys_dir=/opt/xos/synchronizers/vmme/sys
-#logfile=/var/log/xos_backend.log
-log_file=console
-log_level=debug
-pretend=False
-backoff_disabled=True
-save_ansible_output=True
-proxy_ssh=True
-proxy_ssh_key=/opt/cord_profile/node_key
-proxy_ssh_user=root
-accessor_kind=api
-accessor_password=@/opt/xos/services/vmme/credentials/xosadmin@opencord.org
-
-[networking]
-use_vtn=True