summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/vcpe/cleanvGMUX.py64
-rw-r--r--version-manifest/src/main/resources/docker-manifest-staging.csv18
-rw-r--r--version-manifest/src/main/resources/docker-manifest.csv18
3 files changed, 82 insertions, 18 deletions
diff --git a/test/vcpe/cleanvGMUX.py b/test/vcpe/cleanvGMUX.py
new file mode 100644
index 000000000..fe586fe53
--- /dev/null
+++ b/test/vcpe/cleanvGMUX.py
@@ -0,0 +1,64 @@
+#! /usr/bin/python
+
+import sys
+import logging
+import requests
+import json
+from datetime import datetime
+import time
+
+gmux_ip = '10.12.6.115'
+logging.basicConfig(level=logging.DEBUG, format='%(message)s')
+logger = logging.getLogger('')
+headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
+auth = 'admin', 'admin'
+base_url = 'http://{0}:8183/restconf/config/ietf-interfaces:interfaces'.format(gmux_ip)
+
+def list_interface():
+ url = base_url
+ logger.info(url)
+ r = requests.get(url, headers=headers, auth=auth)
+ logger.debug(r)
+ response = r.json()
+
+ logger.debug('---------------------------------------------------------------')
+ logger.debug(json.dumps(response, indent=4, sort_keys=True))
+ logger.debug('---------------------------------------------------------------')
+
+def clean_gmux():
+ url = base_url
+ r = requests.get(url, headers=headers, auth=auth)
+ response = r.json()
+
+ interfaces = response.get('interfaces').get('interface')
+ for inf in interfaces:
+ name = inf.get('name')
+ if name.startswith('vxlanTun10'):
+ logger.debug('name = {0}'.format(name))
+ delete_interface_v3po_l2(name)
+
+ for inf in interfaces:
+ name = inf.get('name')
+ if name.startswith('vxlanTun10'):
+ logger.debug('name = {0}'.format(name))
+ delete_interface(name)
+
+def delete_interface_v3po_l2(interface_name):
+ url = '{0}/interface/{1}/v3po:l2'.format(base_url, interface_name)
+ r = requests.delete(url, headers=headers, auth=auth)
+ logger.debug(r)
+
+def delete_interface(interface_name):
+ url = '{0}/interface/{1}'.format(base_url, interface_name)
+ r = requests.delete(url, headers=headers, auth=auth)
+ logger.debug(r)
+
+if __name__ == '__main__':
+ logger.debug('---------------------------------------------------------------')
+ logger.debug('list interfaces before cleaning gmux')
+ list_interface()
+ clean_gmux()
+ logger.debug('---------------------------------------------------------------')
+ logger.debug('list interfaces after cleaning gmux')
+ list_interface()
+
diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index 1410b722d..65c62d225 100644
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -124,15 +124,15 @@ onap/sdnc-ueb-listener-image,1.4.3
onap/search-data-service,1.3.1
onap/service-decomposition,1.4.2
onap/sniroemulator,1.0.0
-onap/so/api-handler-infra,1.3.2
-onap/so/bpmn-infra,1.3.2
-onap/so/catalog-db-adapter,1.3.2
-onap/so/openstack-adapter,1.3.2
-onap/so/request-db-adapter,1.3.2
-onap/so/sdc-controller,1.3.2
-onap/so/sdnc-adapter,1.3.2
-onap/so/so-monitoring,1.3.2
-onap/so/vfc-adapter,1.3.2
+onap/so/api-handler-infra,1.3.3
+onap/so/bpmn-infra,1.3.3
+onap/so/catalog-db-adapter,1.3.3
+onap/so/openstack-adapter,1.3.3
+onap/so/request-db-adapter,1.3.3
+onap/so/sdc-controller,1.3.3
+onap/so/sdnc-adapter,1.3.3
+onap/so/so-monitoring,1.3.3
+onap/so/vfc-adapter,1.3.3
onap/sparky-be,1.3.0
onap/spike,1.3.1
onap/testsuite,1.3.2
diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index b4b6f52e7..623060e38 100644
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -122,15 +122,15 @@ onap/sdnc-ueb-listener-image,1.4.3
onap/search-data-service,1.3.1
onap/service-decomposition,1.4.2
onap/sniroemulator,1.0.0
-onap/so/api-handler-infra,1.3.2
-onap/so/bpmn-infra,1.3.2
-onap/so/catalog-db-adapter,1.3.2
-onap/so/openstack-adapter,1.3.2
-onap/so/request-db-adapter,1.3.2
-onap/so/sdc-controller,1.3.2
-onap/so/sdnc-adapter,1.3.2
-onap/so/so-monitoring,1.3.2
-onap/so/vfc-adapter,1.3.2
+onap/so/api-handler-infra,1.3.3
+onap/so/bpmn-infra,1.3.3
+onap/so/catalog-db-adapter,1.3.3
+onap/so/openstack-adapter,1.3.3
+onap/so/request-db-adapter,1.3.3
+onap/so/sdc-controller,1.3.3
+onap/so/sdnc-adapter,1.3.3
+onap/so/so-monitoring,1.3.3
+onap/so/vfc-adapter,1.3.3
onap/sparky-be,1.3.0
onap/spike,1.3.1
onap/testsuite,1.3.2