From aa73290eb2d5ce8a185ced6ee711675d53f74aed Mon Sep 17 00:00:00 2001 From: Cory Hawkvelt Date: Mon, 7 Nov 2022 09:23:32 +1030 Subject: [PATCH] First set of working module structure --- main.py | 13 +++++++++ myOpenstackApp/OpenStackConnection.py | 27 ++++++++++++++++++ myOpenstackApp/__init__.py | 3 ++ .../OpenStackConnection.cpython-310.pyc | Bin 0 -> 1088 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 253 bytes .../__pycache__/keystone.cpython-310.pyc | Bin 0 -> 924 bytes .../__pycache__/nova.cpython-310.pyc | Bin 0 -> 1091 bytes myOpenstackApp/keystone.py | 16 +++++++++++ myOpenstackApp/nova.py | 17 +++++++++++ 9 files changed, 76 insertions(+) create mode 100644 main.py create mode 100644 myOpenstackApp/OpenStackConnection.py create mode 100644 myOpenstackApp/__init__.py create mode 100644 myOpenstackApp/__pycache__/OpenStackConnection.cpython-310.pyc create mode 100644 myOpenstackApp/__pycache__/__init__.cpython-310.pyc create mode 100644 myOpenstackApp/__pycache__/keystone.cpython-310.pyc create mode 100644 myOpenstackApp/__pycache__/nova.cpython-310.pyc create mode 100644 myOpenstackApp/keystone.py create mode 100644 myOpenstackApp/nova.py diff --git a/main.py b/main.py new file mode 100644 index 0000000..a5a8028 --- /dev/null +++ b/main.py @@ -0,0 +1,13 @@ +import os, sys +sys.path.append(os.path.join(os.path.dirname(__file__), "lib")) + +import myOpenstackApp + + +y=myOpenstackApp.OSC +y.initalise() +# y.ks.getCatalog() +y.something() +# print(y._keystone) + +print("Starting") \ No newline at end of file diff --git a/myOpenstackApp/OpenStackConnection.py b/myOpenstackApp/OpenStackConnection.py new file mode 100644 index 0000000..1328b22 --- /dev/null +++ b/myOpenstackApp/OpenStackConnection.py @@ -0,0 +1,27 @@ +class OpenStackConnection_x: + someProp=0 + ks=False + nova=False + + catalogData="" + novaURL="" + + """ + It's important not to initalise any of the submodules during the init cycle becuase thic causes cirtucalr import loops + The initalise function exists for this reas and should be caled by the client application using this module + """ + def __init__(self) -> None: + pass + + def initalise(self) -> None: + from myOpenstackApp.keystone import myopenstack_keystone + from myOpenstackApp.nova import myopenstack_nova + + self.ks=myopenstack_keystone(self) + self.nova=myopenstack_nova(self) + pass + + def something(_self): + print(1) + _self.ks.getCatalog() + _self.nova.showNovaURL() diff --git a/myOpenstackApp/__init__.py b/myOpenstackApp/__init__.py new file mode 100644 index 0000000..b590813 --- /dev/null +++ b/myOpenstackApp/__init__.py @@ -0,0 +1,3 @@ +from myOpenstackApp import OpenStackConnection + +OSC=OpenStackConnection.OpenStackConnection_x() diff --git a/myOpenstackApp/__pycache__/OpenStackConnection.cpython-310.pyc b/myOpenstackApp/__pycache__/OpenStackConnection.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a8de70ff3e24a2a2b2b27c4d14bceb41cf163bce GIT binary patch literal 1088 zcmZ`%&5qMB5VoD9P1AN+?T&?G9J&2zxh0>+YJb;pHIgLaR~W^o9zWY@*Kn*fqF#*5p)4^ z!y+Qs1?f2n_;=PO;|$y>iKrkE6Et!Ji(C*-I8g(n*&?DN8lt&yBOfeZw7_bKK(rSm z3WNvMyY}>5k;;oQPNqX8Wtx-|CHd7I-uTiI+t6t_(=trx76!CYh9JfTB?#1_;SW&O zHEH%qd*H3r@7IH|%F{ujbTv3vmoihaFt8Qrps32Rl5fGx26=@*3<7yk6oWme`bA}Z z&L?tGa(;+cGf*!5_Ha)yzv{0;cc3GAm{vo70*0W1WhAH9l%nlqEO)LMC389_Hz3@d zvz6u5ZMvbx0?_G6Ua2)^K20lADw%@+aN94{*SOcP_jmj2ufuf z)~#zex&e+lzCQX(v2J2y3yF!diAj%PYcRV*J2YSc1&$u==V+6&LlVC2hNQ=^DRCl! zpgH+WZ`pTve6XBb7pU*e8QEi5MX(9a@+sDhz2`C@Nvi_J$84KLN a>G*X-*rWA-UkU3!TLL}9TJ>-rIe!2^^8M@p literal 0 HcmV?d00001 diff --git a/myOpenstackApp/__pycache__/__init__.cpython-310.pyc b/myOpenstackApp/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..fea3a0ebd69d95afd0b36a8873039813d6baa78a GIT binary patch literal 253 zcmd1j<>g`k0=3ArH2-6OiWs#KjUoB84G^F^3_SF^Z9qA(e3f(?W(Q<`kx2 z22JLdKv@P&##_Sv1*v(#C5g$|&iQ$HsmUdo`FVbtEVuY_D?u{FAQ{Jkf+CQyw?wfh zj<2}I>>upBlA(wVs02*>a?sDn&rQ`&&M&IecgZi$%gIknDF$*=QuPZeOEU8Fe1Xgy oeN-#-$jw$Oo@d6W0=_xt7P=`N1C-&Lto(ZEy4xNdE()q60@xN1LavAnM9cnfD%w=Uqk zP=)0j>oo`?r0Yk=z|Xdk8K}HlXz##J;9)`G8%lflEOEhGS(c^N8i)*PQz(lD@2FtU zj))n7<$Rgt`UI>F$AqpQ9L0fA2N(_nybt+;{-7x07s9Dv-OV~Vy<~m50L9Llys*#C zDs6gmJmT8DlL1D2_V*>;^rqTe)l!<+>^tpnBj;la9rmwZ8EckR_@MWOqY7BlM7z11Alf$o literal 0 HcmV?d00001 diff --git a/myOpenstackApp/__pycache__/nova.cpython-310.pyc b/myOpenstackApp/__pycache__/nova.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..949e6ad90975257185c730742deee48149ce566e GIT binary patch literal 1091 zcmZ{iv2NQi5I{*uwq?g@ofHX>qEk07*3u~miWDi(p^XC6Xa_HZD$=zTnN%n_t^#lI zhqOZn{}R_u{e@1wqoYDe+yi*JBTvW2yHmTn9Rl*|coP4lg#1FME-pByu=3}iIN>xU zBl?bThr27n-CJkma5^M??>C&2Fh*S$51dn2`7tN~|8jzV2siPP24)$1+~bXvH)`@G zZ>`9v#eLp}ug^Pt2fl6YLjJDl%}SLCnHN!f$)viDj29~@O;d|vu4NcIa6=_%<2r+t z;|rH`Nfz%3`AA zIhbiMD=#XTH(3@S&mb#}&)8H>3&xswF%op>&Cx^hK@}AvMkQ!N3pUJHw_f$J=-WBLX97B9*V{1^EP;vz}rSpMa6hyC20SvS`VBhNk~G! zJ3jynYiDTyWUu!8i!X_Y3*%pkGB1=A#uM>Gt*OScKcw6FDvI}afn7MafIWKi;!%le zf&XVbgcJo*(!{x?)LQpR8=0QU!gkoSuuGple$ac{$nuF=gqwh;NQNEgQfS{}wpwVv zgFTnf5XMZ0v6 None: + self.conn=conn + + def echo(_self): + print("Helllooo") + + + def getCatalog(_self): + catalog="Some shit, more shit" + _self.conn.catalogData=catalog + _self.conn.novaURL="http://nova" diff --git a/myOpenstackApp/nova.py b/myOpenstackApp/nova.py new file mode 100644 index 0000000..aa52a81 --- /dev/null +++ b/myOpenstackApp/nova.py @@ -0,0 +1,17 @@ +import myOpenstackApp.OpenStackConnection + + +class myopenstack_nova(): + + def __init__(self,conn: myOpenstackApp.OpenStackConnection.OpenStackConnection_x ) -> None: + self.conn=conn + + def addNewVM(_self,Name, flavor): + return(Name) + + def getKeystone(_self): + _self.myOpenstackObject.keystone.echo() + + def showNovaURL(_self): + print(_self.conn.novaURL) + _self.conn