Resolve issues with uri module and JSON variables
Change-Id: I2b6ce5b444ad4460c83d944428cc740e62d49b67
diff --git a/xos/synchronizer/steps/sync_host.yaml b/xos/synchronizer/steps/sync_host.yaml
index 58bccba..8bc442f 100644
--- a/xos/synchronizer/steps/sync_host.yaml
+++ b/xos/synchronizer/steps/sync_host.yaml
@@ -1,20 +1,7 @@
---
- hosts: 127.0.0.1
connection: local
- vars:
- rest_hostname: {{ rest_hostname }}
- rest_port: {{ rest_port }}
- rest_endpoint: {{ rest_endpoint }}
- rest_json: '{{ rest_json }}'
tasks:
- - debug: var=rest_json
-
- - name: Call Fabric REST API
- uri:
- url: http://{{ '{{' }} rest_hostname {{ '}}' }}:{{ '{{' }} rest_port {{ '}}' }}/{{ '{{' }} rest_endpoint {{ '}}' }} #http://localhost:8181/onos/v1/network/configuration/
- body: "{{ '{{' }} rest_json {{ '}}' }}"
- body_format: raw
- method: POST
- user: karaf
- password: karaf
+ - name: Add host entry for fabric
+ command: curl -sS --user onos:rocks -X POST -HContent-Type:application/json -d '{{ rest_json }}' http://{{ rest_hostname }}:{{ rest_port }}/{{ rest_endpoint }}
diff --git a/xos/synchronizer/steps/sync_vroutertenant.py b/xos/synchronizer/steps/sync_vroutertenant.py
index fd77ca2..6a0cb86 100644
--- a/xos/synchronizer/steps/sync_vroutertenant.py
+++ b/xos/synchronizer/steps/sync_vroutertenant.py
@@ -88,7 +88,7 @@
}
}
- rest_json = json.dumps(data, indent=4)
+ rest_json = json.dumps(data)
fields = {
'rest_hostname': fos.rest_hostname,