[MCORD-172] fix HSS Synchronizer issue
Change-Id: Idfaf125fdd549a42c14e5417dd4dd10a71a5114a
diff --git a/xos/synchronizer/run-from-api.sh b/xos/synchronizer/run-from-api.sh
index 3928852..7cfba17 100755
--- a/xos/synchronizer/run-from-api.sh
+++ b/xos/synchronizer/run-from-api.sh
@@ -1 +1,2 @@
-python vhss-synchronizer.py
+export XOS_DIR=/opt/xos
+python vhss-synchronizer.py -C $XOS_DIR/synchronizers/vhss/vhss_from_api_config
diff --git a/xos/synchronizer/steps/monitoring_agent.yaml b/xos/synchronizer/steps/monitoring_agent.yaml
deleted file mode 100644
index 08b1fe7..0000000
--- a/xos/synchronizer/steps/monitoring_agent.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-- hosts: {{ instance_name }}
- gather_facts: False
- connection: ssh
- user: ubuntu
- vars:
- keystone_tenant_id: {{ keystone_tenant_id }}
- keystone_user_id: {{ keystone_user_id }}
- target_uri: {{ target_uri }}
-
- tasks:
- - name: Verify if monitoring_agent ([] is to avoid capturing the shell process) cron job is already running
- shell: pgrep -f [m]onitoring_agent | wc -l
- register: cron_job_pids_count
-
- - name: DEBUG
- debug: var=cron_job_pids_count.stdout
-
- - name: make sure /usr/local/share/monitoring_agent exists
- file: path=/usr/local/share/monitoring_agent state=directory owner=root group=root
- become: yes
- when: cron_job_pids_count.stdout == "0"
-
- - name: Copy cron job to destination
- copy: src=/opt/xos/synchronizers/vhss/monitoring_agent/
- dest=/usr/local/share/monitoring_agent/
- become: yes
- when: cron_job_pids_count.stdout == "0"
-
- - name: Installing python-pip
- apt: name=python-pip state=present update_cache=yes
- become: yes
- when: cron_job_pids_count.stdout == "0"
-
- - name: Installing Flask
- pip: name=Flask
- become: yes
- when: cron_job_pids_count.stdout == "0"
-
- - name: install python-kombu
- apt: name=python-kombu state=present
- become: yes
- when: cron_job_pids_count.stdout == "0"
-
- - name: Initiate monitoring agent cron job
- command: python monitoring_agent.py &
- async: 9999999999999999
- poll: 0
- become: yes
- when: cron_job_pids_count.stdout == "0"
- args:
- chdir: /usr/local/share/monitoring_agent/
-
- - name : starting monitoring agent
- uri:
- url: http://localhost:5004/monitoring/agent/vhss/start
- method: POST
- body: '{ "target":"{{target_uri}}", "keystone_user_id": "{{keystone_user_id}}", "keystone_tenant_id": "{{keystone_tenant_id}}" }'
- force_basic_auth: yes
- status_code: 200
- body_format: json
diff --git a/xos/synchronizer/steps/sync_vhss.py b/xos/synchronizer/steps/sync_vhss.py
deleted file mode 100644
index a222fbf..0000000
--- a/xos/synchronizer/steps/sync_vhss.py
+++ /dev/null
@@ -1,83 +0,0 @@
-import os
-import sys
-from synchronizers.new_base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
-from synchronizers.new_base.modelaccessor import *
-from xos.logger import Logger, logging
-
-parentdir = os.path.join(os.path.dirname(__file__), "..")
-sys.path.insert(0, parentdir)
-
-logger = Logger(level=logging.INFO)
-
-class SyncVHSSTenant(SyncInstanceUsingAnsible):
-
- provides = [VHSSTenant]
-
- observes = VHSSTenant
-
- requested_interval = 0
-
- template_name = "sync_vhss.yaml"
-
- service_key_name = "/opt/xos/synchronizers/mcord/mcord_private_key"
-
- watches = [ModelLink(ServiceDependency,via='servicedependency'), ModelLink(ServiceMonitoringAgentInfo,via='monitoringagentinfo')]
-
- def __init__(self, *args, **kwargs):
- super(SyncVHSSTenant, self).__init__(*args, **kwargs)
-
- def get_vhss(self, o):
- if not o.provider_service:
- return None
-
- vhss = VHSSService.objects.filter(id=o.provider_service.id)
-
- if not vhss:
- return None
-
- return vhss[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
- vhss = self.get_vhss(o)
- fields['service_message'] = vhss.service_message
- return fields
-
- def delete_record(self, port):
- # Nothing needs to be done to delete an exampleservice; it goes away
- # when the instance holding the exampleservice is deleted.
- pass
-
- def handle_service_monitoringagentinfo_watch_notification(self, monitoring_agent_info):
- if not monitoring_agent_info.service:
- logger.info("handle watch notifications for service monitoring agent info...ignoring because service attribute in monitoring agent info:%s is null" % (monitoring_agent_info))
- return
-
- if not monitoring_agent_info.target_uri:
- logger.info("handle watch notifications for service monitoring agent info...ignoring because target_uri attribute in monitoring agent info:%s is null" % (monitoring_agent_info))
- return
-
- objs = VHSSTenant.objects.all()
- for obj in objs:
- if obj.provider_service.id != monitoring_agent_info.service.id:
- logger.info("handle watch notifications for service monitoring agent info...ignoring because service attribute in monitoring agent info:%s is not matching" % (monitoring_agent_info))
- return
-
- instance = self.get_instance(obj)
- if not instance:
- logger.warn("handle watch notifications for service monitoring agent info...: No valid instance found for object %s" % (str(obj)))
- return
-
- logger.info("handling watch notification for monitoring agent info:%s for ExampleTenant object:%s" % (monitoring_agent_info, obj))
-
- #Run ansible playbook to update the routing table entries in the instance
- fields = self.get_ansible_fields(instance)
- fields["ansible_tag"] = obj.__class__.__name__ + "_" + str(obj.id) + "_monitoring"
- fields["target_uri"] = monitoring_agent_info.target_uri
-
- template_name = "monitoring_agent.yaml"
- super(SyncVHSSTenant, self).run_playbook(obj, fields, template_name)
- pass
diff --git a/xos/synchronizer/steps/sync_vhsstenant.py b/xos/synchronizer/steps/sync_vhsstenant.py
new file mode 100644
index 0000000..88a3efb
--- /dev/null
+++ b/xos/synchronizer/steps/sync_vhsstenant.py
@@ -0,0 +1,83 @@
+import os
+import sys
+from synchronizers.new_base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
+from synchronizers.new_base.modelaccessor import *
+from xos.logger import Logger, logging
+
+parentdir = os.path.join(os.path.dirname(__file__), "..")
+sys.path.insert(0, parentdir)
+
+logger = Logger(level=logging.INFO)
+
+class SyncVHSSTenant(SyncInstanceUsingAnsible):
+
+ provides = [VHSSTenant]
+
+ observes = VHSSTenant
+
+ requested_interval = 0
+
+ template_name = "sync_vhss.yaml"
+
+ service_key_name = "/opt/xos/synchronizers/mcord/mcord_private_key"
+
+ #watches = [ModelLink(ServiceDependency,via='servicedependency'), ModelLink(ServiceMonitoringAgentInfo,via='monitoringagentinfo')]
+
+ def __init__(self, *args, **kwargs):
+ super(SyncVHSSTenant, self).__init__(*args, **kwargs)
+
+ def get_vhss(self, o):
+ if not o.provider_service:
+ return None
+
+ vhss = VHSSService.objects.filter(id=o.provider_service.id)
+
+ if not vhss:
+ return None
+
+ return vhss[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
+ # vhss = self.get_vhss(o)
+ # fields['service_message'] = vhss.service_message
+ # return fields
+
+ #def delete_record(self, port):
+ # # Nothing needs to be done to delete an exampleservice; it goes away
+ # # when the instance holding the exampleservice is deleted.
+ # pass
+
+ #def handle_service_monitoringagentinfo_watch_notification(self, monitoring_agent_info):
+ # if not monitoring_agent_info.service:
+ # logger.info("handle watch notifications for service monitoring agent info...ignoring because service attribute in monitoring agent info:%s is null" % (monitoring_agent_info))
+ # return
+
+ # if not monitoring_agent_info.target_uri:
+ # logger.info("handle watch notifications for service monitoring agent info...ignoring because target_uri attribute in monitoring agent info:%s is null" % (monitoring_agent_info))
+ # return
+
+ # objs = VHSSTenant.objects.all()
+ # for obj in objs:
+ # if obj.provider_service.id != monitoring_agent_info.service.id:
+ # logger.info("handle watch notifications for service monitoring agent info...ignoring because service attribute in monitoring agent info:%s is not matching" % (monitoring_agent_info))
+ # return
+
+ # instance = self.get_instance(obj)
+ # if not instance:
+ # logger.warn("handle watch notifications for service monitoring agent info...: No valid instance found for object %s" % (str(obj)))
+ # return
+
+ # logger.info("handling watch notification for monitoring agent info:%s for ExampleTenant object:%s" % (monitoring_agent_info, obj))
+
+ # #Run ansible playbook to update the routing table entries in the instance
+ # fields = self.get_ansible_fields(instance)
+ # fields["ansible_tag"] = obj.__class__.__name__ + "_" + str(obj.id) + "_monitoring"
+ # fields["target_uri"] = monitoring_agent_info.target_uri
+
+ # template_name = "monitoring_agent.yaml"
+ # super(SyncVHSSTenant, self).run_playbook(obj, fields, template_name)
+ # pass
diff --git a/xos/synchronizer/steps/sync_vhss.yaml b/xos/synchronizer/steps/vhsstenant_playbook.yaml
similarity index 88%
rename from xos/synchronizer/steps/sync_vhss.yaml
rename to xos/synchronizer/steps/vhsstenant_playbook.yaml
index c01980c..896fd87 100644
--- a/xos/synchronizer/steps/sync_vhss.yaml
+++ b/xos/synchronizer/steps/vhsstenant_playbook.yaml
@@ -1,5 +1,5 @@
---
-# exampletenant_playbook
+# vhsstenant_playbook
- hosts: "{{ instance_name }}"
connection: ssh
diff --git a/xos/synchronizer/vhss-synchronizer.py b/xos/synchronizer/vhss-synchronizer.py
old mode 100644
new mode 100755
diff --git a/xos/synchronizer/vhss_config.yaml b/xos/synchronizer/vhss_from_api_config
similarity index 85%
rename from xos/synchronizer/vhss_config.yaml
rename to xos/synchronizer/vhss_from_api_config
index e31350e..4e34eac 100644
--- a/xos/synchronizer/vhss_config.yaml
+++ b/xos/synchronizer/vhss_from_api_config
@@ -16,7 +16,7 @@
enable_watchers=True
accessor_kind=api
accessor_password=@/opt/xos/services/vhss/credentials/xosadmin@opencord.org
-required_models=VHSSService, VHSSTenant, ServiceDependency, ServiceMonitoringAgentInfo
+#required_models=VHSSService, VHSSTenant, ServiceDependency, ServiceMonitoringAgentInfo
[networking]
-use_vtn=True
\ No newline at end of file
+use_vtn=True