From e93d53b1f259e2730a609504d4791b8cc2f5d760 Mon Sep 17 00:00:00 2001 From: Wojciech Janota Date: Fri, 11 Nov 2022 23:20:09 +0100 Subject: [PATCH] NXPR-3 Work --- config.yaml.example | 6 +++- config.yml | 7 ++++ fleetcontrol | 9 ++++- network/__init__.py | 1 + network/__pycache__/__init__.cpython-310.pyc | Bin 0 -> 208 bytes .../__pycache__/communication.cpython-310.pyc | Bin 0 -> 2532 bytes network/communication.py | 3 +- utils/__init__.py | 1 + utils/__pycache__/__init__.cpython-310.pyc | Bin 0 -> 185 bytes utils/config/__init__.py | 2 +- .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 206 bytes .../config/__pycache__/config.cpython-310.pyc | Bin 0 -> 1506 bytes utils/config/config.py | 31 +++++++++++++++--- utils/database/__init__.py | 1 + .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 210 bytes .../__pycache__/database.cpython-310.pyc | Bin 0 -> 6389 bytes utils/exceptions/__init__.py | 2 +- .../DatabaseException.cpython-310.pyc | Bin 0 -> 362 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 221 bytes utils/models/__init__.py | 2 +- .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 206 bytes .../models/__pycache__/models.cpython-310.pyc | Bin 0 -> 1541 bytes 22 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 config.yml create mode 100644 network/__pycache__/__init__.cpython-310.pyc create mode 100644 network/__pycache__/communication.cpython-310.pyc create mode 100644 utils/__pycache__/__init__.cpython-310.pyc create mode 100644 utils/config/__pycache__/__init__.cpython-310.pyc create mode 100644 utils/config/__pycache__/config.cpython-310.pyc create mode 100644 utils/database/__pycache__/__init__.cpython-310.pyc create mode 100644 utils/database/__pycache__/database.cpython-310.pyc create mode 100644 utils/exceptions/__pycache__/DatabaseException.cpython-310.pyc create mode 100644 utils/exceptions/__pycache__/__init__.cpython-310.pyc create mode 100644 utils/models/__pycache__/__init__.cpython-310.pyc create mode 100644 utils/models/__pycache__/models.cpython-310.pyc diff --git a/config.yaml.example b/config.yaml.example index 55f6a61..7f1a02d 100644 --- a/config.yaml.example +++ b/config.yaml.example @@ -1,3 +1,7 @@ server_name: "valhalla" server_port: 8088 -logging_level: "INFO" +server_loglevel: "INFO" +database_file: "database.db" +server_host: "localhost" +server_password: "sekret_password" +server_access_username: "user" \ No newline at end of file diff --git a/config.yml b/config.yml new file mode 100644 index 0000000..7f1a02d --- /dev/null +++ b/config.yml @@ -0,0 +1,7 @@ +server_name: "valhalla" +server_port: 8088 +server_loglevel: "INFO" +database_file: "database.db" +server_host: "localhost" +server_password: "sekret_password" +server_access_username: "user" \ No newline at end of file diff --git a/fleetcontrol b/fleetcontrol index 70a980a..05192c6 100644 --- a/fleetcontrol +++ b/fleetcontrol @@ -1,5 +1,12 @@ #!/usr/bin/python3 -import flask +from network.communication import Server +from utils.config.config import ServerConfig + +config = ServerConfig() +server = Server(host=config.server_host, port=config.server_port, name=config.server_name, access_password=config.server_password, + access_username=config.server_access_username, version="v0.0.1alpha", database_file_path=config.database_file, logging_level=config.server_loglevel) + +server.run() # vi: ft=python diff --git a/network/__init__.py b/network/__init__.py index e69de29..99927e9 100644 --- a/network/__init__.py +++ b/network/__init__.py @@ -0,0 +1 @@ +from . import communication diff --git a/network/__pycache__/__init__.cpython-310.pyc b/network/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..e2cac369703d481705bec062333aae9aab125687 GIT binary patch literal 208 zcmYjLK?=e!5KO8E5ej{PALyax11f$%5yXp^P?Duan@!oIs9*61eyLYae!-K8CkJ+h z85m|=o=;iC@_}j=^_9#&vS`-vd=W`A&0A*qk#nZAJu63V9^;Y^xpLO_XjC1H!)=)j zj8gTDU#ztk5Gp8OZMtl!s}>@EXproOMge*eB_Ptosp2z)>PnkRpHg#3k_qn`tv zi$Hn{m>_~?WI{tqQDzyN@Q_=XXU@b8T`N18H)(|}O0E&%3hxmSp7bB`unql|@S*QN zWMN0Nw@J|X8_p#GHE)eJN71DlJ6~>YUEjI1bN#z3(e=^Q&8=@h-WY~!l`3IJZs8!~MPC8wH-J^NA`z*`Eh=bAD)tBc#Tsp! zJY%D0Bw&WaDW;Va`EEMa0XL48*{*8CUWG1Ee#4$`4R2_v^e|8F%Y68)DsIW7)I*t% z(_BiG=Hv51j+Kq~u1kETOQZ`Ea=lWVL+{go<7!KlXlL57+}{4v z9R=KKXS`Zxdxg*ev-rbaEJQR@ zS)^u}3|bbx@ntTiMVgnU-$+p&Po!z>#kt6&Qpey@BnrES(;cAwHY`t;{#+P6! z4DZ)~G#-9}&W|ml!Tl|aFf>3EnNAc<3IWCfxfexuW^q=}D0FD;`PWgxlaJhHGr&3@ zeU1<{W`<9E<~zroo}+O5rG#ID!HYn81ne;3B^OLOfx&Ntco>geX$N@U|_s$sqRW;oV`Mq#+eohxb^gEoFr1~Xc}t`NheG*FoW!^ zV*xg5NI)|XixL*?reKz7T<)2ER*WH`$5AHl$}GXWY(A9Hi(dfguYoP93xgU%G2bFq zIlv)|fjgB4+%3JTRr!KG##OD-ulPf(N$s)&G0?Vh7c&z=9I8?O1w;xnBR&17rxv_{~OzH85=NVwH}d_E_iGj0xIxF#Y#wAL5aC?~w?w&c`5m6G&tH zdi3zes6+kz4qK!1)!HksE>~E(4$Oxsg-HMe=C}nf!Ed}a0ykZ76u8L7ZMd@NEPQ5d z0VT{D!m5wzJfpR02gTYJE3*#IQ<_AJ6VO5*!D5>*11Pc!urDooA$1Wol65-9J)*|< zb(^Ra=mu1M42?R6Z0Y_pN{&-qqAK!Ulw_&Q%cv}(##gwO-+y;qy+T*(@JH3}Ota)5zWeW;nc)hC{`!tB}3mQ=I+R zD)ctYBA7)LI>-E;&!Gz8_$cUx-MzA$Zq(LRSR6ywW<#ABCue1v>5aw(2ZBwbaIKz| t&EFWU@bxlYaT6c=I+yUCBc8TC#|$z4g}T0ej`5;#s0U9Z{?_g`kf+e%^k_CYDV-N=!FabFZKwQiNBvKes7;_jx7*d#m88n$+G6ID(8E-La z`2k6Wl?+8JKmjoE%UeIRIJKx)KQFT)HBUdFC_gJTxujS>H7`9gFEzC&GcR2?B{jV$ zHB~>qC^;jwxTGktB)>>Ev7kV|v?Md9SU)~KGcU6wK3=b&@)n0pZhlH>PO2Tq!eWq% Gco+c6v@Tx& literal 0 HcmV?d00001 diff --git a/utils/config/__init__.py b/utils/config/__init__.py index 9bf35e2..d63bc18 100644 --- a/utils/config/__init__.py +++ b/utils/config/__init__.py @@ -1 +1 @@ -from utils.config import ServerConfig +from . import config diff --git a/utils/config/__pycache__/__init__.cpython-310.pyc b/utils/config/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b1984a50d52b01ed7b18fe59a76bdbd61aae0362 GIT binary patch literal 206 zcmYjLK?=e!5ZqJ|5emKdh#oW_5b*_46fa&vN!A!?ld?%czv2)4Qm>x;f+rKbI50EJ z!tRdC^BF``cPr=7pDFw!i(wP#izo^dYoKLE#z19zC`T_A$0Zvk(%F;I+cFz~(#`{D z9PKOb9Y1&^&#k$l>8f?AZ*ZL&`1G=X4;{iZ00000 literal 0 HcmV?d00001 diff --git a/utils/config/__pycache__/config.cpython-310.pyc b/utils/config/__pycache__/config.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..1d71752c0d53f677d3ed036e18c90fb9c91e7114 GIT binary patch literal 1506 zcmZ{k&u`l{6vs(QmStJC+agO-U_gNa9gsug_FfECQ?(u7C4rSDs4ko;GOh|)@<=7A z19>fw^wh)tfgQTz{(=25yzaDrVZhKn%8KJA8woyr_~qlTM~Zo;;~+?X{+7jOO@#i^ zmE~kWiiN)iDzcfcw>EPG6P0$)NBG6H}i;ra+_!=;bb_=Xndv_~xfqE5nfUZ^4We85=`qqgPR|l~%9j6M5aAnUMJog3zj|Tp5&mYn)???Zt zy0bmpy{bOn4tB$}%OmV~L9o9)d=lQi+~RF+`awWnz*N;Vs|$xG-mdr93w-+Yhk+kn zU+9DFX9IuFAE>shZV}C*F<(?BxhNKu*SRcIhebv7Dw3QYBq>+Dy4NI<@;Dbvt=2*m z$6QK!2-RxDbH_9vrTmDe>pf-W6P_t^8jaJiC8GmQ(>!9T<-d*jq)75iH6|j-3Pp0M znmjv71Zc*H7s7-KEgIUu&xeGijjc^f8~tmpyULV2Jy7lWam<%%$wKgGtT0#BTn|^4 z_Dys6k3_=wLe&Ads_IBwsB4#EaM5!6zk_k%u=-UrFZ7#rM~K!a$wrHYKajWyoBL;{ z{{lQ@KTF>7tiL1jH#{z6pJ(9BIRtHVkMWVD#@9Ymq~D*NGlw(s@3DfQ-UWaAsg7g+3(j{pDw literal 0 HcmV?d00001 diff --git a/utils/config/config.py b/utils/config/config.py index 0aff9b4..7a5d0e4 100644 --- a/utils/config/config.py +++ b/utils/config/config.py @@ -1,11 +1,12 @@ import os import yaml -class ServerConfig: + +class ServerConfig: def __init__(self): config_file = {} - with open("~/.config/orchestrator/config.yml", "r") as stream: + with open("config.yml", "r") as stream: try: config_file = yaml.safe_load(stream) except Exception as e: @@ -15,18 +16,38 @@ class ServerConfig: server_name_override = os.environ.get("VALHALLA_SERVER_NAME") server_port_override = os.environ.get("VALHALLA_SERVER_PORT") + server_host_override = os.environ.get("VALHALLA_SERVER_HOST") + server_password_override = os.environ.get("VALHALLA_SERVER_PASSWORD") + server_access_username_override = os.environ.get( + "VALHALLA_SERVER_ACCESS_USERNAME") database_file_override = os.environ.get("VALHALLA_DATABASE_FILE") + server_logging_override = os.environ.get("VALHALLA_LOGLEVEL") if server_name_override: config["server_name"] = server_name_override - + if server_port_override: config["server_port"] = server_port_override - + + if server_host_override: + config["server_host"] = server_host_override + if database_file_override: config["database_file"] = database_file_override + if server_password_override: + config["server_password"] = server_password_override + + if server_access_username_override: + config["server_access_username"] = server_access_username_override + + if server_logging_override: + config["server_loglevel"] = server_logging_override + self.server_name = config["server_name"] self.server_port = config["server_port"] self.database_file = config["database_file"] - \ No newline at end of file + self.server_host = config["server_host"] + self.server_password = config["server_password"] + self.server_access_username = config["server_access_username"] + self.server_loglevel = config["server_loglevel"] diff --git a/utils/database/__init__.py b/utils/database/__init__.py index e69de29..62a5b3c 100644 --- a/utils/database/__init__.py +++ b/utils/database/__init__.py @@ -0,0 +1 @@ +from . import database diff --git a/utils/database/__pycache__/__init__.cpython-310.pyc b/utils/database/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7ad363eb51461f8bc4b4b4eb4c8ac6ad1f94bdd8 GIT binary patch literal 210 zcmYjLK?=e!5ZqJ`MJV*<8+xeufQT;;LA`hhu~}-QP0DTx`W1iRmwNT&7d)8?f&(+d zEbQ+1ESo`uy1Qx~{W*qzBr&WbIget%hz4456aq}LgJSX$aa@QYH9F{%X519X05onr zfTq#D^4`k>Be8V$icW6HU$6=+(bd)=l67@yuqH(5sX8ME(!o=yyH57OHY|VlrBc?} Vpwyzf4e7G=rf+aHw&3w;4j&YaHIo1U literal 0 HcmV?d00001 diff --git a/utils/database/__pycache__/database.cpython-310.pyc b/utils/database/__pycache__/database.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..772f4a4d219ffa19ec4e4a3d3ab3a5415ae59688 GIT binary patch literal 6389 zcmd5>*>e-g9iCfyN!5wHWBY$}B8E|?=uz-$2vwW>;~WOdsNJCaP#7?4V) zs6cJ)%Z8VI$yH@P@-NM6o_O9jcES06J%=>%nB*m?$Tdw*Pj^qx_x+Bqo9^UfQNi!) z^PSeWdlcoLbTj(Xaq~GYZyp6xnCdERwXUjE*Iccw*L7LfU88N*&9+sy8LY%6(OO_-j!%h3 z8*Ce!LhA(Ej*%LxupPK7(OopxPPPjzlhN}k+l{+2+rzivc@gj0%l4sVO3ql6>-mW7 zN6U70AbLBs8tfoDgw_hPQ>};D5wz}LM=_Vij^WP z1(Pg7va#s6JeYL5OQ2z?;qu4aZIJ=QzZ@!LF0;72?@{!peVD{R{hRU+?S;Ck`|1m2 z)fgBLwE-~x4rVeiUMK^lq5H;~>09e6>N&!lnS?dVv%=r4Rdb*`%&p}I=0Mx4tYg%D znAaV}Q2at~PE}T6QvGdyabUf`Gk<~=>EHXxSLn5BJ+r89SbL&AQEC(O{i65Cb$otd zW@ZMaVk|fvCSU@}8(RIFom3p8;uICvfnTj8Gz=DmQN7UWb{3tb6~TjCWWGTz!ZIi< zasLKz1_pin-%&> zJ$EPclzJ7Dg_Jeg&E;hxkU1?s(D>8Wia3HXZ|}~0>2cxBbeyNWGxLS$KIARmn+a#) zc-_)j#+L-=GhNYoz&&3y{jNBR*=AOJ$Mt4nLrE&r%RTxYr{nmI2Cd6GfkIQunx&T1 zyjs%mQ{zADZ8cv;YgNrZ*WULN51x)^2rR+<713!CSMiU)O^ogv+$<@pYX1mKMp;wW zl~)xQ8PzpkUsug)3}@ftkI_Ffa`UR>3UR zS`Ox{kvWqY(wibP)1GNG56lcTX=d7d|Lj#Ey21vxKEShG$Mfy(qTQ0g%Ci?mw{6Fm zU9f9;u^Y<|%mohr3d~0-M}`Lz?PjadWDKwK zT4dMpkCvEXfKcckOBmQ0GVl-#3{<9mr%4vHF%~q*!l5x1(3-FSw)#^M3kV=F3lRhQ zGkt*GcsFX20e!xviZfVT|9F~+5D;8sZUKAsd!zfC0L|idp&5Fw5`vqfL6kkqkb@rVGm9 zM>QV9gOTh$Ob`tB|AwHS1B3odCPC6+z>?Qp^np3IqmSE)DnapjNR*hyZOjwBW^0}f z40-Yh*)*8Hz*rf%GPnvo=pA`bdBf1a*Sr3S48Ag^4f2oM4TtnfiY*IoOWdi08_8C6 zpsXnfUiv`4qWrN$S#%AV^&tY0*fr4B^mT--M+F3~&}EF?CkR|-6u8Va3xUgwU4~|i z+{S!{tSa3GwK#B{OVcqPxSlxv1N+`h+v#{dA`@pIBqx4`rPik&G`$9WR{SU^$}eo7 z{Xt+MS8(Lo#Fs*ftk9Jx(MpQyr6^=I=*@u@-eo%2?lIzGL_fn^iF@TK)!@>QR*c-H zaA$8tS3H^cC1y);luA0^;%WbM67KfJ31^^El926^9a%#H3iZn{0g*mI0y>%weUZX3 zd$Umjnv6o zZ%0DOa7>DTRL=P;ChC7o4g!Y&=&Kr_k}mP;00@Zhje*SC@|j6A$eJZiFV{;3e}c9%JeJz}N1K;jA>Wcv^JC^JXKdq(`B zCyR7=Z9>ct#+2GdXfoSeKra58S}#yB^sVr3RrB5;9JHO*ksr>05tAlt+bW`b$Y9kJ;SHyQ(M4>H2a{w*;7 zY{Y=awi+KW;J0VOkP(9&XKM+-rd`JCY{18q69tTDe<7}*o(Xd?LCW*c=Z83+Pf<{K zU)D(zRW_t`599f8OsouOx4Wfri&?o6Qu4p2bzGz3I<-amTefbw#O=xJNY&As1{mwn z=03|7MpnEp+a72N@iB&Pxnl1*o^Cdap*tcwWxHawSr|Ps3(7X+iX`MR_dZ#!NbBsM z|Dbh9Dd#Qomb2(^W|K;jVvcsA<4&3FkMxqQZ6r+qP5%w`pQDv+0kKqyrnKG^$f>mP zXPV%@r@5|e?TMth!Xtpq%IoB8cg1C$lfLaWAM~AxfEKnAF8@>GnTTPq(P&r&MH-Qi_z1 zK9+!-yd8MLOs+Eaqu{u$ntQ2wODursHS}fy|eQOhSI&*EhI5%wfqY;BUqqi!KN3FX@tM9i9ix_Lt1ez5qg9P_ZjWh)p+^v4`L)wNu-X${H@im9pgs>{u~Q zL;>-nH=fVac%GZhCP4VOc~m96@2U8W5fw{fm{Yh04Vt|Y5nl2Q)7c#?az&FrU{o!M zVM+mkbg;=ZBW>25UCAgPWWd!yVH1tB>qXubLRh&&A-ahWJEz+^4#v*!St5Rd-5xMi~2}ATUI$z4B;cYZEDZhUY{NF+6 o&9hGy5<~J|z=-voH5nKm5ARz)M-AC2>AT`$@Nn6$$fz}kFJO&W00000 literal 0 HcmV?d00001 diff --git a/utils/exceptions/__pycache__/__init__.cpython-310.pyc b/utils/exceptions/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..8314339277898b30e5b81fe9d61673449e0b47d8 GIT binary patch literal 221 zcmYjLK?=e!5KO8E5eoGOUVEtdfQSdZiXeLM5@NH|Xq$vh3iT`gz%TXc$uD>^5d;Tz zhFNx)HEB8~0oS`Or$L|5{38iw8OCLSB$2cx4LwpyWU?dq;6=kar~PClyf_I5>#hXr zmC>6#=?TX8gWxd8m)-}qcYuy*)q!SPG#4nnW1uUg0Z{3xkWe82GgzL%c@*AYA*^Ms fS9Q4j6*$JZ(#mr_v$uXUZ;WhfSj2~1tj)*=`SChW literal 0 HcmV?d00001 diff --git a/utils/models/__init__.py b/utils/models/__init__.py index 9028d94..0650744 100644 --- a/utils/models/__init__.py +++ b/utils/models/__init__.py @@ -1 +1 @@ -from utils.models import Client, VMImage +from . import models diff --git a/utils/models/__pycache__/__init__.cpython-310.pyc b/utils/models/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..1044dea98b4939fb33e81465e48b7285d70fc59a GIT binary patch literal 206 zcmYjLK?=e!5KO9w2!&pJL=QC|5b*^fiWe`XG)s-7N!d+7@hASkFZJrlFL-jJ7YBBR z8Q9tNX*v^(+uhZ3)@L;TNZ71-C}Yw>ODkG=lv3zqFY?h#a-7Ry(s~V+HhD4#j5`m3 zW0o(ycj`cZq@1~cQ(N?Br~@f*jd1{ITvKRh5I}jXPe1{y;IXK>PW8c9QonXpmd2S- UmW%E>OqU$?7FO{CiYGJi0Z0loM*si- literal 0 HcmV?d00001 diff --git a/utils/models/__pycache__/models.cpython-310.pyc b/utils/models/__pycache__/models.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..62ec91e74d786ddeeaf893e1bcdc19e3ffca1ba2 GIT binary patch literal 1541 zcmbVMO^@3)5G5&Dl4aRzY!*$M=Fs-$L+n2g6h#uGNQ*84?6wC21)&vZZF%+KCFMnS zu{}Ab0{J2Piwf|XQ~yHIpq-JF#Atge1rGVd5%u`yN%eRfGi<-TRoT&iv9|>F+YrGw z*zKkS|`Bu z06g$@u;V)qQ3wK2L}=&B@wZG5b^My?7)Co!P7sfDf;egMfgYc*+2nWR!)5~)Jgtju zS-J2<)xZ*r3r-r7S4$T^uMOnO>U+3$gVXe^fSGWKfg)}4y0WW$n|s~d&Jn0oYXjE0sLfNkzB#-qyNB%j{k@FH z?l+XWll42C0FzuZDKwWT3(6$4_eRKo<~uIKevJBY2r&t%2ReA;$wY@bdd=im4^fsF z^=N6kuqSzX$K7aSkcqig7jP}3pMH2jN3w4Cf#{uZLkn45Y0PpHl0|Lm%@(x+n~6Q< z9?q#h#csdCaLd;08T)zki?|hQe#_VVLYN8GpP#TxPYWdF9iKi&?Mas+w~eYRh03k+ z3S8VNv`X!2<~iR&aW08geYS?Ik>aYnW9Acl%^xopKUy$$QRT0oTD&whCD;X2OWX&j z;*T^e4Zxx{*$QlfwXDsfbhBA(o4l}#vexinm~XD#6yK^yg32~&QGk9xXQIy`<_QnD z_{$eJ_d7Y~|I9s}O+P%#^+VxWkB-LKHPjG}`g56R^#C$wl)Lw#j zSMV+g+N}R=(-3V+_M~yxk8wYaAVIs1d%I3_h>nO{*t^giAgNO`#wf#1YikljW{Tl> zc3?guK&3ICQ+P{s9c?(y_HBg)RP>p&hrA~xSPKh@rWKECCwKU+E@LTYG2|i zW&BIEs8>z!_?@AwVbG_OtBv50U*KG<7OO{&u-?YL86TLya-Z;wJ{chTd{l3#N~?I|9zDH&T}<369@<^MSi Hj}HF^xv7I} literal 0 HcmV?d00001