From 55104a55389b27d18001bb782d4de8172761edcb Mon Sep 17 00:00:00 2001
From: Cory Hawkless <cory@hawkless.id.au>
Date: Mon, 14 Nov 2022 12:22:32 +1030
Subject: [PATCH] Project Cleanup

---
 main.py                                       |   8 +++++---
 myOpenstackApp/OpenStackConnection.py         |   2 ++
 .../OpenStackConnection.cpython-310.pyc       | Bin 3670 -> 3714 bytes
 .../__pycache__/keystone.cpython-310.pyc      | Bin 3094 -> 3118 bytes
 myOpenstackApp/keystone.py                    |   2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

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 8fb2a6e5aa3ca3dfe435d7aa2a994beb33dc0b32..37bddf696cb91875b764cc46811936b2ac815563 100644
GIT binary patch
delta 471
zcmca6(<IB6&&$ij00e*L6(%!?Y~*WYVbq#Dg=G(;?BqaJ$w+}3#uTA!rlPVEo-F<v
zrW%eE{$8e9&ODY9ffV6p#wNxTks8h{K^6vPhHS>7wiHny*<QmL%)rP1R3TQv0+MZJ
z6lValgg`8iE=}>tt648{++uTa^>Gbxom|7_z$iR<FIy%%TS{t9YDwy3Rra}zMw1V-
zYcMeiY<|h!%_!pubmc9Mg2dwD^8BKdA`c+9$OlMhG8Oqup1}D~)C?qI0V0e+gb9eS
zp4`S|#Ar2nCzmv%&*ZCI+Pro^;ajW~DTyVCMb49Xxg}Ulfg%BuwYcxtIf1k=gNRTd
zp~+e#3t~rsh-eTI10rHU1P7b|g<eqzkZ79h!jotTGD4FLw??oPXu89IdfF%7<C&lW
zmgNSSC=MdzK!gj30J#xtOHtTl1wQe~D|t1ARXB`zSc_PIGMXGkV9y&*e#%=206p$x
AqW}N^

delta 464
zcmZpYy(Yt#&&$ij00bJd3zHWMZ{%xbVHBD?g=G(;;N(D7Nk^6v{uH5R#wNxT;Tp~?
z0Tu>khHS>7suU3*SzW^!%)rP1R3Tcz0+MZJ6lVal1VJp2E={q?hgmO9p2Ow<H1#f9
z=43ziIgEOfU$bj$7U$?>lyL{ze2b$XvADQAzbK{14ahC>0uq``MP8Hla6S|@1&Nr0
z2qO?-3?eKiZ{jkNwE!}2v6Q4%lxT7l$$~f>rNya5d5O8HK)sCI+FCXsLDq_t#FE4!
zN03Gh5WxW_K>jW=0TO<b!?^F*Ie@s#AR-t@XtIJ0Es6jMM1qJY5D^U`(2NKIiZx6w
z;7PP}0J1dMaBBp~qw5X<inUJW;+>!ZmgNR15eE@+Ai@bmfZSLFvZW|w@;+V%VI>YD
V9@ZijpnxVv5jcd5CJXWv0sxt_UP1r>

diff --git a/myOpenstackApp/__pycache__/keystone.cpython-310.pyc b/myOpenstackApp/__pycache__/keystone.cpython-310.pyc
index 0915f70a04a673f7f954cf2fddd6a411a5394ac9..60651ef1e7570f8b825d9aca116f090b31e60dcc 100644
GIT binary patch
delta 123
zcmbOxu}*?FpO=@50SHv)7bg2{<o&|Is5zO5^DLv@<O`hY95oE_Y&8s7Y?GO}%#<|Q
zi<p2ai}XMQCx{RN5yBus1Vrdhw&pV81{uf2D8R(Q$Tqo;Q)==wuE}hMAZg>t`rNII
K=99N_CjtNzWf(R9

delta 108
zcmZ1{F-?LupO=@50SH9q7AA*o<o&|IyON`b2`F%jB{MHAf3hQ&=wxNiHH=1+FL0{!
zEMQy6P{R<<Uc->ZKKVbV8B>wo<Zvz{4nCj;E=B>S$?cqqlh<)gW-|f`6q!tR=Wb=R
Jn0%Hy5did}8|DB2

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