Fixed vpgwc synchronizer issues
Change-Id: I5a8d11c8b6103b51637fec778370d0eca8bc15e5
diff --git a/xos/synchronizer/steps/sync_vpgwctenant.py b/xos/synchronizer/steps/sync_vpgwctenant.py
new file mode 100644
index 0000000..a8b9e22
--- /dev/null
+++ b/xos/synchronizer/steps/sync_vpgwctenant.py
@@ -0,0 +1,61 @@
+import os
+import sys
+#from django.db.models import Q, F
+#from services.vpgwc.models import VPGWCService, VPGWCTenant
+#from synchronizers.base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
+from synchronizers.new_base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
+from synchronizers.new_base.modelaccessor import *
+
+parentdir = os.path.join(os.path.dirname(__file__), "..")
+sys.path.insert(0, parentdir)
+
+class SyncVPGWCTenant(SyncInstanceUsingAnsible):
+
+ provides = [VPGWCTenant]
+
+ observes = VPGWCTenant
+
+ requested_interval = 0
+
+ template_name = "vpgwctenant_playbook.yaml"
+
+ service_key_name = "/opt/xos/configurations/mcord/mcord_private_key"
+
+ def __init__(self, *args, **kwargs):
+ super(SyncVPGWCTenant, self).__init__(*args, **kwargs)
+
+# def fetch_pending(self, deleted):
+#
+# if (not deleted):
+# objs = VPGWCTenant.get_tenant_objects().filter(
+# Q(enacted__lt=F('updated')) | Q(enacted=None), Q(lazy_blocked=False))
+# else:
+#
+# objs = VPGWCTenant.get_deleted_tenant_objects()
+#
+# return objs
+
+ def get_vpgwc(self, o):
+ if not o.provider_service:
+ return None
+
+ vpgwc = VPGWCService.objects.filter(id=o.provider_service.id)
+
+ if not vpgwc:
+ return None
+
+ return vpgwc[0]
+
+
+ # Gets the attributes that are used by the Ansible template but are not
+ # part of the set of default attributes.
+ def get_extra_attributes(self, o):
+ fields = {}
+ fields['tenant_message'] = o.tenant_message
+ vpgwc = self.get_vpgwc(o)
+ fields['service_message'] = vpgwc.service_message
+ return fields
+ # return {"display_message": o.display_message,
+ # "s5s8_pgw_tag": o.s5s8_pgw_tag,
+ # "image_name": o.image_name,
+ # }
\ No newline at end of file
diff --git a/xos/synchronizer/steps/vpgwctenant_playbook.yaml b/xos/synchronizer/steps/vpgwctenant_playbook.yaml
new file mode 100644
index 0000000..455290c
--- /dev/null
+++ b/xos/synchronizer/steps/vpgwctenant_playbook.yaml
@@ -0,0 +1,13 @@
+---
+- hosts: {{ instance_name }}
+ gather_facts: False
+ connection: ssh
+ user: ubuntu
+ become: yes
+ tasks:
+
+ - name: write message
+ shell: echo "{{ display_message }}" > /var/tmp/index.html
+
+ - name: setup s5s8_pgw interface config
+ shell: ./start_3gpp_int.sh eth1 {{ s5s8_pgw_tag }} {{ s5s8_pgw_ip }}/24
diff --git a/xos/synchronizer/vpgwc_config.yaml b/xos/synchronizer/vpgwc_config.yaml
deleted file mode 100755
index 0d6e5d1..0000000
--- a/xos/synchronizer/vpgwc_config.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: vpgwc-synchronizer
-accessor:
- username: xosadmin@opencord.org
- password: "@/opt/xos/services/vpgwc/credentials/xosadmin@opencord.org"
-required_models:
- - VPGWCService
- - VPGWCTenant
- - ServiceDependency
- - ServiceMonitoringAgentInfo
-dependency_graph: "/opt/xos/synchronizers/vpgwc/model-deps"
-steps_dir: "/opt/xos/synchronizers/vpgwc/steps"
-sys_dir: "/opt/xos/synchronizers/vpgwc/sys"
-model_policies_dir: "/opt/xos/synchronizers/vpgwc/model_policies"
\ No newline at end of file
diff --git a/xos/synchronizer/vpgwc_from_api_config b/xos/synchronizer/vpgwc_from_api_config
new file mode 100755
index 0000000..811b011
--- /dev/null
+++ b/xos/synchronizer/vpgwc_from_api_config
@@ -0,0 +1,21 @@
+Sets options for the syncrhonizer
+[observer]
+name=vpgwc
+dependency_graph=/opt/xos/synchronizers/vpgwc/model-deps
+steps_dir=/opt/xos/synchronizers/vpgwc/steps
+sys_dir=/opt/xos/synchronizers/vpgwc/sys
+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
+enable_watchers=True
+accessor_kind=api
+accessor_password=@/opt/xos/services/vpgwc/credentials/xosadmin@opencord.org
+#required_models=VPGWCService, VPGWCTenant, ServiceDependency, ServiceMonitoringAgentInfo
+[networking]
+use_vtn=True
+