diff --git a/main.py b/main.py index a24f0e8..f1365cb 100644 --- a/main.py +++ b/main.py @@ -7,6 +7,7 @@ import myOpenstackApp testProjectName="SmokeTest" testProjectExists=False testProject="" +cleanupResourcesOnCompletion=True y=myOpenstackApp.OSC y.initalise() @@ -41,8 +42,8 @@ else: def cleanUp(): - log.info["Cleaning up"] - log.info["Deleting project"] + log.info("Cleaning up") + log.info("Deleting project") y.ks.deleteProject(testProject['id']) #Delete VM #Delete router @@ -51,4 +52,5 @@ def cleanUp(): pass -cleanUp() +if cleanupResourcesOnCompletion: + cleanUp() diff --git a/myOpenstackApp/OpenStackConnection.py b/myOpenstackApp/OpenStackConnection.py index 70cefc6..cbf5401 100644 --- a/myOpenstackApp/OpenStackConnection.py +++ b/myOpenstackApp/OpenStackConnection.py @@ -67,6 +67,8 @@ class OpenStackConnection_x: response = requests.get(url, headers=headers) elif getPost=="POST": response = requests.post(url, data=data_json, headers=headers) + elif getPost=="DELETE": + response = requests.delete(url, headers=headers) else: raise ValueError("Unknown request type") diff --git a/myOpenstackApp/__pycache__/OpenStackConnection.cpython-310.pyc b/myOpenstackApp/__pycache__/OpenStackConnection.cpython-310.pyc index 8fb2a6e..37bddf6 100644 Binary files a/myOpenstackApp/__pycache__/OpenStackConnection.cpython-310.pyc and b/myOpenstackApp/__pycache__/OpenStackConnection.cpython-310.pyc differ diff --git a/myOpenstackApp/__pycache__/keystone.cpython-310.pyc b/myOpenstackApp/__pycache__/keystone.cpython-310.pyc index 0915f70..60651ef 100644 Binary files a/myOpenstackApp/__pycache__/keystone.cpython-310.pyc and b/myOpenstackApp/__pycache__/keystone.cpython-310.pyc differ diff --git a/myOpenstackApp/keystone.py b/myOpenstackApp/keystone.py index 44ac4fb..f304659 100644 --- a/myOpenstackApp/keystone.py +++ b/myOpenstackApp/keystone.py @@ -82,5 +82,5 @@ class myopenstack_keystone(): log.info("Deleting a project") _self.newProjectData=_self.connection.make_request("DELETE", "projects/"+id, "", - os.getenv("OS_AUTH_URL")).json() + os.getenv("OS_AUTH_URL")) return _self.newProjectData \ No newline at end of file