Fixing refactoring issues in synchronizer
Change-Id: Ibcfb5a80842ec4a796dc34da36ac64c24fa8aff8
diff --git a/xos/synchronizer/run-from-api.sh b/xos/synchronizer/run-from-api.sh
index db371d5..a44bb56 100755
--- a/xos/synchronizer/run-from-api.sh
+++ b/xos/synchronizer/run-from-api.sh
@@ -1 +1,2 @@
-python vpgwc-synchronizer.py
+export XOS_DIR=/opt/xos
+python vpgwc-synchronizer.py -C $XOS_DIR/synchronizers/vpgwc/vpgwc_from_api_config
diff --git a/xos/synchronizer/steps/sync_vpgwc.py b/xos/synchronizer/steps/sync_vpgwc.py
deleted file mode 100644
index d9ec4f0..0000000
--- a/xos/synchronizer/steps/sync_vpgwc.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import os
-import sys
-from django.db.models import Q, F
-from services.vpgwc.models import VPGWCService, VPGWCTenant
-from synchronizers.base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
-
-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 = "sync_vpgwc.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
-
- # 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):
- return {"display_message": o.display_message,
- "s5s8_pgw_tag": o.s5s8_pgw_tag,
- "image_name": o.image_name,
- }
diff --git a/xos/synchronizer/steps/sync_vpgwc.yaml b/xos/synchronizer/steps/sync_vpgwc.yaml
deleted file mode 100644
index bd2884a..0000000
--- a/xos/synchronizer/steps/sync_vpgwc.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- 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/sync_vpgwc.py b/xos/synchronizer/sync_vpgwc.py
deleted file mode 100644
index d9ec4f0..0000000
--- a/xos/synchronizer/sync_vpgwc.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import os
-import sys
-from django.db.models import Q, F
-from services.vpgwc.models import VPGWCService, VPGWCTenant
-from synchronizers.base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
-
-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 = "sync_vpgwc.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
-
- # 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):
- return {"display_message": o.display_message,
- "s5s8_pgw_tag": o.s5s8_pgw_tag,
- "image_name": o.image_name,
- }
diff --git a/xos/synchronizer/sync_vpgwc.yaml b/xos/synchronizer/sync_vpgwc.yaml
deleted file mode 100644
index bd2884a..0000000
--- a/xos/synchronizer/sync_vpgwc.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- 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