From 29beb25fa22b0445e3d1869dbf57540f27c07a55 Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Tue, 30 Dec 2008 21:12:57 +0000 Subject: [PATCH] use /etc/planetlab/ for plc specific config info. --- util/config.py | 54 +++++++++++++++++++++++++++++++++++++++---------- util/excep.pyc | Bin 12102 -> 11142 bytes util/util.pyc | Bin 2136 -> 2469 bytes 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/util/config.py b/util/config.py index 562aee17..b9c860a8 100644 --- a/util/config.py +++ b/util/config.py @@ -14,13 +14,45 @@ # Note that Geniwrapper does not access any of the PLC databases directly via # a mysql connection; All PLC databases are accessed via PLCAPI. +import os +import sys + +# If we have been checked out into a directory at the same +# level as myplc, where plc_config.py lives. If we are in a +# MyPLC environment, plc_config.py has already been installed +# in site-packages. +myplc = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + \ + os.sep + "myplc" + +class Config: + """ + Parse the bash/Python/PHP version of the configuration file. Very + fast but no type conversions. + """ + + def __init__(self, file = "/etc/planetlab/plc_config"): + # Load plc_config + try: + execfile(file, self.__dict__) + except: + # Try myplc directory + try: + execfile(myplc + os.sep + "plc_config", self.__dict__) + except: + raise PLCAPIError("Could not find plc_config in " + \ + file + ", " + \ + myplc + os.sep + "plc_config") + + +plcConfig = Config() + def get_default_dbinfo(): - dbinfo={} - dbinfo['dbname'] = 'planetlab4' - dbinfo['address'] = 'localhost' - dbinfo['port'] = 5432 - dbinfo['user'] = 'pgsqluser' - dbinfo['password'] = '4c77b272-c892-4bdf-a833-dddeeee1a2ed' + dbinfo={ 'dbname' = plcConfig.PLC_DB_NAME, + 'address' = plcConfig.PLC_DB_HOST, + 'port' = plcConfig.PLC_DB_PORT, + 'user' = plcConfig.PLC_DB_USER, + 'password' = plcConfig.PLC_DB_PASSWORD + } return dbinfo @@ -35,10 +67,10 @@ def get_default_dbinfo(): # field from the dictionary. def get_pl_auth(): - pl_auth = {'Username': 'root@198.0.0.132', - 'AuthMethod': 'password', - 'AuthString': 'root', - "Url": "https://localhost:443/PLCAPI/" - } + pl_auth = {'Username': plcConfig.PLC_API_MAINTENANCE_USER, + 'AuthMethod': 'password', + 'AuthString': plcConfig.PLC_MAINTENANCE_PASSWORD, + "Url": 'https://%s:%s%s' %(plcConfig.PLC_API_HOST, plcConfig.PLC_API_PORT, plcConfig.PLC_API_PATH) + } return pl_auth diff --git a/util/excep.pyc b/util/excep.pyc index edb7e87d25158f251adddb80e54f919932fb4627..2795d569da43e03930227c54502dcdaa2541e859 100644 GIT binary patch literal 11142 zcmds->2BLb5XVQp&-ixkHfh>KX@Lj@S`66xB(J6Ff>EbPE~e^|QKv~Rr|ODPXGpH5>Y7n!Nv@~rb)(LaypgImjXF>AR;u1M z>NS#gQuVG;7f61TsvjG5k>tHpy>HYdlAomN1EVgJ{4`ZRGwKS-hpGC=sH-H)sruNc zYa~CXTKNlRtJnCn=lYE>YAN|53bx+XRa<*uV2T05rwtT?TYTa&0PKW!9W&{qFdUDP zsFg?f-*ueQql$;-`Sh+t?}(hF5Y@_f-+pq|<9vDM`W=-#tjF+x@*4slDf7`g#b5JP z_f=G>g`KFbDoqu5=aJiPv!tU=a9ZhT&#x$ai6`x@p5iAR#|u2|I4I6B ze4|nw25{ikxT)DwBCka6OB|h^oA^NDSESle&oBH#K))0ZC;3H=6YI!v5RJZrWrU*d zec-l~gRM|@e7+U5hOL&+EhX5<78i+PFf_QOEE^O`+;xB?K#Uw7N8=t+IshV{eR@S!I4UF%f_u+dteD`sJ%svCg4?fHcVecy&O zN1z{AuQC8V$JXw_qRHw-zS|AB$LvXQP(5%Xw-pyXr61uN=B}N7Y`w~WH2T>OVbPGj z!FSa#2vi+ou^&};XLobYi(9U)pA?;V#l|*Ax&5W}Dg)x^hdqHsLmauygk$c2S6z&8 znRwAjW8j{@-2TRTl>uoq&R@ZzAr1DuG1h*lx5G|Q__5ZvHljJo=H>DA$zp^CX4PbO804t>vtH%HK4S+6pHj+v8}uxQd7 z_4t8`TIigG!B!N7QPDxyY)Eqi`p|ln0ccE^Va>yWM!xR`ai`Jn>YfU;@R}#O@B{24 z8`T`K{@Hq!0c%VW{{)LBslmEG+}c#WYPwo&c)I9$&1-xmN@6^Ecpw8F- E0ZU0Er2qf` literal 12102 zcmds-*>2lL6o!wy@4KD7O`0ZAS|CD!76rN?vAo1+>=>g2XdIvdtr^LTDN-dzb_As8 zMfyg)>2vh5kI^US`6+Qmy-Z;b2+AN${*uU_XFi=-|M+KqrupaJPa8CNjq?A;yd{5? zh$N9BYL-Zr=y#&`M6ZtcWF%8ZjXFYdEK|pgI!baPQzwl&Msg}sr;R#Jawbz}jXFVc zE>q`?I!SUNQx}aoMRF-qmyJ42awSt&jXFbeEmPNxI!kgRQ?D3xj^x!$y=K&TlGii! zhEW$t-ptfnMqMQNQKo)u)FqO)Gxd&9mq~t-sdtUKLh{p0y=T-_lJ_(9fl=2;mNWIC zQP)X+Mz!+iT()|hcl%z@jN-PEPvda=Z9{dmAB6@3E_~Vq2G@DV44~Kv*E-^oPGLA2 zB~dGn@Y@aSvaO0Q&GYVEiQW;_Q;2G1T<;*=>v29j^MbBQzpTgb1r;;}K2qkbze~3G zsB#juRV8U3d#5U{bmHiZYUrfW3A|A0z&qxnMx~`f|2+0O9sY=pyWwf2tNoy&@Jx?7 zJw3%2s@MI{*Y!H+PGFTv4creKPK|5L#)lAwMOAo^($ToyQKJg50C{|gv_5M4ejX?f3DlPM))0`~?+4w%5t3!7zPna>WQ zP`&jN?T0O)8c{48ET%8~bT)ar_{`#xi$y#E5d6?Y;*tv##Bla-$_0Ko3ou}E1sF76?d&k_f*XB&2Phi$rnp}wij~$!I$E&dg#SoJ1JPQcz_4a zd)wlnHR&D;^g8atfWhJ_pH-tU~7(9?Q7>9(rBULX5RLpo342!R9#Pf^A*Vd$aEYP6%5(W$w0HxnOJ&5#9)D4T) zP5su!JHJqTZ%w*~0-50(7%)%(lb7LX7@dc^JhWKA-pCUh@cdFywIv9oWYGB^KVG=vL>FmHzmo3V()g)3NB Z!-W0V_~63r?4M!gE#;U6V`gz$0{|Us7#9El -- 2.43.0