From 29beb25fa22b0445e3d1869dbf57540f27c07a55 Mon Sep 17 00:00:00 2001
From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
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-`)(UW6vjX2;@q2idWV)m>w;7Z34~NGqPf<hNuzZmks`6$ddAL>^{km4C$$vB
zALWgZcn}_iCqQTHo$-plfOxf=M7EMoUi<U;oijUgW`6%`VfK%w$F&9qKjQ$t1rYyP
z0vN!7W(ll>-+*_(@#_-USfY+wbqs7GQ75fB4pvUoDXUI^O(*J%RVTq_6Lrq2Ww7}~
zU9jpD*tJAmwCXh2Qlc(fbp~uDQCF=x3$~W1>sFlu+ep;wR-FgCk*GJVx&U@7QEyxI
z8rYpgy=&D)u=f)6eXA~k-AmN_R$T`BAW<J!bp`ChME%IBt6&ck^^sNAz$%IQ*sAMb
zAERFR1b|)#upflYNVPe8uH??!2JdJQNt*^G0GpHsw_tLBu!G)<NSkDMJr1v483WLu
zr{u9k7cBs|DB%L|O%l~B^nM5CSx*8u3&Jip7wZYSfQL<wUQ(efG*9v80IEkZS8<h{
z^DyM9T93M_!K*DU#kmSP9j>Zcb>(Tbt3_Dl^d+8jdU_gw?+Yok?^8O*<PD_;eE>b^
zUu#o?Y>E=zm8?yAf$^nyNA-Qtbsp)L;&941jJ5K8ipIcTg+eiKFM~GseLZVl*p65?
z<i79GxAEu-=i+|`%cIcH_loJm%cYqyP4HeR&a+I4evrwB3G$`of{ECS3-Q0p0gqxb
z0{#Z!oO5Nsdu94C%8XH9rkbFK!@Nut8A<+D#9GLf#~YDi8PxwsQ7^in<_I-~dbq|%
zi<;8?S_(D&w{xX9(+%uD4eKK<>Fdr_1|?1RhP4#u)pSX3Db8N?I=tvbecOdKM@4<t
zxyk@G-7RP;=EiRt>W0SeT@e-@^nDl79D#n|Tx9@y9>Bd6=p_I(c@~6%d52qvfePAj
z(M$S~i)oHXKX$G%AWie^hbhuGXkijb$s4p5`;PbaYTNrFZU?$?Qgq@~7uy^W|J1q4
zfH=*=o}`FVZSRXX7P7S!&>DBIwq116v~bVg-0TbIDg)AVbN(zvn%MW(SO<~bjk>b%
zYppL`L~~TpUprSBaHjfwn&M34kL0P0&gCAL;wsF)pSh6c2(;<oQO5{bfTkt9X^Y!7
z+0fAatgBBVC3LUoL-$@TN!OgK3`%+hz;3FfY5jQ^29oO+!JGaVz8&%SAkwC(QgrD1
zF1$G^@0ZS12GFT<@*)MD#_>b0+B7+f<c?C2Dmv)83u%r(A30YUfTo5S?RmIyoa((M
z<8HGl8iGshiPniO`~v&fMKwpPe{ilcU`<Wp@BhJiu-w|_A#VkmZ;HYX;J%A$j#vlI
zRR*j#0Q{I@eTSMUCn9A1f<B0Jz56ES`epMlP+S(CI(PBS5%rdHl>v3yaA7IxG*92+
zN)M|1YM?%KLCq2BwsVyMYU+*tltN9zJE5k^7A?uyX76g?{@DdKN4R6>Dg)d%0d!Kh
zX^Orl*kC85Px`sa;>6NOPb{3fu;vJM&$-F~Hf?O4rC`&fydH`(uCCHb`xh709I^h@
zxypbwHB&BzSszqr?xyL~ial{=PNkVMOXf6-IqG1xz|Hok**P<tDW=bEny{upXL>hg
zE#F_~(H+9f49!Hr+(OL2ViL|cxwLb1F&(b@s((=L8*`qH-g=`v^gBKD_pn~xDE|#h
CNh75I

literal 12102
zcmds-*=`#*6o!9!k@tPc-X=|&C@m17K#Kz1(0Df*JBE}1NeXl@7AcwWh@)~SI|5wv
zB7LLY^f`Lj$LJFjhtiN5^r}J4PRE7>`-evQ=kU`x<RO3kb8fo%+aG%k41Pudd<!7?
zy#z3T1I-dx3BLeuftRmJU?ZtIYSj_2u~Z$m>L^$_RVS=E1~!?hQ&t@Zn@-gktCqoL
zQ+3X&6JYbHx?t5wu*Fnevg#Dra;mOabsB6nRoARK1Gb*3SFAb<b~RP6S#=KVdaB;A
z>O9!ZRJ~=@1+e#0^?j=@g56HlJ62r+`yf^CT6G!hUaEd*)fKS&srtaGt6-H>eQ4D+
zu#Zr$d<;OZ0XPVwW~|zr?J2qarolT}#L{9=0<b|CT!&$Rh8^@?G|~o!SEH!aD<c3J
z^prj}>7qFR7bRQ(fq|%Aq4zs9&w3odSr~P>xmb_U1w3lj=p_}R&^#qu0IDZ(n^%+e
zad^sAwWH$KyrGk7CkiFkQFvVKM2%{TOL4BkPKT?iR$X~o?P?KKIo;EvPESt)2m&F6
z4g#V(A*(1g==117|611?<XV*Qwq#w?3ye+0JF0J!uB(xL8HOi};Y6z-pjZw3Rwz(|
zn~`Cg2Z5e8FKoxG8}T5h(aqK93TNuy4P}i2M|Yi&mvU)pMAJw=Q=I!Gs6Pbc!wkV?
zfn(x1<p$uN0aK$8T|O*kyl0$ALrJYnpG_EfV1mA0^l(fp(RV$T{EbMokgXbT#EN;y
zEIzqda3Rkx7c>yV*~2Rr^v#*ia6$iV7a0mFtM61@d?t%4&ZPfjK^1E?1I0=<S!^oK
zp7lDsVCmw93wnOj#Vu#jKN(cRXs+qX2&LGeGO{D0qET_j1w6l0+;t}XQ!xwRc7}>Y
z0Q>SRj0CG4Z61XxY$pXv77tv+^NYnpXVO0wwCcE@!Qv_{;$kUzgO;)1@!szK)`3Xc
zp>CWM43Dade17rx#F_Mu2Te2|W$>V^aUhaJ$kt{UMO^LfZxsxS&s@awi^b>8q<<`E
zLh)$^3j(FTJUxu{PTZA6Tc&>L;+<b8zIG=4LqVD0iwqQm$#Z!s<8!&or6}NP<gp8Q
zeyK1mS!(j(KcIp-CuSGKHadqY$m6a)iIvd3f>n^+{{t5L&ZPfju?%1*lPqXqe`K~J
zo`lE!QnD5E<S^Ez(^W7+4qWi_n>e02ll}>zcGi;&AyiI|xN6hvGnU&*#j0Rb)Lp>y
zOT}|%(mxf{@}$i(S57FC?8~IvY>I~9QrAT5L>H}*@zTXSzhHdtO!^0db_`zp4UEA`
zb&E&56>7dAidIJg7xVmr5jvCp!B_|ILk5hS)Zsc25$mUl!&uk5#|hU@n@6GIvS^5K
z7ybMq(sCyKBSIT_EQ1KGS~j`TgZxoQE>2y@^UFosne@*EwZdO#xS%RSTu{ysEy>wN
zuaIo~=)#^~HWFvjKO5HobTVwvf@N2*!IoMdi#_GzAfV6VI_ECv`6Z+0O!_B-_TJAj
zWY7|&9*Hxq3f$57$;CXsVEpV%`UitLTo=P&99C#@s_A@}J@si$hMJ>*=G>P#=VOj^
zm>qnxUu$;d%pQ#CxtkWNX{ec=Nq>n<h008Q&E&>ZGLy0loyN&!9c@kM2;*1%qqN_c
UBd+vG>*b-}$)Uf8_40c8FA~q4q5uE@

diff --git a/util/util.pyc b/util/util.pyc
index 72417b355eacc184e23344fb888aa0fe1d7b8f10..0f688c8277feaa039350a8bbfda85bc2013b2355 100644
GIT binary patch
delta 452
zcmca1uvD01^Cw=eZB~(<8#&Y%wM`fp81zGnQ;UlAQ_53wa#D-*gY!#^l2i55Q}Z&*
zixLY8Qj7FUic0gcCz~*qkfMI`Iz~g%EO^Saog@nuF^iLC!G4z2Bw0|v%14?7Eo`4j
Qv0!p7`z(^w%W_x)0DLf@XaE2J

delta 119
zcmZ1~d_#a^^Cw;|-sL~tH*%;kvhg!8FzD$`j$|x>GB^KVG=vL>FmHzmo3V()g)3NB
Z!-W0V_~63r?4M!gE#;U6V`gz$0{|Us7#9El

-- 
2.47.0