You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/08/03 16:01:17 UTC
[01/50] [abbrv] airavata git commit: Updating Keycloak client
id/secret
Repository: airavata
Updated Branches:
refs/heads/master 983225c60 -> 21a750580
Updating Keycloak client id/secret
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8e059507
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8e059507
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8e059507
Branch: refs/heads/master
Commit: 8e059507516bf13f4649467f41d900e498a73cc9
Parents: 9ba8954
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Jul 6 12:29:14 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Jul 6 12:29:14 2017 -0400
----------------------------------------------------------------------
.../production/pga_config/brandeis/vault.yml | 34 ++++++++++----------
.../pga_config/georgiastate/vault.yml | 34 ++++++++++----------
.../production/pga_config/iugateway/vault.yml | 34 ++++++++++----------
.../scigap/production/pga_config/lsu/vault.yml | 34 ++++++++++----------
.../pga_config/nanoconfinement/vault.yml | 33 +++++++++----------
.../scigap/production/pga_config/nsg/vault.yml | 34 ++++++++++----------
.../production/pga_config/oiitandy/vault.yml | 34 ++++++++++----------
.../production/pga_config/oscer/vault.yml | 33 +++++++++----------
.../production/pga_config/phasta/vault.yml | 34 ++++++++++----------
.../production/pga_config/scigap/vault.yml | 34 ++++++++++----------
.../production/pga_config/seagrid/vault.yml | 34 ++++++++++----------
.../production/pga_config/simvascular/vault.yml | 34 ++++++++++----------
.../production/pga_config/southdakota/vault.yml | 33 +++++++++----------
.../pga_config/southernillinois/vault.yml | 34 ++++++++++----------
.../production/pga_config/testdrive/vault.yml | 33 ++++++++++---------
.../scigap/production/pga_config/utah/vault.yml | 34 ++++++++++----------
dev-tools/ansible/pga-scigap-prod.yml | 28 ++++++++--------
17 files changed, 283 insertions(+), 285 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vault.yml
index 3c4544c..00bafc1 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-33623763666132613862343931393731313066376663366536373338313734313932653430313233
-3566663033376334313238353133353664333464633065380a383735313737626139386634316230
-64663165636434386134306666633936316638373131396630346333393731343862343136663031
-3433663064326161640a643266633334333635656261346131666163356137336133386138613665
-63336466343132353066303039643763313834343933343263333730393237653962313630656135
-63333166373666616138316663393339623631313532396439313238663139613537653339323563
-64643261333234373938333465633366303866383061343030626137653664393566626435323831
-32653832353535663435363532376336633663633337366630623235383030623865666566653634
-30386137356462623563336631633033343039343866336334393537636430363065396566393861
-30333962653337623736303563663930373866643165653034383530353236366532393761376231
-33656534356336643736396534613264613738323233613636656663633933356562383864383332
-66636233656534646532333135653666343535653035306365363666616135303237623261623063
-35643235653462323034646533313934613538643864343264666631393332643239303139653436
-63643737306661623534363630663338376234633530333565646533376632343135663662373562
-65363233373739363961373632653363303439326531346561653166666236363733353833653436
-61363536633563653233346666656630663630643837343063303937663666666633326461633432
-31373663643233336133646661396636666538326334396663646666623533656463
+31303634316634363761333939336137353638656138653735393033653134383136363639343633
+3064623061336533393637663664323132313965633336310a666537303338646530363830303166
+38303138373130306430323632393162373465643331333439353563346365383537336636346131
+3236316238373063380a373434346565386131616662646262636237303163386437323632333363
+33303536383839663838313961343665316531666532336666646433643735326231313430623836
+30366230376531333439636263386238386337653939663566633731346333643561666165393537
+66363561346631393936633038396137356563623236366135363464376434383137616534613733
+65336335633164653566343234323236343137626130316330653934323439616130623536356132
+30326139303631663231316262316364353466633463633865653864653764393165613063356537
+65616133656530326133353036656634626531363139376433306633613036313337666261396534
+30366333633936386236363261653332636565393539393538313534303430616361633831313363
+30316236633837643439376637313738356163363430356131346164656562653330646463323239
+62373463313230306261383834373930316363633066353838623639323531386630313438643339
+65343363666263636561343465633565383435333132326634306262326136306465653532393233
+38333566323832663632383836336236643463303333343863623635336338363133376630396464
+39643732303462633130393131303730323565653363623866323366623935373463366136393239
+3065
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vault.yml
index e1f603d..c5fa548 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-34326538383639653666336237336337363732643064323039656334363261356563346138666634
-3639383761653239353536336564383833393664333337630a393637386266393137643864326434
-39353865343065626639393937633065666639323738306330666536356334333433356531663238
-6636396333633935390a653965396231336535336334333330303462396433643831633065663666
-30303931323438396265646662396137636235363134383430343764303136313535366535363962
-31353833303536386661643039656231343265393336613262306665656366643061666531356633
-39386431663465646365613134366433366637666531346130323839613431346530646439356131
-31663835613664396663303463646336633262653736656138323030316138656264313338616331
-66356638663739303632323062303735656637306131323134653065313065396434306132303864
-32393862393033306536363832396664333232313634663433386236613064366662336336386466
-39643463353963663062373436653465653665343462373665643734643035613434616337613738
-66626438386566656637396539373734633731643633633830636338663662313663663733373137
-64303136363239663734326335303731363066663766323338646337313863623161623434373034
-39613362366432626666363835386166313738386632343738613063643437633235333636343933
-36336337343764316534346436643562396134363936646661353366643533326135396636363636
-35303133353339613763373735633965663465383239653134643735343339616134316462633436
-66376439623564616531623963383836333633303061643965663333643634646534
+30666232353938613062313661636131393165313030623965653733363963303339643832363738
+3936333664373530633938326230363861306339303436320a373462646666313562333332623932
+63363366613531613232376537636365653238653465323564363739663862383936323139373230
+3836346330396633640a313034356231353030663366633131653836336664313330316237343861
+62346266376334616639396234323430633732393739366139643231313933613939616231636237
+61633334326161316333343533643939333830373838313531646634656332666530396138626539
+63353664633066383832646233323131316466636237356132663833313831616133613563313831
+38616538653636393036366635373833356436623337373631376562353339336131643633346630
+66653635613263636539633131376138373231316131346662366264366231386566613364353136
+31383634326265343734333634343264386665316338336365386630633734386138356534386566
+33623138393439353233333636313266663338323564333739346239653534616164346530626663
+35626233393437353064333866653162373064616261653461323936303738386432316530666233
+62326130623134666136383431316565343733336564373033613038326531396531373839393234
+61666362613736656238356161363833656164333734383737656664626631623837353936396239
+32393261633931346538363535646461356263643834643839316461613238666337643730356537
+65323566373235373264373463356130303937666664326463363365376637646366613831656137
+3566
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vault.yml
index c2fcaa7..feedb7f 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-30613430626237373639393261636364373635313266303134366230343561356262363964306533
-3130636130343966313739393031636662626366343038380a356465636138616462396164653866
-66643331343234633439663232313633633664393938623839636130353761366337356439636566
-6632363330653665340a623634393433336366643139626136343732323565353533623962626266
-62653561333538656361363964373735633165386564313733396636323739666234613834653637
-64346562626664623265666362623535633866633564343538663365376139636537336138303766
-65313138363239633034373266343365316362646362336538306565656165613465633231626332
-63323436346535633463303339353638376533366235316463353432306530373036343736363761
-33303634373634613931653939663463613938336435383338373034616638616334646364643732
-65303662626230326235623562373264373331646334323566356437303239323436363239373936
-32623332336633363837373031373030386137343030613234646634303135383465313233313863
-66336339383662363462643531303163363734393438333639663163306336386661623130363663
-61653662343235343030646630393961653234343330613334356239343834376166623962363264
-32643839393966633538393133623433373131653537396234643436633733366338643863393461
-64666139633436353631323863326263303839653261653533663130616130363637366139646366
-33336263306563373836346238386230336233613834363163343664633436323262396332626539
-38306163616362316166613335353536643036386637656563396264343135386136
+32666332356233373933633561646333376538313333633236333836313135386462643137623136
+3738633662633064393863353739376532386434363334640a336235626636653131323664323463
+31346366343861333661393930663061343864653766333030383764366135393466376438343934
+3361383733313236300a383464613164333837333632313739336361353134623565336335616537
+62643030333632313934306532663232323638323438623130376436646133666637646231663963
+33353037393431666239613037353132616232613863303565386632393533646563363139646338
+62383062653637663839373434393763633535653263383234616461613265306230383862333961
+64326637396331383132613539343131376238366266623664383032666461336137343966646463
+65316136386266393535613538653166346436616563393938316134616362343432373530663835
+37636562306336623363626635356537626366303133313463636533383234623132323932383931
+64363534616432323663366465346435303032633035313836376564383734623663636265316230
+39323666346261323534393634323464366661343133353133633733376230336662646432653535
+38303963666332333361633338303062383565623735656438323133663436636230333631376531
+31306235353364353261356636393738356463373037333163636531366161623631383763626538
+62643838356261656638656466653463656531616138646439316631663561306339326362356165
+63616263656365653762386265633566303731653662313363623761636566383034623064643232
+3466
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vault.yml
index 6613bc7..735d624 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-30666366633331643466326435353639626235333865633630363735626565323039313363373466
-6364303466313965313332656465653435663836613439340a336232363033373036393465653335
-36323461373239343964316138303265356162346631393331373639333962303238643963383065
-3066386366623366660a613534386639633362396164643131643333373234373838636337313135
-38663464326231356266666161303337383730343261373034326263376162363763623334666466
-65366135346134663132366165396638646661383962663964646536393563633166363064366662
-30653735393238363162666365333363643139376662366535613237323837396363643036646338
-31303561323035653238333338643065343637323866346437323633313364343338646139363531
-34343733356437616662396137366265393030313430326439306234623637356434326439316330
-38616338646462383865316238373732633435333363346665316462363736626531336563313730
-63323833333338313937616661313437393238313538633335353765353532623636383831353735
-64303366636362613965303435666666323432353565623038373939393434363862303835313233
-34363133663864336331613734666533373464393365346334613663323236616466613563633939
-38393362373364636335376433353035636338353131326437663938366136393336626634336230
-30336232353961396565636532303434393866623963373064396166656232333564373330626366
-61626631366139653663346230613938623064386562623932383737333163346263326635653134
-39623962323630306437643238653739313566666533393233343033643764393863
+39316362646133353464633236396535623636623437393530633664633235316562386361343434
+3264323939643539623937373933663437353533623836630a346433383234376539646163373964
+31366530646264356239623938646665353631313830366666306333316364623731363761643163
+6366316230623433620a396366346233343231393033323430633133663839343237326239333961
+39353337363831666438636235323633656132663463393033633063333639313939353933323638
+66376131346437326563616235616466656131656463653564336361643461646164333934393262
+63383762643663633735633434666662613361356436653832626661623637306538656333613466
+64336139306333313830656634343533353439356435633439663132343631383837373563323836
+31626635363465653363376561346136633930643463386638383363386236366662363964363439
+63313435343631616165366330623831396337636433303936313861346431343733363338373966
+64666363323733373736313739666637323130373361333734383032376135663632353837633639
+66663330646136646336653166383562303633373633663561663061643731653332363630613039
+31663063616530643034663862636339636230326434383435353162393863333234326135323864
+64306339613061626637336233623632653133323239663164626534613033643262656566386635
+61646136393965663634393934376339653465626464386532613137653237333639353063643931
+62393232346336633263383064363333613530346564316534373862376535353463643439363661
+3439
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vault.yml
index 7071d8e..b49412a 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vault.yml
@@ -1,18 +1,17 @@
$ANSIBLE_VAULT;1.1;AES256
-34363533353931356538613438326265666432366334616634333166393232616539333934613363
-3132303138613337616461653639396235316266396338650a393934323837393230666632366635
-62633238613832663533303334656463306461653232363430653462613135313734636130316161
-6132303237386135640a643366386465323662336238326630633665306664623361343335633335
-32373232303335633733333439623239646431646663633239633965373838613933663466653032
-35396632323265633634363562383962666430663331363436386364363161313436343861386531
-32373936323364616238366563616165353964653065653463666563656633376632623039373661
-64346633643433383535633130623730383238306432353138353265393666353261306539663936
-30303433643661303839633062323639326234336137643331653664393432313736653838373365
-36613762353461333234356263653363626334656232656265353962316333326132356539373239
-66373734316365613136616337653861386139343832316132363566656636396531376163366263
-36303936643134613230313132326539646664383062393161646230393937613864353138326638
-31306133326331343236316335646261373138353638333564393238333765646138616131353738
-31613531323534663963643131363434366163326530353565323737613136313333333166386561
-30626633666365646131336232323837653566666338653330666633653436353562316434363363
-39336639383835356230616630323036303364316433373666353465633631633033633634376239
-3639
+35383731646164393736643035333437666262376132376163383936303934366336616535356365
+3830393966393831343838353166333262646138383239340a633032396161373736646332306535
+35393032353263306534386237636662633030353064363638643637653865306534613239326165
+3364373735336361620a386336373634666334323438633733386432353464386564373862623838
+63333239303637386531306162396663633930316531323161343734333162643236623631363664
+62313462643836663138643236323638386139656433383063653831363137313231323965393237
+66306534663035323565373334363739323237323230623835343037323763353635383438323463
+38313436383935363463633730376362666138316632643137323461663639636465353632646264
+61313632643663346162396463626234326265323931623165393565653237316263353331616633
+30303663646533363066313161333139356166326265646630333339666131363633353031646438
+30333231383938316239333035306166383135313664353431633937653262303631373161353062
+65376131636363306131623735323865333766653837366132373362366330386238313162363262
+38623866356666306136316334663666306332366530313862353831366434303164353338643832
+35653230366537666133336436323638623135656365653763313363363439353936383964313336
+37633664373634656365303332663335663334346632363239613764353561333534626561363661
+63663366356530303034
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vault.yml
index bd6c7f8..ff3757a 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-31653563373664623963356139623437303239303730616666343533383734633833353939376430
-3237393136613135303062643663303835636636323636610a613362373565323339366339363836
-33343766613565663662316364376238633836643134666333373064383439643661656664346532
-3430626262343366620a386166376466366634646635316566356630343166353331366630613933
-65316332373964386463343261343266353937366239323463383236343063656265656664626665
-38666333346332323864643238363931313863393664386634666230326266376537326665313634
-61353536613933376163336634383637623466313264633531363261353862336566633436306266
-64633038323964663631316533633264316238376438353262376261313666623631666534643266
-35626464643831333039643133303830613465393339376537636330373337366335613335623837
-61666531643034643965616130623339653363366531373439303966363935323638363736323031
-61616638643131663036623530363265623830373834303264666130336433383565643136613033
-37303831653563343461303737633334646262356333316563303831323736666564633466613238
-62643664633230333361623965623264643638373031393566333861303634356261623537643136
-63393263326566303131613962643738346231656565316432333064376537383430616535396362
-66633763323531343533636330613033663836306330313236353630636236653936316630303633
-30343038333334623836616264313861396335333232333630303832643739626335643133343539
-66623137366162316632336661613330346632623135373930346239373235313666
+66366162363437656663343039353465613733666638633233376638656534396638316539383961
+6433376137366666393738373033333861613035356466360a333732333636336435613161313838
+66383236643764663630636338636539623234613132303534373933616432353038646432663137
+3438333536363832310a393438666439356230393063386433323863303231386431333638306134
+37313334623830356338643266306662363465383436333835353535333766363736393366353539
+35633837376266363232646233636539323565306164613264303033363061323636343638313238
+65633438323931336662633734303037636131373936643564343364323937343933383434663464
+31333163646436346431306235386231656266623565376366353335373061343264313163336262
+37613935666635653730636530366138303162633235386562373261363865373961616130323062
+62653735313362653637313136313462383233333464363135663064363232306461343964393434
+30383933323865333064366561363931396461633930343266346333616133346138613239396163
+35633035396539633963636231633036353137393835333439366539323438386164346530326466
+38633161303963323632376261373965323436343936656230663837333366663262636132626566
+33356663356365386162313138623736393062396262666465323735323265623639613163353033
+65633866646631643433643934323939346263313734363935306662326635386534376333646238
+30653135663939393235633133623063643430396232353239633939306234373632306463306335
+3161
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vault.yml
index d885c2e..dcd9abc 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-62303734386432636433343337306638653838393637386634306137353839616164653435343464
-3461353736383331363362343163343836343239396265320a323863623135306637353635663566
-38343836326532303838633334316334666361323835386630396335626138363139646539316330
-3965356435303133660a663937656434663262633264343163373666396233313662316332643930
-33303237386333346166306137656133326639313565316461313665336438323331356230346364
-65663531353438663730323037303135353164623032396561393937306262366438333465343161
-35363361356163323965633933396331356431343131363639623235333632613432653361383966
-63636234393237663265623730663663646666636430363231656165363036363831353038383363
-32636561353332323432326436633161623239386134653866306261623864386363613935356535
-34336265326137323662366163363637343132623931313835323964393261383432343133323161
-31316239306566306664386233313730373834383739373838383337356532646163633366383063
-38363962363239663831656232623031383836343934623931326538336630623963613164613762
-37376539313762326635373962663432303564356230343231653930333464633634373336333831
-62396133653435653163386434663035316236663365323465663634383732333131326166346636
-30646331653563353238333632653136663530613265613135386533393732323439323932393661
-33306338306435353133306263383866383764643539396232326436643333303862626632363763
-36646636636561353964303132333030306263366635306535333138633935666265
+66303062353239373136623564613835386337646633393161363766316235623838613835346336
+3633623936346532626365623365656565323465376139390a356636656134616462303935326432
+30393838363534656535366161623734383439336464623335376533626135383637623334376436
+6562643233303566370a366631343464306561386564396534393635393561646532613037303930
+61336636353663646239363233363266383630613363316132383266383635666433653662663763
+35633462393238326237333935663364633066333762333031323034323730383934633831643530
+34393935313831303035616238643235343937353663656664346665366634313137323830373363
+65323633663066303130306634383164343838313363313765316139373034663736336665656433
+66643862303838623365386639623765383431316539366463316531663039313235643331356432
+63636234306666353134333532326535646461366165353339656634313239306439633131643166
+30626335663834343762353739353934643834326532653033313737613933346561613537393030
+34626464613962323661356536333732656137646138333332366337346533386234666465656361
+32376534306630613534626566626363343066383231363732666464333130623865653434363066
+32323038653364333335646638373733613065343266323964346466306633366138616363363764
+36663464373834313933356331613663373336386131643335643433366332323337613061326535
+64363234316335303639313433616661383631353033663133633631323037613136663431363066
+3732
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vault.yml
index a04aa9c..d96b100 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vault.yml
@@ -1,18 +1,17 @@
$ANSIBLE_VAULT;1.1;AES256
-61623562303862643764333631626135396161353430666539386233366431666630643230333861
-3935623062363934653938383630333166373133326235610a343466356664356439393861633438
-65633264353130633262633230363439366232343261343031313331326137383861383232316430
-3661383731376630370a643265313361356330376131626261336566343632313761356334316361
-66373364613063653639353633353036323439336265363466383133313739663265623536653634
-63356665623330643663626533333633366536663363373338653836666665613735623331656235
-61383564613364636363666562376337646330666637323365616234346430396662633239626334
-38303437306235326638633965393033353533393162353262623637323134653162653862373636
-66373266353137333131343631346334386137643765313238366436346138326536656330326162
-65323133383535373539313334336639373036346134333439303033383033393266653131623363
-34363138633939626166643738353062643964343765366366353738373730363763353232303763
-36653335656565396465376364663366363966316630333339353732613164303861333362653639
-62343833656433366433663339326230663866343231616337353966366139666466666336636232
-37626562353933323533326265316666633566303163613437323964313631383561326538366235
-64333964326664353232303962633237346565323665653763666437633832333136356366343233
-63653632353235373133626165313061353336343636653763323039643131313562343630393763
-6130
+39306166313062666130616632343032383866613163656166616534386339316330653235336637
+3631613163643364366133633339303362303261383938610a393732616163333539333665303533
+39366264656661373832643837383066323533346535316534373435613138633234626664623433
+3064333030653635380a346538303832313063633331393161386665343438613935666538333337
+35616333363430323334656461656335333961663634343138633237633265363534353064383363
+36646535623333316138613433336330336238643732666535623338343330393261366365633331
+34626363386135653564643530643430316439386331313333363333363064613764303134666630
+66356636613932643163393438396432616263373239346134633631393866386266333966623266
+65333666383630333265343130383963343839363461396638373363636461323337343765396334
+39356564393430333761653832313736666364336335636566663838643434326666326235616533
+36363033663932643833363466356635353136326531633833623463383132653464623331646236
+34313635313065323334323565363831303161623437623861346338343930326630353261306666
+32333438643864636234383033306363346330643935323962326133623066373433636362666534
+65333036643237623164363262373065633535323131386162386135343035353564346332313666
+36643066643639666631363161613038616238313938653139336464333463346530333130343837
+39633163336537373864
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vault.yml
index a7b1f5b..b54d3fe 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-34393362646639623536616530363932393732383265616430636166353537623439353263386461
-3937376637623966313861373164643961643630656131650a316265306638353963643339373263
-30663964393533616566316163373734336234323663643430623063333866356164626639626333
-3764646161363333370a663335363831316465653734386131373338623831633266376434636131
-35653766363835316338643739666339333638303231636135613936376231383431656562616662
-33306262363965396131353237326330643339613834633761373666373765666135316235366466
-64616334353161643638323561313438346662353038643835386133623165373831643562393332
-66393665653833656638396337626436386234666162666438393738643964626632306631373736
-62653564333961633462363534653866323231366263313430316630633833663239316262613564
-37663561386161383531626135353361363064633564316162383262666161613733663064643835
-31626663333031623332646463333833623635373035303437656362343934343135376564613361
-39313133653562613466623762393031393065663066333536326263353166313831326163333833
-30393738323734333432613232633363653664326438623565323938313265343236326336613936
-39306636633535316161333533323166383662373630343431323337343334653338363364623636
-31656636396361383462353039633561363164633035386366306131643432666638626464353532
-34623262343637646134343131363365383830626137373264343162306136623161643437303563
-37663264303864373331613431666363366562353831366439633932326562353761
+61383161653963386234393034373861393862343136613266643731336662313464393261653761
+3839626462376235366233346334616439386236366235660a366636343164616138616363343263
+35643863613731366564656462363434393735666338323932356564326231353262353035643939
+3532336665376531350a316263343834343332386461363039656430313163643133376366303238
+66363839393965383662373636643035393835346535616461333730663837323739633338653635
+61343937363762643634383234386465623637323465633762323639373539303562626337303536
+37613964363739653638393032356163666337663938653033656335353937643138333634623439
+63323261363738303037616130663034646564623564616334613762636466656431306563343064
+62643039346138393262333066323338303164633163303561633235306534633733303734353135
+66666566323266313332343633643032653435623337656534303730353061656565623964346666
+36653436303935646264396664653963643664323566666461343437313935353039303238353336
+66653663353465393062666338326533396461333031356363373166653038356565643339613832
+61376139333934633230633532343634336162396334646464366366613137343931363862346530
+33653639633762643265613432643433643037623561653235303162373962393462383335376439
+64623161303033653235396234363632383236646362376235326138343563663134616565326236
+32386230313333656163323664633137636138666438343261313063363538323665613463303433
+3063
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vault.yml
index fb4d486..fecaa71 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-30323836373736386533613838303665623166626636663336666266656162366364643935383661
-3630356263363637353430316636336430306461383137300a373539613136353831303465613462
-33336634393230643332373561313466326438376139316166386432353035613365376363666131
-3930373830366330300a393033663865653732386336393434623137613366383363313237366236
-35333531393265396232386339396638666565616439333131626462313739633935303434346163
-32396633663265306332356338346564356563613639313732383639643232633264653266363864
-64666161666230663432363261346536373135643335343230303631663562363736616337353431
-33396366373437616334373634386662323435613962346234353239633833653637646235326338
-32366236313734653662373639303334353265653863616262373236663435653935333232613238
-62303265643262333462393562396637633636306562623565383634356431663434306437333239
-34363937316564336434353463323732353130646565343766306136623362383335633566393438
-66623235336235323736643735663062316665323866613065643937656666666266656435393865
-61303234333664396139313337353339303937383033366231376338663730336236303131656662
-38613330396361393134663133616133663031663263346666333430343436343863373661353765
-65393363663666343330356338653733316432336333353536363533353762356663363462383734
-38623837373666336132663533386238633231333865353137626438343765336436383531366538
-3164
+37316430346432346631396330363763323036316131396463376232373137333631626664373435
+3432626264383530393434656264336631653433633637340a383161636134376230336233353232
+34366238613232393134663865626138613866623133616261373434653664313132323864336661
+6337356131643630360a343262646466393439313964353730653237386161346538383563396130
+65623231663331616634623463373231333633336633653138343730633839316530666633306266
+34653062386565666665616638633134616638363532613036616433626630326666636662383338
+30323237393763326364393265613937326565386330316165303366396466633866633438643166
+34613335623231303664363865393138343434333330393039393966323961383033653964343339
+38346635353465616139373037666636313266316637656534613063363130633833613733343430
+38306634363831633966356361366236666264346133323161626330623634326130343239623764
+38376336303663623261376133333833383633356436313134313837633730323034336161396564
+63393537306164393365343737393565613831303335323661623266393430663761626666623030
+36633531383665303835623031343133313665653437303465663334303135643264646436616566
+39383734396630356433313036333461633631616530373633396136643766616530653931363236
+37646237643030333634633739373932323064313536656566353135313939646138633636353737
+65323837346132363833333133323033646238393037653038646234316465333761336366323035
+3830
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vault.yml
index 37325cf..af2673b 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-34303730336561363364333131396632616435326234316533386663366630653433376337363433
-6236303137313562646536353561363564346433326234310a643130646563343836653039313361
-66336633626333383532356363313239396636366531393238653934343736656135373036646336
-6633626161373937310a326131336662616462356665303031643662393266343062303535656266
-35633035303030383132663731363836303462326330653831376535363733666463316338346637
-38373339653935393739616538323134356130366434326134326263633236393237313537323833
-31336133393037373335646361656433643864373430383837373733353365656462666339633934
-32613236643235353466643363343830376332346332653937333431363030363863396338353838
-30653861646333363731643036656631363366343465363833656535396263303564663036313832
-30343265383263396665633635343433303934353966363237646365646638336363393637653137
-64376133343166396661333461633234373162623331626333363838643765396335643938653332
-30313165376133633133366335346533386263626130633961336239636666376136366131666161
-63383034393335666161393465666563633866653531326463353234386439333335383338303636
-34323237363837653036396262383862643065396663363830616638383330396664643332623133
-66373035376137376334333561643731353465353131313930613934303366656665653866643135
-34336663346635336265646638613430656533386336653437643861646562323239616535393535
-3633
+63383837396262336563656433376638646633666363643538636335626662313365656562356661
+3934393534323666643862646566323533666530616632350a656438373832313334386630643131
+30333932393737643331636466313839353734343264363531383065323464313638653732643666
+6665386237633864640a366665316633396634383261323535623465363938386337663261323232
+64373062353532313034313361313632646639643630616566396634393637323231376463306631
+34343365376665353363303233313264353962636331346164306465316332343731363135363234
+31343331333861363239343532303561333861633965373231316465643934633438313938396162
+33356239623839323365663236626531653864353538623132383835396230323636623832636432
+64646165356234333234613039613937373737633165616438623930646263313762316335636435
+38663230336562343161633035386634373837653866363662316631336237383231326238336438
+30363432383363343465646537383864323063303735343534373734343132633361656533383835
+66623436373463326564316163373938366538323639363535313835366136393739376634626462
+36646632363530346537336463653134653030383938616235326461316432383966323064663937
+35643534343930313463653939386138363139313834616638326338663661636666356164396164
+38643736323064363539383566303731363133653362393762373138303832363935363964393336
+31646136633032353832323338376665353837343039353061383435323264356339633162353238
+3364
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vault.yml
index d25f6cb..eb18126 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-63303434393531636337626266376134353865333465663338616665363738653165643161343662
-3034303964666433656232316336313865346332316666370a343236373330653465663362613733
-33313862383462376664643466346337613536633862636537373930316365623234666536633532
-3064353436333838650a656234643965623130633262326561383937393233373537353139346362
-38366331643435613965393034323564656633316533653465373561366634386231663033343262
-32646538353737393665613461333233353036313338646130613131643465656131343830313435
-34626138333330653830323038313365386464396437363065313539666632323836623033616564
-62343766636133316166653963666339323632623462356163316662313232383963643561636466
-63663261326536653435303065646561386133353733616561623736646633636665633939313139
-37393963633035333237346535336439383234333532343035313733306232613636613862303634
-39383961626264363833363935323762393466376263366135363038383339373963303563343063
-36323535386430316363623734643931323138643063316233616638373864613835336466303561
-61303137343630626135313934643539613936396530636436313262303861636361396333636162
-63303331363561663034383262623939333137306139616437616533373835613962616262376230
-63636634353463653934623433383265346463623637366133373530363561333461383437663637
-35346662336332306565646463626234313263616131373230396335633863666461653530643932
-62343065306438343232323361656231306138643034373663313933336265376439
+61336435356436373565653262303165343962396239346663396531646162393537623561613337
+3961663030353736303235613137343833656130366437620a636461373933356531623633383334
+30316432616664346234613836336631636431306261303935363436333761663366643266613932
+3938366366343335380a393362316565633632656534376137346235646563373563636234373335
+39333739383431653032343231633863313263303830663335346538353334613430303134633630
+38646166343733353361326536393666393733646265333863363937353562393935633930343930
+38323535343862656430373966346663333064386263646137366666633866363165666334303461
+38623230366438666662303161313632323430633166306564386336613337663063393264313339
+65633464333561626461333365623633343062316663373234616461353136343033306338393263
+30666438306235373233616561613761393936646262666633313631316563333630663039643831
+31303839633232386638646335353031373537323466356466353334373739336435306438333761
+34643232316333343036326262373866663436313230643730363130636433376135353939656235
+38326262633565356334353464353138353764623131356233323264303232653534303032313430
+66323832343638623639373431333263653366623032333963653463313265316636663935376232
+62323331373530636366353139393533326463636339306535383837616337336538353036346239
+39363433393766376136383937613236306634653862346638393531306537653737346361356235
+6432
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vault.yml
index 26eb97b..3c6f803 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vault.yml
@@ -1,18 +1,17 @@
$ANSIBLE_VAULT;1.1;AES256
-65646530306630303662386462346234366661303538613365633738336535653761656263353763
-3032393530373163346364636238386431326363626562300a303930303663646361366634363737
-33396531656231663432623464646366653631303862396137643937373562633738653335626431
-6632666632323536320a383433396534623839303761376162393166393962393731356531323435
-61666538663864663762386336313035393831343632393831663563643237303034663139633537
-38663263363765363964393463356136366531633632303836333138643063323463616133353034
-33626665393936656562656537343464346131396238396665363231333761653931363862383061
-61363261326163386335663933326230633830323533616632353339346365613934633736373235
-34623566633761313831353833303962623839333130313765626639666439383132623338303036
-36356432393530343566316262353163643131663338343163623535613937343035343734636635
-30633939356365326661316633383231353438376162326637653866616332303064383636303137
-35366639303435643861323035343330373666343038353633636639303932373236343366323232
-31313661623761333931353831383235346239653236646665353130346163666363633836363230
-39636164366462343161313139666134643033663030313637653263353333663233626662393562
-66393661613662393965623139343537303863663262663435303630346265393737623563663464
-36636262356433326232383038363735383733623766613238613431643830353864623631643062
-3033
+61376666373530656661656361663664346630386164653066643430336231336432336163653161
+3537343037343937393132333663616635616461323539340a643430666165326261306532346438
+33383233343532306532663266613132326337646535643465303231666665646638353332303539
+3731663562303366300a646633666635313038626532303735613339303330626635346166363532
+30363530323865383833353635306565643761663434653135323966646431653438383239366364
+65636263363635643236313030373331656438653532323431303334326334376133303434303133
+37383439313636363631333234646462326337313134633366383562353361346635376261363464
+31626338346133306537666138633731303365316264633865643062383862323061313661313938
+61636162376165646633386333626331656566376632356165643332646263396236323132316635
+37393933343931353661626262313036636531326533343332646166643663313863363563646637
+34643631643861653538643934323166376564383164653730323238386230663861383338326133
+65346630383832366236616162376537373464356562613835656363613736643333306365396137
+35373139363232303961633339303732653061356637643137666661623661313166646264316666
+33323033313239343464386337646438356165386166633865313766626264343233306536353930
+33363436386163323665663766306463633031393662383831353564633962616336656533303332
+33333232393262663631
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vault.yml
index 9dab6a3..27031a6 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-37323664643139643032373161333135636633346230346562613236313036326430323636343837
-6432656261326363653632613431323834373566336337630a616565353966383166353435626662
-31656638376633633736333335393039646161303366323164636431343334383166633464336561
-3533353662643637330a313630663232616435333464353930366561346433376438356134633037
-36313932633439346330366238303730643663663035393563333330613438333832396266356634
-66313238356237383336313465343765656365623865616262316132396338373234666535646266
-32663165646238666538333365613438623363336436646334633434333435373039613338383639
-30323537653230656233346565313464333730633734613138633036633632333231373066623736
-65313433623862346537633461613932326631323337383065366631346139666164316337616338
-38303063353834393937366431313566336636373961323165313862393832626431373261656364
-34323534663836653761643562333933666330313730343836336634303161363664613835336538
-30333135633135323437386566346136623635316565363764333162316530643265303533373264
-37306433356635616266316539336437623536616466353762333034643962356539623130343665
-31666639316231303130373566373030343335616266396464363431343937346234623466383735
-32313730323231366232623833396537343032636633343931353539616339613961666433326130
-61316135313531633534303262393632653732313935616334616430373561623461363163343830
-62663166316161656635656566393964323932383633306539653237373232373165
+61643637383338646635376637313364643634373565346166643564346530343134626661636662
+6635663335636633343039356165613463393264313634610a366430376161326236666662306234
+36663961653836613235613938383834386464656635303666336238343739326462613364303066
+3339316164333634350a376638326165366362303336366131653663323530373561313830303262
+36363032303666303031323838663430646565656362333363383566643463633039353034326330
+66366437346132623537363664353932353339373033386535313366306337626666633739643133
+36666461643864363134613262613338633866393238653862623830666534356364373030666536
+65343231316337393361643862336234623464363031343635373063386237613963666532626235
+31623237363362386163363834646530306263653032383939303333653462396439633038303165
+63323539616166356562336566356133393735366164363064646535306635366163333430666564
+37383365616166343932343334343230343461393237333061346338366531313964306430336563
+66653538653261316331346263323165656536383762393736646434653134316339343439363034
+38643838316438336236333563306435626364383237386364353365316365396664613437323063
+65316331636434353662643235326665326161663937306139383737623635663738313763663733
+64643835376232333635386531313566653238623863316262323966616166363865313234303930
+32656361666535333131393532626364366231626130336539636563336230666366306361326337
+6132
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vault.yml
index 8adb37a..95c6b7b 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vault.yml
@@ -1,17 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-32616238363062653064663639646633643663336332666239346237366265326665623066316231
-6662353764613339616135343833393963303566303635390a326662323330386133373437383336
-37306265393536373361336238336231623564613434346435306338613934306539633262623039
-3639343631653036350a626365326462613763636433346235303037346137633061396433393363
-61363539323362343038383164393337303837346130306236623737616333396538613162623666
-39373231323333363433346335623463663965336564323665623866666634303036653965623431
-65366638386130373566313864623038313432393462303761306661663635346538386439376465
-37623035353265646438633337333837653231623834333130373361386431396339353964323834
-30633762336232393365356263343633633230613439313633383063633931633234373333313137
-64666665363561316664306433613533393739303337393634646432333930623865626566303637
-35363033636639393437333362663863373462316261656339376338356666626465393161323838
-64373965313264373130346336313662653935313263383365346330646330666366386164313332
-65633039633736646537393839653837323938666262376338353137633236333932393266393837
-32323934363565346234636431356538363665656661356438626362323261396461353936323035
-34336434653232333537616265653136346439383764633730383035353039656366366463663532
-32376331623832333761
+62316432336565373739373638656637383161323536666436333537613536316266663164316635
+3132356235643331643331633662356338396533653764390a313730663662626436663538313464
+66373335636162303330353861373638396661663132643261363939386566613439333762613661
+6238343362343065340a396661346465366335366431613565346339376133636138613338353334
+31643162383939353364363465353630393134656530646535376230303233333031636639333033
+63373166363130653038633432333335623131373637363635393662313235313732323036303965
+32306331646635656661313330646232363931623864393036336634363632303634653639326238
+65663739663439653333333532303862333932343663303465623062383432333031353730653366
+66373135383561386533353331643238666563633337353565326139306139353661326233663433
+39613466393030356563396331353639633835663636666137623561623237346666643230663832
+38663965623638343161386238386133373531373238623263613531376137393531613031643333
+37376462316562313632616338353163373839616237323734356638316535333638383164373065
+37343234393532353964313039363038663937323730623232366230343034656366333933366162
+33663637343837643161616162633964623136376161633661633533616533396139623033666533
+31363064363861623338323831363864303464393666363432383935356461656133653165333531
+64313835316362363633633865623265613431643133333230376333323030626334623235343432
+3163
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vault.yml
index 7f188388..53202b9 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-32393264363338303162363535326338376461633762376363326364363833356638316138383436
-3764313937636538303635623739623337386331613732360a643461323435356434353864646330
-30623964663261656235633765306139343561376264623737373063626263333836623361363361
-6266626666613937660a636338353462656362333734666436343431393266333661316330356333
-63613061363235336333366262623733333630386337353165316536323566313263653462353730
-31393437646138643734653536643866383230643136646138323137386432636331386333626135
-61346233636639636165626262626535316166356661666639623730643164303561313165303064
-32643138646666356634656364646234356238356235383937393461326634613136313135363966
-31343861333261666666666165333163663837653239376331386633613633656632346266346163
-63353764626566616130393638633137373563383238623464306366663536306661623134343231
-31303839353630376364336564346436383031313035393633346361333865393430306163653461
-31623535396466323230633032373265656631396437616236356336313662626333613366393736
-64666264313563616633653862363132633734343532303761343330363634363064316661626662
-62346164353864316665356664383638386436653336396266613834613533396164366339353964
-36386235396133626630336538656139383139343862316462373434353434666632376666613465
-64613830346138666530333632396434636264623835653138636139383261336636383932653132
-38383061323031323135323432633731303663346236336438373732353363303461
+65613637666134636439323035313837633838666438643936636166643164346263613739323234
+3061643239626362666534366664613736353831376162610a303261353766333862393432613139
+66336330373036326632633935306362333130383331393736326134616231623465363161373565
+3934643930323833310a326266616534626135393934303261386432376634346633653933623963
+66303035393830656339376131363264633064356135393036636334653038356363323730636361
+32666636333966613432633439653935353632623035623263633766363763323239303037633236
+37306239346239323465386537663033393534363865306531326534396133356565396464326537
+34326261343133306435323063626330366464386461653539666666623430333164646533393832
+38323032386133626466626531653532363332373062383761313562346433353761373333616531
+30636566353636303730653062616162313130366561626537613036646662366665353436343735
+34643839323633616135333562326233303336333332613239643239636236333533643164353931
+39613833653864386331396539323563643630383261303465663333343466626639323362313332
+63323663663536373030623461303966396331643564353335633739353838393531346139663965
+61353339343162653736393062343430396635373765663035373464333463333237653134346634
+36313065306264616162366333663461333662396235373661616230623666353662343961636664
+62663966343564666631643161616463353836323566363131653838656665653436363963386166
+6363
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e059507/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index 76b4147..2299757 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -19,22 +19,22 @@
#
---
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoconfinement"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoconfinement"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/simvascular"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/simvascular"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah"
...
[13/50] [abbrv] airavata git commit: Adding CILogon to scigap
Posted by ma...@apache.org.
Adding CILogon to scigap
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a8e99e87
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a8e99e87
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a8e99e87
Branch: refs/heads/master
Commit: a8e99e87267506d188c0d090ed6bf06e6bdc1445
Parents: 6c46dfe
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Jul 7 22:59:06 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Jul 7 22:59:06 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/production/pga_config/scigap/vars.yml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a8e99e87/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
index 4141adc..987dccf 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
@@ -49,6 +49,10 @@ oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.wel
auth_options:
- name: "SciGaP"
oauth_grant_type: "password"
+ - name: "CILogon"
+ oauth_grant_type: "authorization_code"
+ oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
+ logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
gateway_id: "scigap"
[45/50] [abbrv] airavata git commit: updating some of the group
management API methods in AiravataServerHandler
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
index 32c0d51..357fa1e 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
@@ -51463,8 +51463,8 @@ uint32_t Airavata_createGroup_result::read(::apache::thrift::protocol::TProtocol
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->success);
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->success);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -51521,8 +51521,8 @@ uint32_t Airavata_createGroup_result::write(::apache::thrift::protocol::TProtoco
xfer += oprot->writeStructBegin("Airavata_createGroup_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
- xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
+ xfer += oprot->writeString(this->success);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -51573,8 +51573,8 @@ uint32_t Airavata_createGroup_presult::read(::apache::thrift::protocol::TProtoco
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool((*(this->success)));
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString((*(this->success)));
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -51933,7 +51933,6 @@ uint32_t Airavata_deleteGroup_args::read(::apache::thrift::protocol::TProtocol*
bool isset_authzToken = false;
bool isset_groupId = false;
bool isset_ownerId = false;
- bool isset_gatewayId = false;
while (true)
{
@@ -51967,14 +51966,6 @@ uint32_t Airavata_deleteGroup_args::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -51990,8 +51981,6 @@ uint32_t Airavata_deleteGroup_args::read(::apache::thrift::protocol::TProtocol*
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_ownerId)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_gatewayId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
@@ -52012,10 +52001,6 @@ uint32_t Airavata_deleteGroup_args::write(::apache::thrift::protocol::TProtocol*
xfer += oprot->writeString(this->ownerId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString(this->gatewayId);
- xfer += oprot->writeFieldEnd();
-
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -52043,10 +52028,6 @@ uint32_t Airavata_deleteGroup_pargs::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeString((*(this->ownerId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString((*(this->gatewayId)));
- xfer += oprot->writeFieldEnd();
-
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -52548,7 +52529,6 @@ uint32_t Airavata_getAllGroupsUserBelongs_args::read(::apache::thrift::protocol:
bool isset_authzToken = false;
bool isset_userName = false;
- bool isset_gatewayId = false;
while (true)
{
@@ -52574,14 +52554,6 @@ uint32_t Airavata_getAllGroupsUserBelongs_args::read(::apache::thrift::protocol:
xfer += iprot->skip(ftype);
}
break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -52595,8 +52567,6 @@ uint32_t Airavata_getAllGroupsUserBelongs_args::read(::apache::thrift::protocol:
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_userName)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_gatewayId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
@@ -52613,10 +52583,6 @@ uint32_t Airavata_getAllGroupsUserBelongs_args::write(::apache::thrift::protocol
xfer += oprot->writeString(this->userName);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString(this->gatewayId);
- xfer += oprot->writeFieldEnd();
-
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -52640,10 +52606,6 @@ uint32_t Airavata_getAllGroupsUserBelongs_pargs::write(::apache::thrift::protoco
xfer += oprot->writeString((*(this->userName)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString((*(this->gatewayId)));
- xfer += oprot->writeFieldEnd();
-
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -52869,2185 +52831,343 @@ uint32_t Airavata_getAllGroupsUserBelongs_presult::read(::apache::thrift::protoc
return xfer;
}
-
-Airavata_addUserProfile_args::~Airavata_addUserProfile_args() throw() {
+void AiravataClient::getAPIVersion(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken)
+{
+ send_getAPIVersion(authzToken);
+ recv_getAPIVersion(_return);
}
+void AiravataClient::send_getAPIVersion(const ::apache::airavata::model::security::AuthzToken& authzToken)
+{
+ int32_t cseqid = 0;
+ oprot_->writeMessageBegin("getAPIVersion", ::apache::thrift::protocol::T_CALL, cseqid);
-uint32_t Airavata_addUserProfile_args::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
+ Airavata_getAPIVersion_pargs args;
+ args.authzToken = &authzToken;
+ args.write(oprot_);
- xfer += iprot->readStructBegin(fname);
+ oprot_->writeMessageEnd();
+ oprot_->getTransport()->writeEnd();
+ oprot_->getTransport()->flush();
+}
- using ::apache::thrift::protocol::TProtocolException;
+void AiravataClient::recv_getAPIVersion(std::string& _return)
+{
- bool isset_authzToken = false;
- bool isset_userProfile = false;
+ int32_t rseqid = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TMessageType mtype;
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->authzToken.read(iprot);
- isset_authzToken = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->userProfile.read(iprot);
- isset_userProfile = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
+ iprot_->readMessageBegin(fname, mtype, rseqid);
+ if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+ ::apache::thrift::TApplicationException x;
+ x.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ throw x;
}
+ if (mtype != ::apache::thrift::protocol::T_REPLY) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ if (fname.compare("getAPIVersion") != 0) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ Airavata_getAPIVersion_presult result;
+ result.success = &_return;
+ result.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
- xfer += iprot->readStructEnd();
-
- if (!isset_authzToken)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_userProfile)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- return xfer;
+ if (result.__isset.success) {
+ // _return pointer has now been filled
+ return;
+ }
+ if (result.__isset.ire) {
+ throw result.ire;
+ }
+ if (result.__isset.ace) {
+ throw result.ace;
+ }
+ if (result.__isset.ase) {
+ throw result.ase;
+ }
+ if (result.__isset.ae) {
+ throw result.ae;
+ }
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAPIVersion failed: unknown result");
}
-uint32_t Airavata_addUserProfile_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_addUserProfile_args");
-
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->authzToken.write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("userProfile", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += this->userProfile.write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
+bool AiravataClient::isUserExists(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName)
+{
+ send_isUserExists(authzToken, gatewayId, userName);
+ return recv_isUserExists();
}
+void AiravataClient::send_isUserExists(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName)
+{
+ int32_t cseqid = 0;
+ oprot_->writeMessageBegin("isUserExists", ::apache::thrift::protocol::T_CALL, cseqid);
+
+ Airavata_isUserExists_pargs args;
+ args.authzToken = &authzToken;
+ args.gatewayId = &gatewayId;
+ args.userName = &userName;
+ args.write(oprot_);
-Airavata_addUserProfile_pargs::~Airavata_addUserProfile_pargs() throw() {
+ oprot_->writeMessageEnd();
+ oprot_->getTransport()->writeEnd();
+ oprot_->getTransport()->flush();
}
+bool AiravataClient::recv_isUserExists()
+{
-uint32_t Airavata_addUserProfile_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_addUserProfile_pargs");
+ int32_t rseqid = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TMessageType mtype;
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += (*(this->authzToken)).write(oprot);
- xfer += oprot->writeFieldEnd();
+ iprot_->readMessageBegin(fname, mtype, rseqid);
+ if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+ ::apache::thrift::TApplicationException x;
+ x.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ throw x;
+ }
+ if (mtype != ::apache::thrift::protocol::T_REPLY) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ if (fname.compare("isUserExists") != 0) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ bool _return;
+ Airavata_isUserExists_presult result;
+ result.success = &_return;
+ result.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
- xfer += oprot->writeFieldBegin("userProfile", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += (*(this->userProfile)).write(oprot);
- xfer += oprot->writeFieldEnd();
+ if (result.__isset.success) {
+ return _return;
+ }
+ if (result.__isset.ire) {
+ throw result.ire;
+ }
+ if (result.__isset.ace) {
+ throw result.ace;
+ }
+ if (result.__isset.ase) {
+ throw result.ase;
+ }
+ if (result.__isset.ae) {
+ throw result.ae;
+ }
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "isUserExists failed: unknown result");
+}
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
+void AiravataClient::addGateway(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::workspace::Gateway& gateway)
+{
+ send_addGateway(authzToken, gateway);
+ recv_addGateway(_return);
}
+void AiravataClient::send_addGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::workspace::Gateway& gateway)
+{
+ int32_t cseqid = 0;
+ oprot_->writeMessageBegin("addGateway", ::apache::thrift::protocol::T_CALL, cseqid);
-Airavata_addUserProfile_result::~Airavata_addUserProfile_result() throw() {
-}
+ Airavata_addGateway_pargs args;
+ args.authzToken = &authzToken;
+ args.gateway = &gateway;
+ args.write(oprot_);
+ oprot_->writeMessageEnd();
+ oprot_->getTransport()->writeEnd();
+ oprot_->getTransport()->flush();
+}
-uint32_t Airavata_addUserProfile_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+void AiravataClient::recv_addGateway(std::string& _return)
+{
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
+ int32_t rseqid = 0;
std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
+ ::apache::thrift::protocol::TMessageType mtype;
- xfer += iprot->readStructBegin(fname);
+ iprot_->readMessageBegin(fname, mtype, rseqid);
+ if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+ ::apache::thrift::TApplicationException x;
+ x.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ throw x;
+ }
+ if (mtype != ::apache::thrift::protocol::T_REPLY) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ if (fname.compare("addGateway") != 0) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ Airavata_addGateway_presult result;
+ result.success = &_return;
+ result.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
- using ::apache::thrift::protocol::TProtocolException;
+ if (result.__isset.success) {
+ // _return pointer has now been filled
+ return;
+ }
+ if (result.__isset.ire) {
+ throw result.ire;
+ }
+ if (result.__isset.ace) {
+ throw result.ace;
+ }
+ if (result.__isset.ase) {
+ throw result.ase;
+ }
+ if (result.__isset.ae) {
+ throw result.ae;
+ }
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGateway failed: unknown result");
+}
+void AiravataClient::getAllUsersInGateway(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId)
+{
+ send_getAllUsersInGateway(authzToken, gatewayId);
+ recv_getAllUsersInGateway(_return);
+}
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->success);
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
+void AiravataClient::send_getAllUsersInGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId)
+{
+ int32_t cseqid = 0;
+ oprot_->writeMessageBegin("getAllUsersInGateway", ::apache::thrift::protocol::T_CALL, cseqid);
- xfer += iprot->readStructEnd();
+ Airavata_getAllUsersInGateway_pargs args;
+ args.authzToken = &authzToken;
+ args.gatewayId = &gatewayId;
+ args.write(oprot_);
- return xfer;
+ oprot_->writeMessageEnd();
+ oprot_->getTransport()->writeEnd();
+ oprot_->getTransport()->flush();
}
-uint32_t Airavata_addUserProfile_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+void AiravataClient::recv_getAllUsersInGateway(std::vector<std::string> & _return)
+{
- uint32_t xfer = 0;
+ int32_t rseqid = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TMessageType mtype;
- xfer += oprot->writeStructBegin("Airavata_addUserProfile_result");
+ iprot_->readMessageBegin(fname, mtype, rseqid);
+ if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+ ::apache::thrift::TApplicationException x;
+ x.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ throw x;
+ }
+ if (mtype != ::apache::thrift::protocol::T_REPLY) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ if (fname.compare("getAllUsersInGateway") != 0) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ Airavata_getAllUsersInGateway_presult result;
+ result.success = &_return;
+ result.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
- if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
- xfer += oprot->writeString(this->success);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ire) {
- xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->ire.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ace) {
- xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += this->ace.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ase) {
- xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
- xfer += this->ase.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ae) {
- xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
- xfer += this->ae.write(oprot);
- xfer += oprot->writeFieldEnd();
+ if (result.__isset.success) {
+ // _return pointer has now been filled
+ return;
}
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
+ if (result.__isset.ire) {
+ throw result.ire;
+ }
+ if (result.__isset.ace) {
+ throw result.ace;
+ }
+ if (result.__isset.ase) {
+ throw result.ase;
+ }
+ if (result.__isset.ae) {
+ throw result.ae;
+ }
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllUsersInGateway failed: unknown result");
}
-
-Airavata_addUserProfile_presult::~Airavata_addUserProfile_presult() throw() {
+bool AiravataClient::updateGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::workspace::Gateway& updatedGateway)
+{
+ send_updateGateway(authzToken, gatewayId, updatedGateway);
+ return recv_updateGateway();
}
+void AiravataClient::send_updateGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::workspace::Gateway& updatedGateway)
+{
+ int32_t cseqid = 0;
+ oprot_->writeMessageBegin("updateGateway", ::apache::thrift::protocol::T_CALL, cseqid);
-uint32_t Airavata_addUserProfile_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+ Airavata_updateGateway_pargs args;
+ args.authzToken = &authzToken;
+ args.gatewayId = &gatewayId;
+ args.updatedGateway = &updatedGateway;
+ args.write(oprot_);
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
+ oprot_->writeMessageEnd();
+ oprot_->getTransport()->writeEnd();
+ oprot_->getTransport()->flush();
+}
- xfer += iprot->readStructBegin(fname);
+bool AiravataClient::recv_updateGateway()
+{
- using ::apache::thrift::protocol::TProtocolException;
+ int32_t rseqid = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TMessageType mtype;
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString((*(this->success)));
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-
-Airavata_updateUserProfile_args::~Airavata_updateUserProfile_args() throw() {
-}
-
-
-uint32_t Airavata_updateUserProfile_args::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
- bool isset_authzToken = false;
- bool isset_userProfile = false;
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->authzToken.read(iprot);
- isset_authzToken = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->userProfile.read(iprot);
- isset_userProfile = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- if (!isset_authzToken)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_userProfile)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- return xfer;
-}
-
-uint32_t Airavata_updateUserProfile_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_updateUserProfile_args");
-
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->authzToken.write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("userProfile", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += this->userProfile.write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_updateUserProfile_pargs::~Airavata_updateUserProfile_pargs() throw() {
-}
-
-
-uint32_t Airavata_updateUserProfile_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_updateUserProfile_pargs");
-
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += (*(this->authzToken)).write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("userProfile", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += (*(this->userProfile)).write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_updateUserProfile_result::~Airavata_updateUserProfile_result() throw() {
-}
-
-
-uint32_t Airavata_updateUserProfile_result::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->success);
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-uint32_t Airavata_updateUserProfile_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
-
- uint32_t xfer = 0;
-
- xfer += oprot->writeStructBegin("Airavata_updateUserProfile_result");
-
- if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
- xfer += oprot->writeBool(this->success);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ire) {
- xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->ire.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ace) {
- xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += this->ace.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ase) {
- xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
- xfer += this->ase.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ae) {
- xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
- xfer += this->ae.write(oprot);
- xfer += oprot->writeFieldEnd();
- }
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_updateUserProfile_presult::~Airavata_updateUserProfile_presult() throw() {
-}
-
-
-uint32_t Airavata_updateUserProfile_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool((*(this->success)));
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-
-Airavata_getUserProfileById_args::~Airavata_getUserProfileById_args() throw() {
-}
-
-
-uint32_t Airavata_getUserProfileById_args::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
- bool isset_authzToken = false;
- bool isset_userId = false;
- bool isset_gatewayId = false;
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->authzToken.read(iprot);
- isset_authzToken = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->userId);
- isset_userId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- if (!isset_authzToken)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_userId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_gatewayId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- return xfer;
-}
-
-uint32_t Airavata_getUserProfileById_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getUserProfileById_args");
-
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->authzToken.write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("userId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString(this->userId);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString(this->gatewayId);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_getUserProfileById_pargs::~Airavata_getUserProfileById_pargs() throw() {
-}
-
-
-uint32_t Airavata_getUserProfileById_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getUserProfileById_pargs");
-
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += (*(this->authzToken)).write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("userId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString((*(this->userId)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString((*(this->gatewayId)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_getUserProfileById_result::~Airavata_getUserProfileById_result() throw() {
-}
-
-
-uint32_t Airavata_getUserProfileById_result::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->success.read(iprot);
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-uint32_t Airavata_getUserProfileById_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
-
- uint32_t xfer = 0;
-
- xfer += oprot->writeStructBegin("Airavata_getUserProfileById_result");
-
- if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
- xfer += this->success.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ire) {
- xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->ire.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ace) {
- xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += this->ace.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ase) {
- xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
- xfer += this->ase.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ae) {
- xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
- xfer += this->ae.write(oprot);
- xfer += oprot->writeFieldEnd();
- }
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_getUserProfileById_presult::~Airavata_getUserProfileById_presult() throw() {
-}
-
-
-uint32_t Airavata_getUserProfileById_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += (*(this->success)).read(iprot);
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-
-Airavata_deleteUserProfile_args::~Airavata_deleteUserProfile_args() throw() {
-}
-
-
-uint32_t Airavata_deleteUserProfile_args::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
- bool isset_authzToken = false;
- bool isset_userId = false;
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->authzToken.read(iprot);
- isset_authzToken = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->userId);
- isset_userId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- if (!isset_authzToken)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_userId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- return xfer;
-}
-
-uint32_t Airavata_deleteUserProfile_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_deleteUserProfile_args");
-
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->authzToken.write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("userId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString(this->userId);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_deleteUserProfile_pargs::~Airavata_deleteUserProfile_pargs() throw() {
-}
-
-
-uint32_t Airavata_deleteUserProfile_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_deleteUserProfile_pargs");
-
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += (*(this->authzToken)).write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("userId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString((*(this->userId)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_deleteUserProfile_result::~Airavata_deleteUserProfile_result() throw() {
-}
-
-
-uint32_t Airavata_deleteUserProfile_result::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->success);
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-uint32_t Airavata_deleteUserProfile_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
-
- uint32_t xfer = 0;
-
- xfer += oprot->writeStructBegin("Airavata_deleteUserProfile_result");
-
- if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
- xfer += oprot->writeBool(this->success);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ire) {
- xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->ire.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ace) {
- xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += this->ace.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ase) {
- xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
- xfer += this->ase.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ae) {
- xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
- xfer += this->ae.write(oprot);
- xfer += oprot->writeFieldEnd();
- }
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_deleteUserProfile_presult::~Airavata_deleteUserProfile_presult() throw() {
-}
-
-
-uint32_t Airavata_deleteUserProfile_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool((*(this->success)));
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-
-Airavata_getAllUserProfilesInGateway_args::~Airavata_getAllUserProfilesInGateway_args() throw() {
-}
-
-
-uint32_t Airavata_getAllUserProfilesInGateway_args::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
- bool isset_authzToken = false;
- bool isset_gatewayId = false;
- bool isset_offset = false;
- bool isset_limit = false;
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->authzToken.read(iprot);
- isset_authzToken = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- xfer += iprot->readI32(this->offset);
- isset_offset = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- xfer += iprot->readI32(this->limit);
- isset_limit = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- if (!isset_authzToken)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_gatewayId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_offset)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_limit)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- return xfer;
-}
-
-uint32_t Airavata_getAllUserProfilesInGateway_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getAllUserProfilesInGateway_args");
-
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->authzToken.write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString(this->gatewayId);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 3);
- xfer += oprot->writeI32(this->offset);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 4);
- xfer += oprot->writeI32(this->limit);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_getAllUserProfilesInGateway_pargs::~Airavata_getAllUserProfilesInGateway_pargs() throw() {
-}
-
-
-uint32_t Airavata_getAllUserProfilesInGateway_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_getAllUserProfilesInGateway_pargs");
-
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += (*(this->authzToken)).write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString((*(this->gatewayId)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I32, 3);
- xfer += oprot->writeI32((*(this->offset)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("limit", ::apache::thrift::protocol::T_I32, 4);
- xfer += oprot->writeI32((*(this->limit)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_getAllUserProfilesInGateway_result::~Airavata_getAllUserProfilesInGateway_result() throw() {
-}
-
-
-uint32_t Airavata_getAllUserProfilesInGateway_result::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- this->success.clear();
- uint32_t _size505;
- ::apache::thrift::protocol::TType _etype508;
- xfer += iprot->readListBegin(_etype508, _size505);
- this->success.resize(_size505);
- uint32_t _i509;
- for (_i509 = 0; _i509 < _size505; ++_i509)
- {
- xfer += this->success[_i509].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-uint32_t Airavata_getAllUserProfilesInGateway_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
-
- uint32_t xfer = 0;
-
- xfer += oprot->writeStructBegin("Airavata_getAllUserProfilesInGateway_result");
-
- if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
- {
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::user::UserProfile> ::const_iterator _iter510;
- for (_iter510 = this->success.begin(); _iter510 != this->success.end(); ++_iter510)
- {
- xfer += (*_iter510).write(oprot);
- }
- xfer += oprot->writeListEnd();
- }
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ire) {
- xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->ire.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ace) {
- xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += this->ace.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ase) {
- xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
- xfer += this->ase.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ae) {
- xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
- xfer += this->ae.write(oprot);
- xfer += oprot->writeFieldEnd();
- }
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_getAllUserProfilesInGateway_presult::~Airavata_getAllUserProfilesInGateway_presult() throw() {
-}
-
-
-uint32_t Airavata_getAllUserProfilesInGateway_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_LIST) {
- {
- (*(this->success)).clear();
- uint32_t _size511;
- ::apache::thrift::protocol::TType _etype514;
- xfer += iprot->readListBegin(_etype514, _size511);
- (*(this->success)).resize(_size511);
- uint32_t _i515;
- for (_i515 = 0; _i515 < _size511; ++_i515)
- {
- xfer += (*(this->success))[_i515].read(iprot);
- }
- xfer += iprot->readListEnd();
- }
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-
-Airavata_doesUserProfileExist_args::~Airavata_doesUserProfileExist_args() throw() {
-}
-
-
-uint32_t Airavata_doesUserProfileExist_args::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
- bool isset_authzToken = false;
- bool isset_userId = false;
- bool isset_gatewayId = false;
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->authzToken.read(iprot);
- isset_authzToken = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->userId);
- isset_userId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gatewayId);
- isset_gatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- if (!isset_authzToken)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_userId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_gatewayId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- return xfer;
-}
-
-uint32_t Airavata_doesUserProfileExist_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_doesUserProfileExist_args");
-
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->authzToken.write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("userId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString(this->userId);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString(this->gatewayId);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_doesUserProfileExist_pargs::~Airavata_doesUserProfileExist_pargs() throw() {
-}
-
-
-uint32_t Airavata_doesUserProfileExist_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
- uint32_t xfer = 0;
- apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
- xfer += oprot->writeStructBegin("Airavata_doesUserProfileExist_pargs");
-
- xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += (*(this->authzToken)).write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("userId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString((*(this->userId)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString((*(this->gatewayId)));
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_doesUserProfileExist_result::~Airavata_doesUserProfileExist_result() throw() {
-}
-
-
-uint32_t Airavata_doesUserProfileExist_result::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->success);
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-uint32_t Airavata_doesUserProfileExist_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
-
- uint32_t xfer = 0;
-
- xfer += oprot->writeStructBegin("Airavata_doesUserProfileExist_result");
-
- if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
- xfer += oprot->writeBool(this->success);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ire) {
- xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->ire.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ace) {
- xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += this->ace.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ase) {
- xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
- xfer += this->ase.write(oprot);
- xfer += oprot->writeFieldEnd();
- } else if (this->__isset.ae) {
- xfer += oprot->writeFieldBegin("ae", ::apache::thrift::protocol::T_STRUCT, 4);
- xfer += this->ae.write(oprot);
- xfer += oprot->writeFieldEnd();
- }
- xfer += oprot->writeFieldStop();
- xfer += oprot->writeStructEnd();
- return xfer;
-}
-
-
-Airavata_doesUserProfileExist_presult::~Airavata_doesUserProfileExist_presult() throw() {
-}
-
-
-uint32_t Airavata_doesUserProfileExist_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
-
- apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
- uint32_t xfer = 0;
- std::string fname;
- ::apache::thrift::protocol::TType ftype;
- int16_t fid;
-
- xfer += iprot->readStructBegin(fname);
-
- using ::apache::thrift::protocol::TProtocolException;
-
-
- while (true)
- {
- xfer += iprot->readFieldBegin(fname, ftype, fid);
- if (ftype == ::apache::thrift::protocol::T_STOP) {
- break;
- }
- switch (fid)
- {
- case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool((*(this->success)));
- this->__isset.success = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ire.read(iprot);
- this->__isset.ire = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ace.read(iprot);
- this->__isset.ace = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 3:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ase.read(iprot);
- this->__isset.ase = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 4:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->ae.read(iprot);
- this->__isset.ae = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- default:
- xfer += iprot->skip(ftype);
- break;
- }
- xfer += iprot->readFieldEnd();
- }
-
- xfer += iprot->readStructEnd();
-
- return xfer;
-}
-
-void AiravataClient::getAPIVersion(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken)
-{
- send_getAPIVersion(authzToken);
- recv_getAPIVersion(_return);
-}
-
-void AiravataClient::send_getAPIVersion(const ::apache::airavata::model::security::AuthzToken& authzToken)
-{
- int32_t cseqid = 0;
- oprot_->writeMessageBegin("getAPIVersion", ::apache::thrift::protocol::T_CALL, cseqid);
-
- Airavata_getAPIVersion_pargs args;
- args.authzToken = &authzToken;
- args.write(oprot_);
-
- oprot_->writeMessageEnd();
- oprot_->getTransport()->writeEnd();
- oprot_->getTransport()->flush();
-}
-
-void AiravataClient::recv_getAPIVersion(std::string& _return)
-{
-
- int32_t rseqid = 0;
- std::string fname;
- ::apache::thrift::protocol::TMessageType mtype;
-
- iprot_->readMessageBegin(fname, mtype, rseqid);
- if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
- ::apache::thrift::TApplicationException x;
- x.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- throw x;
- }
- if (mtype != ::apache::thrift::protocol::T_REPLY) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- if (fname.compare("getAPIVersion") != 0) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- Airavata_getAPIVersion_presult result;
- result.success = &_return;
- result.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
-
- if (result.__isset.success) {
- // _return pointer has now been filled
- return;
- }
- if (result.__isset.ire) {
- throw result.ire;
- }
- if (result.__isset.ace) {
- throw result.ace;
- }
- if (result.__isset.ase) {
- throw result.ase;
- }
- if (result.__isset.ae) {
- throw result.ae;
- }
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAPIVersion failed: unknown result");
-}
-
-bool AiravataClient::isUserExists(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName)
-{
- send_isUserExists(authzToken, gatewayId, userName);
- return recv_isUserExists();
-}
-
-void AiravataClient::send_isUserExists(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName)
-{
- int32_t cseqid = 0;
- oprot_->writeMessageBegin("isUserExists", ::apache::thrift::protocol::T_CALL, cseqid);
-
- Airavata_isUserExists_pargs args;
- args.authzToken = &authzToken;
- args.gatewayId = &gatewayId;
- args.userName = &userName;
- args.write(oprot_);
-
- oprot_->writeMessageEnd();
- oprot_->getTransport()->writeEnd();
- oprot_->getTransport()->flush();
-}
-
-bool AiravataClient::recv_isUserExists()
-{
-
- int32_t rseqid = 0;
- std::string fname;
- ::apache::thrift::protocol::TMessageType mtype;
-
- iprot_->readMessageBegin(fname, mtype, rseqid);
- if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
- ::apache::thrift::TApplicationException x;
- x.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- throw x;
- }
- if (mtype != ::apache::thrift::protocol::T_REPLY) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- if (fname.compare("isUserExists") != 0) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- bool _return;
- Airavata_isUserExists_presult result;
- result.success = &_return;
- result.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
-
- if (result.__isset.success) {
- return _return;
- }
- if (result.__isset.ire) {
- throw result.ire;
- }
- if (result.__isset.ace) {
- throw result.ace;
- }
- if (result.__isset.ase) {
- throw result.ase;
- }
- if (result.__isset.ae) {
- throw result.ae;
- }
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "isUserExists failed: unknown result");
-}
-
-void AiravataClient::addGateway(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::workspace::Gateway& gateway)
-{
- send_addGateway(authzToken, gateway);
- recv_addGateway(_return);
-}
-
-void AiravataClient::send_addGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::workspace::Gateway& gateway)
-{
- int32_t cseqid = 0;
- oprot_->writeMessageBegin("addGateway", ::apache::thrift::protocol::T_CALL, cseqid);
-
- Airavata_addGateway_pargs args;
- args.authzToken = &authzToken;
- args.gateway = &gateway;
- args.write(oprot_);
-
- oprot_->writeMessageEnd();
- oprot_->getTransport()->writeEnd();
- oprot_->getTransport()->flush();
-}
-
-void AiravataClient::recv_addGateway(std::string& _return)
-{
-
- int32_t rseqid = 0;
- std::string fname;
- ::apache::thrift::protocol::TMessageType mtype;
-
- iprot_->readMessageBegin(fname, mtype, rseqid);
- if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
- ::apache::thrift::TApplicationException x;
- x.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- throw x;
- }
- if (mtype != ::apache::thrift::protocol::T_REPLY) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- if (fname.compare("addGateway") != 0) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- Airavata_addGateway_presult result;
- result.success = &_return;
- result.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
-
- if (result.__isset.success) {
- // _return pointer has now been filled
- return;
- }
- if (result.__isset.ire) {
- throw result.ire;
- }
- if (result.__isset.ace) {
- throw result.ace;
- }
- if (result.__isset.ase) {
- throw result.ase;
- }
- if (result.__isset.ae) {
- throw result.ae;
- }
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGateway failed: unknown result");
-}
-
-void AiravataClient::getAllUsersInGateway(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId)
-{
- send_getAllUsersInGateway(authzToken, gatewayId);
- recv_getAllUsersInGateway(_return);
-}
-
-void AiravataClient::send_getAllUsersInGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId)
-{
- int32_t cseqid = 0;
- oprot_->writeMessageBegin("getAllUsersInGateway", ::apache::thrift::protocol::T_CALL, cseqid);
-
- Airavata_getAllUsersInGateway_pargs args;
- args.authzToken = &authzToken;
- args.gatewayId = &gatewayId;
- args.write(oprot_);
-
- oprot_->writeMessageEnd();
- oprot_->getTransport()->writeEnd();
- oprot_->getTransport()->flush();
-}
-
-void AiravataClient::recv_getAllUsersInGateway(std::vector<std::string> & _return)
-{
-
- int32_t rseqid = 0;
- std::string fname;
- ::apache::thrift::protocol::TMessageType mtype;
-
- iprot_->readMessageBegin(fname, mtype, rseqid);
- if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
- ::apache::thrift::TApplicationException x;
- x.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- throw x;
- }
- if (mtype != ::apache::thrift::protocol::T_REPLY) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- if (fname.compare("getAllUsersInGateway") != 0) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- Airavata_getAllUsersInGateway_presult result;
- result.success = &_return;
- result.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
-
- if (result.__isset.success) {
- // _return pointer has now been filled
- return;
- }
- if (result.__isset.ire) {
- throw result.ire;
- }
- if (result.__isset.ace) {
- throw result.ace;
- }
- if (result.__isset.ase) {
- throw result.ase;
- }
- if (result.__isset.ae) {
- throw result.ae;
- }
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllUsersInGateway failed: unknown result");
-}
-
-bool AiravataClient::updateGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::workspace::Gateway& updatedGateway)
-{
- send_updateGateway(authzToken, gatewayId, updatedGateway);
- return recv_updateGateway();
-}
-
-void AiravataClient::send_updateGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const ::apache::airavata::model::workspace::Gateway& updatedGateway)
-{
- int32_t cseqid = 0;
- oprot_->writeMessageBegin("updateGateway", ::apache::thrift::protocol::T_CALL, cseqid);
-
- Airavata_updateGateway_pargs args;
- args.authzToken = &authzToken;
- args.gatewayId = &gatewayId;
- args.updatedGateway = &updatedGateway;
- args.write(oprot_);
-
- oprot_->writeMessageEnd();
- oprot_->getTransport()->writeEnd();
- oprot_->getTransport()->flush();
-}
-
-bool AiravataClient::recv_updateGateway()
-{
-
- int32_t rseqid = 0;
- std::string fname;
- ::apache::thrift::protocol::TMessageType mtype;
-
- iprot_->readMessageBegin(fname, mtype, rseqid);
- if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
- ::apache::thrift::TApplicationException x;
- x.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- throw x;
- }
- if (mtype != ::apache::thrift::protocol::T_REPLY) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- if (fname.compare("updateGateway") != 0) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- bool _return;
- Airavata_updateGateway_presult result;
- result.success = &_return;
- result.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
+ iprot_->readMessageBegin(fname, mtype, rseqid);
+ if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
+ ::apache::thrift::TApplicationException x;
+ x.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ throw x;
+ }
+ if (mtype != ::apache::thrift::protocol::T_REPLY) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ if (fname.compare("updateGateway") != 0) {
+ iprot_->skip(::apache::thrift::protocol::T_STRUCT);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
+ }
+ bool _return;
+ Airavata_updateGateway_presult result;
+ result.success = &_return;
+ result.read(iprot_);
+ iprot_->readMessageEnd();
+ iprot_->getTransport()->readEnd();
if (result.__isset.success) {
return _return;
@@ -56693,471 +54813,27 @@ void AiravataClient::recv_getUserProjects(std::vector< ::apache::airavata::model
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getUserProjects failed: unknown result");
-}
-
-void AiravataClient::searchProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::experiment::ProjectSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset)
-{
- send_searchProjects(authzToken, gatewayId, userName, filters, limit, offset);
- recv_searchProjects(_return);
-}
-
-void AiravataClient::send_searchProjects(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::experiment::ProjectSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset)
-{
- int32_t cseqid = 0;
- oprot_->writeMessageBegin("searchProjects", ::apache::thrift::protocol::T_CALL, cseqid);
-
- Airavata_searchProjects_pargs args;
- args.authzToken = &authzToken;
- args.gatewayId = &gatewayId;
- args.userName = &userName;
- args.filters = &filters;
- args.limit = &limit;
- args.offset = &offset;
- args.write(oprot_);
-
- oprot_->writeMessageEnd();
- oprot_->getTransport()->writeEnd();
- oprot_->getTransport()->flush();
-}
-
-void AiravataClient::recv_searchProjects(std::vector< ::apache::airavata::model::workspace::Project> & _return)
-{
-
- int32_t rseqid = 0;
- std::string fname;
- ::apache::thrift::protocol::TMessageType mtype;
-
- iprot_->readMessageBegin(fname, mtype, rseqid);
- if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
- ::apache::thrift::TApplicationException x;
- x.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- throw x;
- }
- if (mtype != ::apache::thrift::protocol::T_REPLY) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- if (fname.compare("searchProjects") != 0) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- Airavata_searchProjects_presult result;
- result.success = &_return;
- result.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
-
- if (result.__isset.success) {
- // _return pointer has now been filled
- return;
- }
- if (result.__isset.ire) {
- throw result.ire;
- }
- if (result.__isset.ace) {
- throw result.ace;
- }
- if (result.__isset.ase) {
- throw result.ase;
- }
- if (result.__isset.ae) {
- throw result.ae;
- }
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchProjects failed: unknown result");
-}
-
-void AiravataClient::searchExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset)
-{
- send_searchExperiments(authzToken, gatewayId, userName, filters, limit, offset);
- recv_searchExperiments(_return);
-}
-
-void AiravataClient::send_searchExperiments(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const std::string& userName, const std::map< ::apache::airavata::model::experiment::ExperimentSearchFields::type, std::string> & filters, const int32_t limit, const int32_t offset)
-{
- int32_t cseqid = 0;
- oprot_->writeMessageBegin("searchExperiments", ::apache::thrift::protocol::T_CALL, cseqid);
-
- Airavata_searchExperiments_pargs args;
- args.authzToken = &authzToken;
- args.gatewayId = &gatewayId;
- args.userName = &userName;
- args.filters = &filters;
- args.limit = &limit;
- args.offset = &offset;
- args.write(oprot_);
-
- oprot_->writeMessageEnd();
- oprot_->getTransport()->writeEnd();
- oprot_->getTransport()->flush();
-}
-
-void AiravataClient::recv_searchExperiments(std::vector< ::apache::airavata::model::experiment::ExperimentSummaryModel> & _return)
-{
-
- int32_t rseqid = 0;
- std::string fname;
- ::apache::thrift::protocol::TMessageType mtype;
-
- iprot_->readMessageBegin(fname, mtype, rseqid);
- if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
- ::apache::thrift::TApplicationException x;
- x.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- throw x;
- }
- if (mtype != ::apache::thrift::protocol::T_REPLY) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- if (fname.compare("searchExperiments") != 0) {
- iprot_->skip(::apache::thrift::protocol::T_STRUCT);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
- }
- Airavata_searchExperiments_presult result;
- result.success = &_return;
- result.read(iprot_);
- iprot_->readMessageEnd();
- iprot_->getTransport()->readEnd();
-
- if (result.__isset.success) {
- // _return pointer has now been filled
- return;
- }
- if (result.__isset.ire) {
- throw result.ire;
- }
- if (result.__isset.ace) {
- throw result.ace;
- }
- if (result.__isset.ase) {
- throw result.ase;
- }
- if (result.__isset.ae) {
- throw result.ae;
- }
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "searchExperiments failed: unknown result");
-}
-
-void AiravataClient::getExperimentStatistics( ::apache::airavata::model::experiment::ExperimentStatistics& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int64_t fromTime, const int64_t toTime, const std::string& userName, const std::string& applicationName, const std::string& resourceHostName)
-{
- send_getExperimentStatistics(authzToken, gatewayId, fromTime, toTime, userName, applicationName, resourceHostName);
- recv_getExperimentStatistics(_return);
-}
-
-void AiravataClient::send_getExperimentStatistics(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int64_t fromTime, const int64_t toTime, const std::string& userName, const std::string& applicationName, const std::string& resourceHostName)
-{
- int32_t cseqid = 0;
- oprot_->writeMessageBegin("getExperimentStatistics", ::apache::thrift::protocol::T_CALL, cseqid);
-
- Airavata_getExperimentStatistics_pargs args;
- args.authzToken = &authzToken;
- args.gatewayId = &gatewayId;
- args.fromTime = &fromTime;
- args.toTime = &toTime;
- args.u
<TRUNCATED>
[30/50] [abbrv] airavata git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by ma...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/632b76a3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/632b76a3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/632b76a3
Branch: refs/heads/master
Commit: 632b76a34aa1cdfebcb77e792e35fe75028a8add
Parents: 75edff6 1492fdc
Author: Suresh Marru <sm...@apache.org>
Authored: Wed Jul 12 15:32:47 2017 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Wed Jul 12 15:32:47 2017 -0500
----------------------------------------------------------------------
.../production/pga_config/accord/vars.yml | 4 +-
.../production/pga_config/nanoshape/vars.yml | 2 +-
.../scigap/production/pga_config/utah/vars.yml | 2 +-
.../templates/airavata-server.properties.j2 | 5 ++
.../templates/airavata-server.properties.j2 | 5 ++
.../main/resources/airavata-server.properties | 7 +-
modules/db-event-manager/pom.xml | 2 +-
.../db/event/manager/DBEventManagerRunner.java | 67 +++++++++++++++++++-
modules/distribution/pom.xml | 5 ++
.../catalog/resources/WorkerResource.java | 52 +++++++++++----
.../RegistryServiceDBEventHandler.java | 7 +-
.../org/apache/airavata/server/ServerMain.java | 8 ++-
.../messaging/SharingServiceDBEventHandler.java | 7 +-
.../server/SharingRegistryServerHandler.java | 1 -
pom.xml | 1 +
15 files changed, 150 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
[20/50] [abbrv] airavata git commit: Ci Logon integration
Posted by ma...@apache.org.
Ci Logon integration
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d03c7240
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d03c7240
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d03c7240
Branch: refs/heads/master
Commit: d03c724029a0fd9203b4ee2404c38cc87f55baf4
Parents: 101a687
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Jul 11 12:04:10 2017 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Jul 11 12:04:10 2017 -0500
----------------------------------------------------------------------
.../production/pga_config/accord/vars.yml | 4 +--
.../production/pga_config/georgiastate/vars.yml | 8 +++--
.../production/pga_config/oiitandy/vars.yml | 4 +++
.../scigap/production/pga_config/oscer/vars.yml | 2 +-
.../production/pga_config/phasta/vars.yml | 4 +++
.../production/pga_config/southdakota/vars.yml | 4 +++
.../pga_config/southernillinois/vars.yml | 8 +++--
.../scigap/production/pga_config/utah/vars.yml | 8 +++--
dev-tools/ansible/pga-scigap-prod.yml | 36 ++++++++++----------
9 files changed, 51 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
index b598828..4e916d8 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
@@ -23,7 +23,7 @@ pga_repo: "https://github.com/apache/airavata-php-gateway.git"
git_branch: "develop"
user: "pga"
group: "pga"
-doc_root_dir: "/var/www/portals/testdrive"
+doc_root_dir: "/var/www/portals/accord"
vhost_servername: "accord.hpc.virginia.edu"
vhost_serveralias: "www.accord.hpc.virginia.edu"
vhost_ssl: True
@@ -51,7 +51,7 @@ oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
gateway_id: "virginaaccord"
# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/testdrive"
+experiment_data_dir: "{{ user_data_dir }}/accord"
gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUF51b2cYYqqadLHL9M/oPY0ZHZlWbdOdaIgjpzIzMnO7M9hKrHVY2pqyLPvqCLzaunxITPWsTqw0E8hwub4ttGLAx/O4kIf+BgyZK7iuwXWhI7u85/o58IfrD4B+jVCYKRNayuLR+lJWsiOeS6HSlunpTKTEhFGeOHn2UzdbLfgWYQ3VUFDtKN1oDPDT78ml5c2RCibJ21jltpevVfEtCUctERpTfniWSuQZggP1qiLNa1+PfiJ3mGsEzJFDntQvQetdinaAbEaT7+sctS8nBNjapkmYMf6tBl3S0bLttYPH51f8lUQAFaAzrestO1JpJNnIeY01/S3MWIlAWASnn"
http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
index 1e37084..754c1f7 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
@@ -40,8 +40,12 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
auth_options:
- - name: "Georgia State PHP Gateway"
+ - name: "Georgia State Science Gateway"
oauth_grant_type: "password"
+ - name: "CILogon"
+ oauth_grant_type: "authorization_code"
+ oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
+ logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
gateway_id: "georgiastate"
@@ -57,5 +61,5 @@ portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
portal_theme: "gsu-gateway-theme"
portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Georgia State PHP Gateway"
+portal_title: "Georgia State Science Gateway"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
index 5c27e53..577e5fb 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
@@ -42,6 +42,10 @@ oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.wel
auth_options:
- name: "OII Science Gateway"
oauth_grant_type: "password"
+ - name: "CILogon"
+ oauth_grant_type: "authorization_code"
+ oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
+ logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
gateway_id: "oiitandy"
http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
index 8d5ebf7..bae599e 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
@@ -44,7 +44,7 @@ auth_options:
oauth_grant_type: "password"
- name: "CILogon"
oauth_grant_type: "authorization_code"
- oauth_authorize_url_extra_params: "kc_idp_hint=oidc"
+ oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
index b332339..48a1cca 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
@@ -42,6 +42,10 @@ oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.wel
auth_options:
- name: "PHASTA"
oauth_grant_type: "password"
+ - name: "CILogon"
+ oauth_grant_type: "authorization_code"
+ oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
+ logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
gateway_id: "phasta"
http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
index b9cbed9..225843f 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
@@ -42,6 +42,10 @@ oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.wel
auth_options:
- name: "South Dakota Sciencegateway"
oauth_grant_type: "password"
+ - name: "CILogon"
+ oauth_grant_type: "authorization_code"
+ oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
+ logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
gateway_id: "southdakota"
http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
index 10c86e6..d2d9423 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
@@ -40,8 +40,12 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
auth_options:
- - name: "Southern Illinois PHP Gateway"
+ - name: "Southern Illinois Science Gateway"
oauth_grant_type: "password"
+ - name: "CILogon"
+ oauth_grant_type: "authorization_code"
+ oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
+ logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
gateway_id: "southill"
@@ -57,5 +61,5 @@ portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
portal_theme: "siu-gateway-theme"
portal_theme_repo: "https://github.com/SciGaP/siu-gateway-theme.git"
-portal_title: "Southern Illinois PHP Gateway"
+portal_title: "Southern Illinois Science Gateway"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
index 6608485..eb2bad8 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
@@ -40,8 +40,12 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
auth_options:
- - name: "Utah Gateway"
+ - name: "Utah Science Gateway"
oauth_grant_type: "password"
+ - name: "CILogon"
+ oauth_grant_type: "authorization_code"
+ oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
+ logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
gateway_id: "utah"
@@ -57,5 +61,5 @@ portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
portal_theme: "utah-sciencegateway-theme"
portal_theme_repo: "https://github.com/SciGaP/utah-sciencegateway-theme.git"
-portal_title: "Utah Gateway"
+portal_title: "Utah Science Gateway"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/d03c7240/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index b831f8e..441ad00 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -19,24 +19,24 @@
#
---
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/accord"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/accord"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoconfinement"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoshape"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/simvascular"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan"
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoshape"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/simvascular"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah"
...
[35/50] [abbrv] airavata git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by ma...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8df51dad
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8df51dad
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8df51dad
Branch: refs/heads/master
Commit: 8df51dad7706e2fdbf36c8a14599ca97be9a8675
Parents: fa868f5 89e7e7f
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Jul 13 14:52:28 2017 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Jul 13 14:52:28 2017 -0500
----------------------------------------------------------------------
.../production/pga_config/gatech/vars.yml | 2 +-
dev-tools/ansible/pga-scigap-prod.yml | 1 +
.../db/repositories/AbstractRepository.java | 12 +++--
.../repositories/GroupMembershipRepository.java | 39 +++++++++------
.../db/repositories/SharingRepository.java | 50 +++++++++++---------
.../db/repositories/UserGroupRepository.java | 31 ++++++++----
.../db/repositories/UserRepository.java | 18 ++++---
.../server/SharingRegistryServerHandler.java | 2 +-
8 files changed, 96 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
[11/50] [abbrv] airavata git commit: AIRAVATA-2453 lowercasing
USER_GROUP.GROUP_ID also
Posted by ma...@apache.org.
AIRAVATA-2453 lowercasing USER_GROUP.GROUP_ID also
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b5a597e0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b5a597e0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b5a597e0
Branch: refs/heads/master
Commit: b5a597e0cadef34e63d52d18158196fbc5dd007b
Parents: 704ba66
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Jul 7 17:36:47 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Jul 7 17:37:48 2017 -0400
----------------------------------------------------------------------
.../keycloak-migration/sharingCatalog_keycloak_migration.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b5a597e0/modules/registry/release-migration-scripts/0.17-0.18/keycloak-migration/sharingCatalog_keycloak_migration.sql
----------------------------------------------------------------------
diff --git a/modules/registry/release-migration-scripts/0.17-0.18/keycloak-migration/sharingCatalog_keycloak_migration.sql b/modules/registry/release-migration-scripts/0.17-0.18/keycloak-migration/sharingCatalog_keycloak_migration.sql
index 42ea49c..2ccd9a2 100644
--- a/modules/registry/release-migration-scripts/0.17-0.18/keycloak-migration/sharingCatalog_keycloak_migration.sql
+++ b/modules/registry/release-migration-scripts/0.17-0.18/keycloak-migration/sharingCatalog_keycloak_migration.sql
@@ -2,7 +2,7 @@
--- disable foreign key checks in MySQL/MariaDB
SET FOREIGN_KEY_CHECKS=0;
update SHARING_USER set USER_ID = lower(USER_ID), USER_NAME = lower(USER_NAME);
-update USER_GROUP set OWNER_ID = lower(OWNER_ID);
+update USER_GROUP set OWNER_ID = lower(OWNER_ID), GROUP_ID = lower(GROUP_ID);
update ENTITY set OWNER_ID = lower(OWNER_ID);
update SHARING set GROUP_ID = lower(GROUP_ID);
SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
[46/50] [abbrv] airavata git commit: updating some of the group
management API methods in AiravataServerHandler
Posted by ma...@apache.org.
updating some of the group management API methods in AiravataServerHandler
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e7e77716
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e7e77716
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e7e77716
Branch: refs/heads/master
Commit: e7e77716260ad745c8b82c08f4bb490feb6c0b2f
Parents: f386e38
Author: scnakandala <su...@gmail.com>
Authored: Fri Jul 21 15:35:29 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Jul 21 15:35:29 2017 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 60 +-
.../java/org/apache/airavata/api/Airavata.java | 342 +-
.../main/resources/lib/airavata/Airavata.cpp | 17882 +++++++----------
.../src/main/resources/lib/airavata/Airavata.h | 1088 +-
.../lib/airavata/Airavata_server.skeleton.cpp | 36 +-
.../lib/airavata/tenant_profile_model_types.cpp | 510 +-
.../lib/airavata/tenant_profile_model_types.h | 203 +-
.../lib/airavata/workspace_model_types.cpp | 106 +-
.../lib/airavata/workspace_model_types.h | 15 +-
.../resources/lib/Airavata/API/Airavata.php | 80 +-
.../lib/Airavata/Model/Tenant/Types.php | 410 +-
.../lib/apache/airavata/api/Airavata-remote | 58 +-
.../lib/apache/airavata/api/Airavata.py | 8126 +++-----
.../lib/apache/airavata/model/tenant/ttypes.py | 320 +-
.../apache/airavata/model/workspace/ttypes.py | 130 +-
.../apache/airavata/model/tenant/Tenant.java | 758 +-
.../model/workspace/GatewayApprovalStatus.java | 4 +
.../airavata-apis/airavata_api.thrift | 6 +-
18 files changed, 11739 insertions(+), 18395 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 86e47b0..4ae91ea 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -69,16 +69,12 @@ import org.apache.airavata.model.status.ExperimentState;
import org.apache.airavata.model.status.ExperimentStatus;
import org.apache.airavata.model.status.JobStatus;
import org.apache.airavata.model.status.QueueStatusModel;
-import org.apache.airavata.model.user.UserProfile;
import org.apache.airavata.model.workspace.Gateway;
import org.apache.airavata.model.workspace.Notification;
import org.apache.airavata.model.workspace.Project;
import org.apache.airavata.registry.api.RegistryService;
import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
import org.apache.airavata.registry.api.exception.RegistryServiceException;
-import org.apache.airavata.service.profile.client.ProfileServiceClientFactory;
-import org.apache.airavata.service.profile.user.cpi.UserProfileService;
-import org.apache.airavata.service.profile.user.cpi.exception.UserProfileServiceException;
import org.apache.airavata.service.security.interceptor.SecurityCheck;
import org.apache.airavata.sharing.registry.client.SharingRegistryServiceClientFactory;
import org.apache.airavata.sharing.registry.models.*;
@@ -88,7 +84,6 @@ import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.text.MessageFormat;
import java.util.*;
public class AiravataServerHandler implements Airavata.Iface {
@@ -4700,9 +4695,21 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
@SecurityCheck
- public boolean createGroup(AuthzToken authzToken, GroupModel groupModel) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public String createGroup(AuthzToken authzToken, GroupModel groupModel) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
- throw new UnsupportedOperationException("Method not supported yet");
+ //TODO Validations for authorization
+ SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
+
+ UserGroup sharingUserGroup = new UserGroup();
+ sharingUserGroup.setGroupId(UUID.randomUUID().toString());
+ sharingUserGroup.setName(groupModel.getName());
+ sharingUserGroup.setDescription(groupModel.getDescription());
+ sharingUserGroup.setGroupType(GroupType.USER_LEVEL_GROUP);
+ sharingUserGroup.setDomainId(authzToken.getClaimsMap().get(Constants.GATEWAY_ID));
+
+ String groupId = sharingClient.createGroup(sharingUserGroup);
+ sharingClient.addUsersToGroup(authzToken.getClaimsMap().get(Constants.GATEWAY_ID), groupModel.getMembers(), groupId);
+ return groupId;
} catch (Exception e) {
String msg = "Error Creating Group" ;
logger.error(msg, e);
@@ -4717,7 +4724,19 @@ public class AiravataServerHandler implements Airavata.Iface {
public boolean updateGroup(AuthzToken authzToken, GroupModel groupModel) throws InvalidRequestException,
AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
- throw new UnsupportedOperationException("Method not supported yet");
+ //TODO Validations for authorization
+ SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
+
+ UserGroup sharingUserGroup = new UserGroup();
+ sharingUserGroup.setGroupId(groupModel.getId());
+ sharingUserGroup.setName(groupModel.getName());
+ sharingUserGroup.setDescription(groupModel.getDescription());
+ sharingUserGroup.setGroupType(GroupType.USER_LEVEL_GROUP);
+ sharingUserGroup.setDomainId(authzToken.getClaimsMap().get(Constants.GATEWAY_ID));
+
+ //adding and removal of users should be handle separately
+ sharingClient.updateGroup(sharingUserGroup);
+ return true;
} catch (Exception e) {
String msg = "Error Updating Group" ;
logger.error(msg, e);
@@ -4729,10 +4748,14 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
@SecurityCheck
- public boolean deleteGroup(AuthzToken authzToken, String groupId, String ownerId, String gatewayId) throws
+ public boolean deleteGroup(AuthzToken authzToken, String groupId, String ownerId) throws
InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
- throw new UnsupportedOperationException("Method not supported yet");
+ //TODO Validations for authorization
+ SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
+
+ sharingClient.deleteGroup(authzToken.getClaimsMap().get(Constants.GATEWAY_ID), groupId);
+ return true;
} catch (Exception e) {
String msg = "Error Deleting Group. Group ID: " + groupId ;
logger.error(msg, e);
@@ -4747,7 +4770,20 @@ public class AiravataServerHandler implements Airavata.Iface {
public GroupModel getGroup(AuthzToken authzToken, String groupId) throws InvalidRequestException,
AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
- throw new UnsupportedOperationException("Method not supported yet");
+ SharingRegistryService.Client sharingClient = sharingClientPool.getResource();
+ UserGroup userGroup = sharingClient.getGroup(authzToken.getClaimsMap().get(Constants.GATEWAY_ID), groupId);
+
+ GroupModel groupModel = new GroupModel();
+ groupModel.setId(userGroup.getGroupId());
+ groupModel.setName(userGroup.getName());
+ groupModel.setDescription(userGroup.getDescription());
+ groupModel.setOwnerId(userGroup.getOwnerId());
+
+ sharingClient.getGroupMembersOfTypeUser(authzToken.getClaimsMap().get(Constants.GATEWAY_ID), groupId, 0, -1).stream().forEach(user->
+ groupModel.addToMembers(user.getUserId())
+ );
+
+ return groupModel;
} catch (Exception e) {
String msg = "Error Retreiving Group. Group ID: " + groupId ;
logger.error(msg, e);
@@ -4759,7 +4795,7 @@ public class AiravataServerHandler implements Airavata.Iface {
@Override
@SecurityCheck
- public List<GroupModel> getAllGroupsUserBelongs(AuthzToken authzToken, String userName, String gatewayId)
+ public List<GroupModel> getAllGroupsUserBelongs(AuthzToken authzToken, String userName)
throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
throw new UnsupportedOperationException("Method not supported yet");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
index 8f62c2d..6ef1610 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -3011,15 +3011,15 @@ public class Airavata {
public List<String> getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
- public boolean createGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public String createGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
public boolean updateGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
- public boolean deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public boolean deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
public org.apache.airavata.model.group.GroupModel getGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
- public List<org.apache.airavata.model.group.GroupModel> getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public List<org.apache.airavata.model.group.GroupModel> getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
}
@@ -3357,11 +3357,11 @@ public class Airavata {
public void updateGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void getGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
}
@@ -9417,7 +9417,7 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllAccessibleUsers failed: unknown result");
}
- public boolean createGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public String createGroup(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.airavata.model.group.GroupModel groupModel) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
send_createGroup(authzToken, groupModel);
return recv_createGroup();
@@ -9431,7 +9431,7 @@ public class Airavata {
sendBase("createGroup", args);
}
- public boolean recv_createGroup() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public String recv_createGroup() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
createGroup_result result = new createGroup_result();
receiveBase(result, "createGroup");
@@ -9489,19 +9489,18 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateGroup failed: unknown result");
}
- public boolean deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public boolean deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- send_deleteGroup(authzToken, groupId, ownerId, gatewayId);
+ send_deleteGroup(authzToken, groupId, ownerId);
return recv_deleteGroup();
}
- public void send_deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, String gatewayId) throws org.apache.thrift.TException
+ public void send_deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId) throws org.apache.thrift.TException
{
deleteGroup_args args = new deleteGroup_args();
args.setAuthzToken(authzToken);
args.setGroupId(groupId);
args.setOwnerId(ownerId);
- args.setGatewayId(gatewayId);
sendBase("deleteGroup", args);
}
@@ -9563,18 +9562,17 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getGroup failed: unknown result");
}
- public List<org.apache.airavata.model.group.GroupModel> getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.group.GroupModel> getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- send_getAllGroupsUserBelongs(authzToken, userName, gatewayId);
+ send_getAllGroupsUserBelongs(authzToken, userName);
return recv_getAllGroupsUserBelongs();
}
- public void send_getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, String gatewayId) throws org.apache.thrift.TException
+ public void send_getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName) throws org.apache.thrift.TException
{
getAllGroupsUserBelongs_args args = new getAllGroupsUserBelongs_args();
args.setAuthzToken(authzToken);
args.setUserName(userName);
- args.setGatewayId(gatewayId);
sendBase("getAllGroupsUserBelongs", args);
}
@@ -15794,7 +15792,7 @@ public class Airavata {
prot.writeMessageEnd();
}
- public boolean getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
+ public String getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new IllegalStateException("Method call not finished!");
}
@@ -15839,9 +15837,9 @@ public class Airavata {
}
}
- public void deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void deleteGroup(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- deleteGroup_call method_call = new deleteGroup_call(authzToken, groupId, ownerId, gatewayId, resultHandler, this, ___protocolFactory, ___transport);
+ deleteGroup_call method_call = new deleteGroup_call(authzToken, groupId, ownerId, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
@@ -15850,13 +15848,11 @@ public class Airavata {
private org.apache.airavata.model.security.AuthzToken authzToken;
private String groupId;
private String ownerId;
- private String gatewayId;
- public deleteGroup_call(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public deleteGroup_call(org.apache.airavata.model.security.AuthzToken authzToken, String groupId, String ownerId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.authzToken = authzToken;
this.groupId = groupId;
this.ownerId = ownerId;
- this.gatewayId = gatewayId;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -15865,7 +15861,6 @@ public class Airavata {
args.setAuthzToken(authzToken);
args.setGroupId(groupId);
args.setOwnerId(ownerId);
- args.setGatewayId(gatewayId);
args.write(prot);
prot.writeMessageEnd();
}
@@ -15915,9 +15910,9 @@ public class Airavata {
}
}
- public void getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void getAllGroupsUserBelongs(org.apache.airavata.model.security.AuthzToken authzToken, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- getAllGroupsUserBelongs_call method_call = new getAllGroupsUserBelongs_call(authzToken, userName, gatewayId, resultHandler, this, ___protocolFactory, ___transport);
+ getAllGroupsUserBelongs_call method_call = new getAllGroupsUserBelongs_call(authzToken, userName, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
@@ -15925,12 +15920,10 @@ public class Airavata {
public static class getAllGroupsUserBelongs_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
private String userName;
- private String gatewayId;
- public getAllGroupsUserBelongs_call(org.apache.airavata.model.security.AuthzToken authzToken, String userName, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getAllGroupsUserBelongs_call(org.apache.airavata.model.security.AuthzToken authzToken, String userName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
super(client, protocolFactory, transport, resultHandler, false);
this.authzToken = authzToken;
this.userName = userName;
- this.gatewayId = gatewayId;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -15938,7 +15931,6 @@ public class Airavata {
getAllGroupsUserBelongs_args args = new getAllGroupsUserBelongs_args();
args.setAuthzToken(authzToken);
args.setUserName(userName);
- args.setGatewayId(gatewayId);
args.write(prot);
prot.writeMessageEnd();
}
@@ -21142,7 +21134,6 @@ public class Airavata {
createGroup_result result = new createGroup_result();
try {
result.success = iface.createGroup(args.authzToken, args.groupModel);
- result.setSuccessIsSet(true);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -21203,7 +21194,7 @@ public class Airavata {
public deleteGroup_result getResult(I iface, deleteGroup_args args) throws org.apache.thrift.TException {
deleteGroup_result result = new deleteGroup_result();
try {
- result.success = iface.deleteGroup(args.authzToken, args.groupId, args.ownerId, args.gatewayId);
+ result.success = iface.deleteGroup(args.authzToken, args.groupId, args.ownerId);
result.setSuccessIsSet(true);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
@@ -21264,7 +21255,7 @@ public class Airavata {
public getAllGroupsUserBelongs_result getResult(I iface, getAllGroupsUserBelongs_args args) throws org.apache.thrift.TException {
getAllGroupsUserBelongs_result result = new getAllGroupsUserBelongs_result();
try {
- result.success = iface.getAllGroupsUserBelongs(args.authzToken, args.userName, args.gatewayId);
+ result.success = iface.getAllGroupsUserBelongs(args.authzToken, args.userName);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -33345,7 +33336,7 @@ public class Airavata {
}
}
- public static class createGroup<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createGroup_args, Boolean> {
+ public static class createGroup<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createGroup_args, String> {
public createGroup() {
super("createGroup");
}
@@ -33354,13 +33345,12 @@ public class Airavata {
return new createGroup_args();
}
- public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Boolean>() {
- public void onComplete(Boolean o) {
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
createGroup_result result = new createGroup_result();
result.success = o;
- result.setSuccessIsSet(true);
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
return;
@@ -33413,7 +33403,7 @@ public class Airavata {
return false;
}
- public void start(I iface, createGroup_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ public void start(I iface, createGroup_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
iface.createGroup(args.authzToken, args.groupModel,resultHandler);
}
}
@@ -33560,7 +33550,7 @@ public class Airavata {
}
public void start(I iface, deleteGroup_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.deleteGroup(args.authzToken, args.groupId, args.ownerId, args.gatewayId,resultHandler);
+ iface.deleteGroup(args.authzToken, args.groupId, args.ownerId,resultHandler);
}
}
@@ -33704,7 +33694,7 @@ public class Airavata {
}
public void start(I iface, getAllGroupsUserBelongs_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.group.GroupModel>> resultHandler) throws TException {
- iface.getAllGroupsUserBelongs(args.authzToken, args.userName, args.gatewayId,resultHandler);
+ iface.getAllGroupsUserBelongs(args.authzToken, args.userName,resultHandler);
}
}
@@ -255510,7 +255500,7 @@ public class Airavata {
public static class createGroup_result implements org.apache.thrift.TBase<createGroup_result, createGroup_result._Fields>, java.io.Serializable, Cloneable, Comparable<createGroup_result> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createGroup_result");
- private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField ACE_FIELD_DESC = new org.apache.thrift.protocol.TField("ace", org.apache.thrift.protocol.TType.STRUCT, (short)2);
private static final org.apache.thrift.protocol.TField ASE_FIELD_DESC = new org.apache.thrift.protocol.TField("ase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
@@ -255522,7 +255512,7 @@ public class Airavata {
schemes.put(TupleScheme.class, new createGroup_resultTupleSchemeFactory());
}
- public boolean success; // required
+ public String success; // required
public org.apache.airavata.model.error.InvalidRequestException ire; // required
public org.apache.airavata.model.error.AiravataClientException ace; // required
public org.apache.airavata.model.error.AiravataSystemException ase; // required
@@ -255599,13 +255589,11 @@ public class Airavata {
}
// isset id assignments
- private static final int __SUCCESS_ISSET_ID = 0;
- private byte __isset_bitfield = 0;
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.IRE, new org.apache.thrift.meta_data.FieldMetaData("ire", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
tmpMap.put(_Fields.ACE, new org.apache.thrift.meta_data.FieldMetaData("ace", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -255622,7 +255610,7 @@ public class Airavata {
}
public createGroup_result(
- boolean success,
+ String success,
org.apache.airavata.model.error.InvalidRequestException ire,
org.apache.airavata.model.error.AiravataClientException ace,
org.apache.airavata.model.error.AiravataSystemException ase,
@@ -255630,7 +255618,6 @@ public class Airavata {
{
this();
this.success = success;
- setSuccessIsSet(true);
this.ire = ire;
this.ace = ace;
this.ase = ase;
@@ -255641,8 +255628,9 @@ public class Airavata {
* Performs a deep copy on <i>other</i>.
*/
public createGroup_result(createGroup_result other) {
- __isset_bitfield = other.__isset_bitfield;
- this.success = other.success;
+ if (other.isSetSuccess()) {
+ this.success = other.success;
+ }
if (other.isSetIre()) {
this.ire = new org.apache.airavata.model.error.InvalidRequestException(other.ire);
}
@@ -255663,35 +255651,35 @@ public class Airavata {
@Override
public void clear() {
- setSuccessIsSet(false);
- this.success = false;
+ this.success = null;
this.ire = null;
this.ace = null;
this.ase = null;
this.ae = null;
}
- public boolean isSuccess() {
+ public String getSuccess() {
return this.success;
}
- public createGroup_result setSuccess(boolean success) {
+ public createGroup_result setSuccess(String success) {
this.success = success;
- setSuccessIsSet(true);
return this;
}
public void unsetSuccess() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+ this.success = null;
}
/** Returns true if field success is set (has been assigned a value) and false otherwise */
public boolean isSetSuccess() {
- return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+ return this.success != null;
}
public void setSuccessIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+ if (!value) {
+ this.success = null;
+ }
}
public org.apache.airavata.model.error.InvalidRequestException getIre() {
@@ -255796,7 +255784,7 @@ public class Airavata {
if (value == null) {
unsetSuccess();
} else {
- setSuccess((Boolean)value);
+ setSuccess((String)value);
}
break;
@@ -255838,7 +255826,7 @@ public class Airavata {
public Object getFieldValue(_Fields field) {
switch (field) {
case SUCCESS:
- return isSuccess();
+ return getSuccess();
case IRE:
return getIre();
@@ -255890,12 +255878,12 @@ public class Airavata {
if (that == null)
return false;
- boolean this_present_success = true;
- boolean that_present_success = true;
+ boolean this_present_success = true && this.isSetSuccess();
+ boolean that_present_success = true && that.isSetSuccess();
if (this_present_success || that_present_success) {
if (!(this_present_success && that_present_success))
return false;
- if (this.success != that.success)
+ if (!this.success.equals(that.success))
return false;
}
@@ -255942,7 +255930,7 @@ public class Airavata {
public int hashCode() {
List<Object> list = new ArrayList<Object>();
- boolean present_success = true;
+ boolean present_success = true && (isSetSuccess());
list.add(present_success);
if (present_success)
list.add(success);
@@ -256049,7 +256037,11 @@ public class Airavata {
boolean first = true;
sb.append("success:");
- sb.append(this.success);
+ if (this.success == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.success);
+ }
first = false;
if (!first) sb.append(", ");
sb.append("ire:");
@@ -256102,8 +256094,6 @@ public class Airavata {
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -256129,8 +256119,8 @@ public class Airavata {
}
switch (schemeField.id) {
case 0: // SUCCESS
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.success = iprot.readBool();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.success = iprot.readString();
struct.setSuccessIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -256187,9 +256177,9 @@ public class Airavata {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- if (struct.isSetSuccess()) {
+ if (struct.success != null) {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
- oprot.writeBool(struct.success);
+ oprot.writeString(struct.success);
oprot.writeFieldEnd();
}
if (struct.ire != null) {
@@ -256247,7 +256237,7 @@ public class Airavata {
}
oprot.writeBitSet(optionals, 5);
if (struct.isSetSuccess()) {
- oprot.writeBool(struct.success);
+ oprot.writeString(struct.success);
}
if (struct.isSetIre()) {
struct.ire.write(oprot);
@@ -256268,7 +256258,7 @@ public class Airavata {
TTupleProtocol iprot = (TTupleProtocol) prot;
BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
- struct.success = iprot.readBool();
+ struct.success = iprot.readString();
struct.setSuccessIsSet(true);
}
if (incoming.get(1)) {
@@ -257556,7 +257546,6 @@ public class Airavata {
private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField GROUP_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("groupId", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField OWNER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("ownerId", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)4);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -257567,14 +257556,12 @@ public class Airavata {
public org.apache.airavata.model.security.AuthzToken authzToken; // required
public String groupId; // required
public String ownerId; // required
- public String gatewayId; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
AUTHZ_TOKEN((short)1, "authzToken"),
GROUP_ID((short)2, "groupId"),
- OWNER_ID((short)3, "ownerId"),
- GATEWAY_ID((short)4, "gatewayId");
+ OWNER_ID((short)3, "ownerId");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -257595,8 +257582,6 @@ public class Airavata {
return GROUP_ID;
case 3: // OWNER_ID
return OWNER_ID;
- case 4: // GATEWAY_ID
- return GATEWAY_ID;
default:
return null;
}
@@ -257646,8 +257631,6 @@ public class Airavata {
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.OWNER_ID, new org.apache.thrift.meta_data.FieldMetaData("ownerId", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteGroup_args.class, metaDataMap);
}
@@ -257658,14 +257641,12 @@ public class Airavata {
public deleteGroup_args(
org.apache.airavata.model.security.AuthzToken authzToken,
String groupId,
- String ownerId,
- String gatewayId)
+ String ownerId)
{
this();
this.authzToken = authzToken;
this.groupId = groupId;
this.ownerId = ownerId;
- this.gatewayId = gatewayId;
}
/**
@@ -257681,9 +257662,6 @@ public class Airavata {
if (other.isSetOwnerId()) {
this.ownerId = other.ownerId;
}
- if (other.isSetGatewayId()) {
- this.gatewayId = other.gatewayId;
- }
}
public deleteGroup_args deepCopy() {
@@ -257695,7 +257673,6 @@ public class Airavata {
this.authzToken = null;
this.groupId = null;
this.ownerId = null;
- this.gatewayId = null;
}
public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
@@ -257770,30 +257747,6 @@ public class Airavata {
}
}
- public String getGatewayId() {
- return this.gatewayId;
- }
-
- public deleteGroup_args setGatewayId(String gatewayId) {
- this.gatewayId = gatewayId;
- return this;
- }
-
- public void unsetGatewayId() {
- this.gatewayId = null;
- }
-
- /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
- public boolean isSetGatewayId() {
- return this.gatewayId != null;
- }
-
- public void setGatewayIdIsSet(boolean value) {
- if (!value) {
- this.gatewayId = null;
- }
- }
-
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case AUTHZ_TOKEN:
@@ -257820,14 +257773,6 @@ public class Airavata {
}
break;
- case GATEWAY_ID:
- if (value == null) {
- unsetGatewayId();
- } else {
- setGatewayId((String)value);
- }
- break;
-
}
}
@@ -257842,9 +257787,6 @@ public class Airavata {
case OWNER_ID:
return getOwnerId();
- case GATEWAY_ID:
- return getGatewayId();
-
}
throw new IllegalStateException();
}
@@ -257862,8 +257804,6 @@ public class Airavata {
return isSetGroupId();
case OWNER_ID:
return isSetOwnerId();
- case GATEWAY_ID:
- return isSetGatewayId();
}
throw new IllegalStateException();
}
@@ -257908,15 +257848,6 @@ public class Airavata {
return false;
}
- boolean this_present_gatewayId = true && this.isSetGatewayId();
- boolean that_present_gatewayId = true && that.isSetGatewayId();
- if (this_present_gatewayId || that_present_gatewayId) {
- if (!(this_present_gatewayId && that_present_gatewayId))
- return false;
- if (!this.gatewayId.equals(that.gatewayId))
- return false;
- }
-
return true;
}
@@ -257939,11 +257870,6 @@ public class Airavata {
if (present_ownerId)
list.add(ownerId);
- boolean present_gatewayId = true && (isSetGatewayId());
- list.add(present_gatewayId);
- if (present_gatewayId)
- list.add(gatewayId);
-
return list.hashCode();
}
@@ -257985,16 +257911,6 @@ public class Airavata {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetGatewayId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
return 0;
}
@@ -258038,14 +257954,6 @@ public class Airavata {
sb.append(this.ownerId);
}
first = false;
- if (!first) sb.append(", ");
- sb.append("gatewayId:");
- if (this.gatewayId == null) {
- sb.append("null");
- } else {
- sb.append(this.gatewayId);
- }
- first = false;
sb.append(")");
return sb.toString();
}
@@ -258061,9 +257969,6 @@ public class Airavata {
if (ownerId == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'ownerId' was not present! Struct: " + toString());
}
- if (gatewayId == null) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
- }
// check for sub-struct validity
if (authzToken != null) {
authzToken.validate();
@@ -258129,14 +258034,6 @@ public class Airavata {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // GATEWAY_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -258167,11 +258064,6 @@ public class Airavata {
oprot.writeString(struct.ownerId);
oprot.writeFieldEnd();
}
- if (struct.gatewayId != null) {
- oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
- oprot.writeString(struct.gatewayId);
- oprot.writeFieldEnd();
- }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -258192,7 +258084,6 @@ public class Airavata {
struct.authzToken.write(oprot);
oprot.writeString(struct.groupId);
oprot.writeString(struct.ownerId);
- oprot.writeString(struct.gatewayId);
}
@Override
@@ -258205,8 +258096,6 @@ public class Airavata {
struct.setGroupIdIsSet(true);
struct.ownerId = iprot.readString();
struct.setOwnerIdIsSet(true);
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
}
}
@@ -260260,7 +260149,6 @@ public class Airavata {
private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -260270,13 +260158,11 @@ public class Airavata {
public org.apache.airavata.model.security.AuthzToken authzToken; // required
public String userName; // required
- public String gatewayId; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
AUTHZ_TOKEN((short)1, "authzToken"),
- USER_NAME((short)2, "userName"),
- GATEWAY_ID((short)3, "gatewayId");
+ USER_NAME((short)2, "userName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -260295,8 +260181,6 @@ public class Airavata {
return AUTHZ_TOKEN;
case 2: // USER_NAME
return USER_NAME;
- case 3: // GATEWAY_ID
- return GATEWAY_ID;
default:
return null;
}
@@ -260344,8 +260228,6 @@ public class Airavata {
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllGroupsUserBelongs_args.class, metaDataMap);
}
@@ -260355,13 +260237,11 @@ public class Airavata {
public getAllGroupsUserBelongs_args(
org.apache.airavata.model.security.AuthzToken authzToken,
- String userName,
- String gatewayId)
+ String userName)
{
this();
this.authzToken = authzToken;
this.userName = userName;
- this.gatewayId = gatewayId;
}
/**
@@ -260374,9 +260254,6 @@ public class Airavata {
if (other.isSetUserName()) {
this.userName = other.userName;
}
- if (other.isSetGatewayId()) {
- this.gatewayId = other.gatewayId;
- }
}
public getAllGroupsUserBelongs_args deepCopy() {
@@ -260387,7 +260264,6 @@ public class Airavata {
public void clear() {
this.authzToken = null;
this.userName = null;
- this.gatewayId = null;
}
public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
@@ -260438,30 +260314,6 @@ public class Airavata {
}
}
- public String getGatewayId() {
- return this.gatewayId;
- }
-
- public getAllGroupsUserBelongs_args setGatewayId(String gatewayId) {
- this.gatewayId = gatewayId;
- return this;
- }
-
- public void unsetGatewayId() {
- this.gatewayId = null;
- }
-
- /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
- public boolean isSetGatewayId() {
- return this.gatewayId != null;
- }
-
- public void setGatewayIdIsSet(boolean value) {
- if (!value) {
- this.gatewayId = null;
- }
- }
-
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case AUTHZ_TOKEN:
@@ -260480,14 +260332,6 @@ public class Airavata {
}
break;
- case GATEWAY_ID:
- if (value == null) {
- unsetGatewayId();
- } else {
- setGatewayId((String)value);
- }
- break;
-
}
}
@@ -260499,9 +260343,6 @@ public class Airavata {
case USER_NAME:
return getUserName();
- case GATEWAY_ID:
- return getGatewayId();
-
}
throw new IllegalStateException();
}
@@ -260517,8 +260358,6 @@ public class Airavata {
return isSetAuthzToken();
case USER_NAME:
return isSetUserName();
- case GATEWAY_ID:
- return isSetGatewayId();
}
throw new IllegalStateException();
}
@@ -260554,15 +260393,6 @@ public class Airavata {
return false;
}
- boolean this_present_gatewayId = true && this.isSetGatewayId();
- boolean that_present_gatewayId = true && that.isSetGatewayId();
- if (this_present_gatewayId || that_present_gatewayId) {
- if (!(this_present_gatewayId && that_present_gatewayId))
- return false;
- if (!this.gatewayId.equals(that.gatewayId))
- return false;
- }
-
return true;
}
@@ -260580,11 +260410,6 @@ public class Airavata {
if (present_userName)
list.add(userName);
- boolean present_gatewayId = true && (isSetGatewayId());
- list.add(present_gatewayId);
- if (present_gatewayId)
- list.add(gatewayId);
-
return list.hashCode();
}
@@ -260616,16 +260441,6 @@ public class Airavata {
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetGatewayId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
return 0;
}
@@ -260661,14 +260476,6 @@ public class Airavata {
sb.append(this.userName);
}
first = false;
- if (!first) sb.append(", ");
- sb.append("gatewayId:");
- if (this.gatewayId == null) {
- sb.append("null");
- } else {
- sb.append(this.gatewayId);
- }
- first = false;
sb.append(")");
return sb.toString();
}
@@ -260681,9 +260488,6 @@ public class Airavata {
if (userName == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' was not present! Struct: " + toString());
}
- if (gatewayId == null) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' was not present! Struct: " + toString());
- }
// check for sub-struct validity
if (authzToken != null) {
authzToken.validate();
@@ -260741,14 +260545,6 @@ public class Airavata {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // GATEWAY_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -260774,11 +260570,6 @@ public class Airavata {
oprot.writeString(struct.userName);
oprot.writeFieldEnd();
}
- if (struct.gatewayId != null) {
- oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
- oprot.writeString(struct.gatewayId);
- oprot.writeFieldEnd();
- }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -260798,7 +260589,6 @@ public class Airavata {
TTupleProtocol oprot = (TTupleProtocol) prot;
struct.authzToken.write(oprot);
oprot.writeString(struct.userName);
- oprot.writeString(struct.gatewayId);
}
@Override
@@ -260809,8 +260599,6 @@ public class Airavata {
struct.setAuthzTokenIsSet(true);
struct.userName = iprot.readString();
struct.setUserNameIsSet(true);
- struct.gatewayId = iprot.readString();
- struct.setGatewayIdIsSet(true);
}
}
[34/50] [abbrv] airavata git commit: UAB and NMSU Gateway Ansible
Scripts
Posted by ma...@apache.org.
UAB and NMSU Gateway Ansible Scripts
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fa868f54
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fa868f54
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fa868f54
Branch: refs/heads/master
Commit: fa868f5476e6bb520ba697ee035c2c18e8764a66
Parents: f43c761
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Jul 13 14:50:54 2017 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Jul 13 14:50:54 2017 -0500
----------------------------------------------------------------------
.../pga_config/newmexicostate/vars.yml | 61 ++++++++++++++++++++
.../pga_config/newmexicostate/vault.yml | 18 ++++++
.../scigap/production/pga_config/uab/vars.yml | 61 ++++++++++++++++++++
.../scigap/production/pga_config/uab/vault.yml | 18 ++++++
4 files changed, 158 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/fa868f54/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
new file mode 100644
index 0000000..52b38a9
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
@@ -0,0 +1,61 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "develop"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/new-mexico-state"
+vhost_servername: "nmsu.scigap.org"
+vhost_ssl: False
+# TODO: have Ansible manage these files as well
+#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/cert.pem"
+#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/fullchain.pem"
+#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/privkey.pem"
+
+## Keycloak related variables
+tenant_domain: "{{ gateway_id }}"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
+
+auth_options:
+ - name: "New Mexico State Science Gateway"
+ oauth_grant_type: "password"
+oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
+
+gateway_id: "new-mexico-state"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/new-mexico-state"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFSg9IEgsXlGhgPkj4hPuON30rbE3/gUUn4K3NVvBFKLyQQ8Pm/NR6dZmFglQR1HxBRSnq4WmH3EVyxHuT7MkQDAjTkclEuhaRjcYN0nua8g4dI9SgO9DeqbOyurVIuw/YChP5nC+6/ubMyzYPr6Z5xU5QHZI/QlVG4nz3joMIKkRXt/bsaEvv+/nzED/j6FTdK6P6dg1ESkNVZUPqhtWpwuC28Et7/86jcEObJedwx8geLoxKogPZ6kqO+Q/WUHDtMpFYtwuPaiYuN3Pb/GCvnDRsSoFmtRU+UH1UIdEy0piYUuBW+5aCv/PbH/UtHFg1Y1942TYCXv4rl1i/KW1z"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgg@iu.edu', 'dugasdvt@ad.nmsu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+#portal_theme: "gsu-gateway-theme"
+#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
+portal_title: "New Mexico State Science Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/fa868f54/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vault.yml
new file mode 100644
index 0000000..5d17cd8
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+64613132613630656638656166613930333366313665383361393130633164633231333932303838
+6438616530626438636131623839303839333366383737630a313238633630323935316330303735
+66373631393039313238633165393330633337393665343332373065666166643235636539303865
+3563653462633766300a626233373030646561613632306331346464666135383565343732363462
+33316635383534346634346137323433343239366662333762356534396233346665376666306638
+61336332636361333566366366326161636130306439656639316165353065363430666231333062
+39376563353862333262656235313763303636396235313661333564383437323531376332326161
+64616566373739666238303531393339643338633262316335396433626133353339643239343863
+36353965623739333833643335336662396164303866333832666166393836356663353331323261
+35653761663035373039653434653462363433323066323235616264346562643661373436393939
+38336134646334333166656136303132333065356633356664323066363031336333656532373931
+66633837633937323539643039356137366638346362323761343234343664386130393734333165
+37356139636664353534353665666535306365636165363830633236343535313138336435343736
+64343862303863666138303066626366623362313962363438376533613333353739633765326464
+36306337386138643036316237646236636633373163366238303763646663613533646139333464
+38373335373466313865663465663836396331633963613331656135653836313861333831343262
+3564
http://git-wip-us.apache.org/repos/asf/airavata/blob/fa868f54/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
new file mode 100644
index 0000000..c838723
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
@@ -0,0 +1,61 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "develop"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/alabama-birmingham"
+vhost_servername: "uab.scigap.org"
+vhost_ssl: False
+# TODO: have Ansible manage these files as well
+#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/cert.pem"
+#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/fullchain.pem"
+#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/privkey.pem"
+
+## Keycloak related variables
+tenant_domain: "{{ gateway_id }}"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
+
+auth_options:
+ - name: "The University of Alabama at Birmingham Science Gateway"
+ oauth_grant_type: "password"
+oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
+
+gateway_id: "alabama-birmingham"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/alabama-birmingham"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFSg9IEgsXlGhgPkj4hPuON30rbE3/gUUn4K3NVvBFKLyQQ8Pm/NR6dZmFglQR1HxBRSnq4WmH3EVyxHuT7MkQDAjTkclEuhaRjcYN0nua8g4dI9SgO9DeqbOyurVIuw/YChP5nC+6/ubMyzYPr6Z5xU5QHZI/QlVG4nz3joMIKkRXt/bsaEvv+/nzED/j6FTdK6P6dg1ESkNVZUPqhtWpwuC28Et7/86jcEObJedwx8geLoxKogPZ6kqO+Q/WUHDtMpFYtwuPaiYuN3Pb/GCvnDRsSoFmtRU+UH1UIdEy0piYUuBW+5aCv/PbH/UtHFg1Y1942TYCXv4rl1i/KW1z"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+#portal_theme: "gsu-gateway-theme"
+#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
+portal_title: "University of Alabama at Birmingham Science Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/fa868f54/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vault.yml
new file mode 100644
index 0000000..9774028
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+61613632623766383839336665333433343137356461613266656464333261366565653663386339
+3533613637626266663962646635326365313931386562360a356433353233323238666462366538
+61376332616662333733353961633165396437633533623364376161636661663535363839353236
+3434366337663666330a656531363033316264373335396663306264343138643839333766623339
+38626665613835666565393863633566396466653330373232363231613332306232396238386631
+37316433633339336437626636363762663938313938663737343564313430373736376665303461
+38666161656332306339613337373238626130626664636535383938623637373831333439616161
+63376234616135353834343064353238383161613731396162366532326665376636306462613331
+66346530613033383830353630333562303363353064633131343432306235343663313764363038
+37323762373766336466373239396235623130383165616462373831323735646165363764313439
+37623636383934383736393061353631316634303963333438616234636132356630326236623265
+63323635313432656534383034386334323734366430653437386333613037333031613264343238
+32373062356632633661653364623538383138353464373830353138396261626438623933316137
+33363933633535656636353738326432393461326632343039326264336534643031346236643930
+62386431306562656436376664626664626464326130316233313032376435396364663438353634
+66343832623935623631663965613739636135646539333332316566393030373434363463373932
+3963
[07/50] [abbrv] airavata git commit: Updating pga config for
Ultrascan, still on 0.17
Posted by ma...@apache.org.
Updating pga config for Ultrascan, still on 0.17
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cd34c55f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cd34c55f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cd34c55f
Branch: refs/heads/master
Commit: cd34c55f46e995cb91fb16867f73cac91fe4efc5
Parents: 217fa0f
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Jul 7 10:25:34 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Jul 7 10:25:34 2017 -0400
----------------------------------------------------------------------
.../production/files/pga_config_0.17.php.j2 | 256 +++++++++++++++++++
.../production/pga_config/ultrascan/vars.yml | 4 +-
dev-tools/ansible/roles/pga/defaults/main.yml | 1 +
dev-tools/ansible/roles/pga/tasks/main.yml | 2 +-
4 files changed, 261 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/cd34c55f/dev-tools/ansible/inventories/scigap/production/files/pga_config_0.17.php.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/files/pga_config_0.17.php.j2 b/dev-tools/ansible/inventories/scigap/production/files/pga_config_0.17.php.j2
new file mode 100644
index 0000000..af887be
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/files/pga_config_0.17.php.j2
@@ -0,0 +1,256 @@
+<?php
+return array(
+ /**
+ * *****************************************************************
+ * WSO2 Identity Server Related Configurations
+ * *****************************************************************
+ */
+
+ 'wsis' => [
+
+ /**
+ * Admin Role Name
+ */
+ 'admin-role-name' => '{{ admin_role_name }}',
+
+ /**
+ * Read only Admin Role Name
+ */
+ 'read-only-admin-role-name' => '{{ admin_readonly_role_name }}',
+
+ /**
+ * Gateway user role
+ */
+ 'user-role-name' => '{{ user_role_name }}',
+
+ /**
+ * Initial user role. This is the initial user role assigned to a new
+ * user. Set this to one of the three roles above to automatically
+ * grant new users that role, or set to some other role ('user-pending')
+ * to require admin approval before users have access.
+ */
+ 'initial-role-name' => '{{ initial_role_name }}',
+
+ /**
+ * Tenant Domain
+ */
+ 'tenant-domain' => '{{ tenant_domain }}',
+
+ /**
+ * Tenant admin's username
+ */
+ 'admin-username' => '{{ admin_username }}',
+
+ /**
+ * Tenant admin's password
+ */
+ 'admin-password' => '{{ admin_password }}',
+
+ /**
+ * OAuth client key
+ */
+ 'oauth-client-key' => '{{ oauth_client_key }}',
+
+ /**
+ * OAuth client secret
+ */
+ 'oauth-client-secret' => '{{ oauth_client_secret }}',
+
+ /**
+ * OAuth Grant Type (password or authorization_code)
+ */
+ 'oauth-grant-type' => 'password',
+
+ /**
+ * Identity server domain
+ */
+ 'server' => 'idp.scigap.org',
+
+ /**
+ * Identity server url
+ */
+ 'service-url' => 'https://idp.scigap.org:9443/',
+
+ /**
+ * Enable HTTPS server verification
+ */
+ 'verify-peer' => {{ auth_verify_peer }},
+
+ /**
+ * Path to the server certificate file
+ */
+ 'cafile-path' => app_path() . '/resources/security/idp_scigap_org.pem',
+
+ /**
+ * Allow self signed server certificates
+ */
+ 'allow-self-signed-cert' => false
+ ],
+
+
+ /**
+ * *****************************************************************
+ * Airavata Client Configurations
+ * *****************************************************************
+ */
+ 'airavata' => [
+
+ /**
+ * Airavata API server location. Use tls:// as the protocol to
+ * connect TLS enabled Airavata
+ */
+ 'airavata-server' => '{{ airavata_server }}',
+
+ /**
+ * Airavata API server port
+ */
+ 'airavata-port' => '{{ airavata_port }}',
+
+ /**
+ * Airavata API server thrift communication timeout
+ */
+ 'airavata-timeout' => '1000000',
+
+ /**
+ * PGA Gateway ID
+ */
+ 'gateway-id' => '{{ gateway_id }}',
+
+ /**
+ * Maximum size of a file which is allowed to upload to the server
+ */
+ 'server-allowed-file-size' => 64,
+
+ /**
+ * absolute path of the data dir
+ */
+ 'experiment-data-absolute-path' => '{{ experiment_data_dir }}',
+
+ /**
+ * Advanced experiments options
+ */
+ 'advanced-experiment-options' => '',
+
+ /**
+ * Default queue name
+ */
+ 'queue-name' => 'long',
+
+ /**
+ * Default node count
+ */
+ 'node-count' => '1',
+
+ /**
+ * Default total core count
+ */
+ 'total-cpu-count' => '16',
+
+ /**
+ * Default wall time limit
+ */
+ 'wall-time-limit' => '30',
+
+ /**
+ * Enable app-catalog cache
+ */
+ 'enable-app-catalog-cache' => true,
+
+ /**
+ * Life time of app catalog data cache in minutes
+ */
+ 'app-catalog-cache-duration' => 5,
+
+ /**
+ * Gateway data store resource id
+ */
+ 'gateway-data-store-resource-id' => '{{ gateway_data_store_resource_id }}',
+
+ /**
+ * Data Sharing enabled
+ */
+ 'data-sharing-enabled' => {{ data_sharing_enabled }}
+ ],
+
+ /**
+ * *****************************************************************
+ * Portal Related Configurations
+ * *****************************************************************
+ */
+ 'portal' => [
+ /**
+ * Whether this portal is the SciGaP admin portal
+ */
+ 'super-admin-portal' => {{ super_admin_portal }},
+
+ /**
+ * Set the name of theme in use here
+ */
+ 'theme' => '{{ portal_theme }}',
+
+ /**
+ * Portal title
+ */
+ 'portal-title' => '{{ portal_title }}',
+
+ /**
+ * Email address of the portal admin. Portal admin well get email notifications for events
+ * such as new user creation
+ */
+ 'admin-emails' => {{ admin_emails }},
+
+ /**
+ * Email account that the portal should login to send emails
+ */
+ 'portal-email-username' => '{{ portal_email_username }}',
+
+ /**
+ * Password for the portal's email account
+ */
+ 'portal-email-password' => '{{ portal_email_password }}',
+
+ /**
+ * SMTP server on which the portal should connect
+ */
+ 'portal-smtp-server-host' => 'smtp.gmail.com',
+
+ /**
+ * SMTP server port on which the portal should connect
+ */
+ 'portal-smtp-server-port' => '587',
+
+ /**
+ * Set JIRA Issue Collector scripts here.
+ */
+ 'jira-help' =>
+ [
+ /**
+ * Report Issue Script issued for your app by Atlassian JIRA
+ */
+ 'report-issue-script' => '',
+ /**
+ * Collector id at the end of the above script
+ */
+ 'report-issue-collector-id' => '',
+ /**
+ * Create Report Script issued for your app by Atlassian JIRA
+ */
+ 'request-feature-script' => '',
+ /**
+ * Collector id at the end of the above script
+ */
+ 'request-feature-collector-id' => ''
+ ],
+
+ /**
+ * Set Google Analytics Id here. ID format that generates from
+ * creating tracker object should be
+ *
+ * UA-XXXXX-Y
+ *
+ * for it to be working correctly. Currently it is only set for
+ * sending pageviews.
+ */
+ 'google-analytics-id' => ''
+ ]
+);
http://git-wip-us.apache.org/repos/asf/airavata/blob/cd34c55f/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
index 5b0c82f..a3886f6 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
@@ -27,6 +27,8 @@ airavata_port: "8930"
pga_repo: "https://git-wip-us.apache.org/repos/asf/airavata-php-gateway.git"
# Keep Ultrascan PGA on 0.17 until gw153 gets updated/migrated
git_branch: "branch-0.17"
+pga_config_template: "{{ inventory_dir }}/files/pga_config_0.17.php.j2"
+auth_verify_peer: "false"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/{{ gateway_id }}"
@@ -38,7 +40,7 @@ ssl_certificate_chain_file: "/etc/pki/tls/certs/ultrascan_scigap_org_interm.cer"
ssl_certificate_key_file: "/etc/pki/tls/private/ultrascan.scigap.key"
## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
+tenant_domain: "prod.ultrascan"
admin_username: "uslimsadmin"
admin_password: "{{ vault_admin_password }}"
oauth_client_key: "{{ vault_oauth_client_key }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/cd34c55f/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index 9635bfc..e7b91f8 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -44,6 +44,7 @@ httpd_log_dir:
pga_vhost_template: "pga-vhost.conf.j2"
pga_ssl_vhost_template: "pga-ssl-vhost.conf.j2"
+pga_config_template: "pga_config.php.j2"
## WSO2 IS related variables
tenant_domain: "prod.testdrive"
http://git-wip-us.apache.org/repos/asf/airavata/blob/cd34c55f/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index f13bc13..4eef7a7 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -97,7 +97,7 @@
# step 6: Change pga configurations
- name: Copy pga config file
- template: src=pga_config.php.j2 dest="{{ doc_root_dir }}/app/config/pga_config.php" owner="{{user}}" group="{{group}}"
+ template: src={{ pga_config_template }} dest="{{ doc_root_dir }}/app/config/pga_config.php" owner="{{user}}" group="{{group}}"
become: yes
- name: Checkout the portal theme (if a custom theme is defined)
[31/50] [abbrv] airavata git commit: Georgia Tech Ansible Script
Posted by ma...@apache.org.
Georgia Tech Ansible Script
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f43c7617
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f43c7617
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f43c7617
Branch: refs/heads/master
Commit: f43c761792b44562070258aa536c0d9859a56822
Parents: 632b76a
Author: Suresh Marru <sm...@apache.org>
Authored: Wed Jul 12 15:33:15 2017 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Wed Jul 12 15:33:15 2017 -0500
----------------------------------------------------------------------
.../inventories/scigap/production/pga_config/gatech/vars.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f43c7617/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
index 5ccb3e2..3e9bd16 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
@@ -33,7 +33,7 @@ vhost_ssl: False
## Keycloak related variables
tenant_domain: "{{ gateway_id }}"
-admin_username: "adminuser"
+admin_username: "admin"
admin_password: "{{ vault_admin_password }}"
oauth_client_key: "{{ vault_oauth_client_key }}"
oauth_client_secret: "{{ vault_oauth_client_secret }}"
@@ -44,7 +44,7 @@ auth_options:
oauth_grant_type: "password"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-gateway_id: "georgiastate"
+gateway_id: "georgia-tech"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/georgia-tech"
gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
[40/50] [abbrv] airavata git commit: fixing bug in sharing registry
Posted by ma...@apache.org.
fixing bug in sharing registry
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f386e38f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f386e38f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f386e38f
Branch: refs/heads/master
Commit: f386e38fc200f515cf48c62ace4207494d94e615
Parents: 7307b31
Author: scnakandala <su...@gmail.com>
Authored: Tue Jul 18 14:56:37 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Jul 18 14:56:37 2017 -0400
----------------------------------------------------------------------
.../sharing/registry/db/repositories/EntityRepository.java | 4 ++--
.../airavata/sharing/registry/SharingRegistryServiceTest.java | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f386e38f/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
index 6945f44..9b1bdbe 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
@@ -53,7 +53,7 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
groupIdString += groupId + "','";
groupIdString = groupIdString.substring(0, groupIdString.length()-2);
- String query = "SELECT E.* FROM ENTITY AS E INNER JOIN SHARING AS S ON (E.ENTITY_ID=S.ENTITY_ID AND E.DOMAIN_ID=S.DOMAIN_ID) WHERE " +
+ String query = "SELECT ENTITY.* FROM ENTITY WHERE ENTITY.ENTITY_ID IN (SELECT DISTINCT E.ENTITY_ID FROM ENTITY AS E INNER JOIN SHARING AS S ON (E.ENTITY_ID=S.ENTITY_ID AND E.DOMAIN_ID=S.DOMAIN_ID) WHERE " +
"E.DOMAIN_ID = '" + domainId + "' AND " + "S.GROUP_ID IN(" + groupIdString + ") AND ";
for(SearchCriteria searchCriteria : filters){
@@ -130,7 +130,7 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
}
query = query.substring(0, query.length() - 5);
- query += " ORDER BY E."+DBConstants.EntityTable.ORIGINAL_ENTITY_CREATION_TIME+" DESC";
+ query += ") ORDER BY ENTITY.CREATED_TIME DESC";
final String nativeQuery = query;
int newLimit = limit < 0 ? DBConstants.SELECT_MAX_ROWS: limit;
http://git-wip-us.apache.org/repos/asf/airavata/blob/f386e38f/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
index c0e0e03..21b8bf2 100644
--- a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
+++ b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
@@ -27,7 +27,6 @@ import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
-import org.databene.contiperf.PerfTest;
import org.databene.contiperf.junit.ContiPerfRule;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -54,7 +53,7 @@ public class SharingRegistryServiceTest {
@Test
- @PerfTest(invocations = 50, threads = 10)
+// @PerfTest(invocations = 50, threads = 10)
public void test() throws TException, InterruptedException {
String serverHost = "localhost";
int serverPort = 7878;
[44/50] [abbrv] airavata git commit: updating some of the group
management API methods in AiravataServerHandler
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
index 7357df3..4f3ac5e 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
@@ -2968,17 +2968,11 @@ class AiravataIf {
virtual bool shareResourceWithUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList) = 0;
virtual bool revokeSharingOfResourceFromUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const std::map<std::string, ::apache::airavata::model::group::ResourcePermissionType::type> & userPermissionList) = 0;
virtual void getAllAccessibleUsers(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType) = 0;
- virtual bool createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) = 0;
+ virtual void createGroup(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) = 0;
virtual bool updateGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) = 0;
- virtual bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId) = 0;
+ virtual bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId) = 0;
virtual void getGroup( ::apache::airavata::model::group::GroupModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId) = 0;
- virtual void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) = 0;
- virtual void addUserProfile(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile) = 0;
- virtual bool updateUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile) = 0;
- virtual void getUserProfileById( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) = 0;
- virtual bool deleteUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId) = 0;
- virtual void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit) = 0;
- virtual bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) = 0;
+ virtual void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName) = 0;
};
class AiravataIfFactory {
@@ -3557,45 +3551,23 @@ class AiravataNull : virtual public AiravataIf {
void getAllAccessibleUsers(std::vector<std::string> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* resourceId */, const ::apache::airavata::model::group::ResourceType::type /* resourceType */, const ::apache::airavata::model::group::ResourcePermissionType::type /* permissionType */) {
return;
}
- bool createGroup(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::group::GroupModel& /* groupModel */) {
- bool _return = false;
- return _return;
+ void createGroup(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::group::GroupModel& /* groupModel */) {
+ return;
}
bool updateGroup(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::group::GroupModel& /* groupModel */) {
bool _return = false;
return _return;
}
- bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* groupId */, const std::string& /* ownerId */, const std::string& /* gatewayId */) {
+ bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* groupId */, const std::string& /* ownerId */) {
bool _return = false;
return _return;
}
void getGroup( ::apache::airavata::model::group::GroupModel& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* groupId */) {
return;
}
- void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userName */, const std::string& /* gatewayId */) {
- return;
- }
- void addUserProfile(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::user::UserProfile& /* userProfile */) {
- return;
- }
- bool updateUserProfile(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const ::apache::airavata::model::user::UserProfile& /* userProfile */) {
- bool _return = false;
- return _return;
- }
- void getUserProfileById( ::apache::airavata::model::user::UserProfile& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userId */, const std::string& /* gatewayId */) {
- return;
- }
- bool deleteUserProfile(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userId */) {
- bool _return = false;
- return _return;
- }
- void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const int32_t /* offset */, const int32_t /* limit */) {
+ void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userName */) {
return;
}
- bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* userId */, const std::string& /* gatewayId */) {
- bool _return = false;
- return _return;
- }
};
@@ -26833,11 +26805,11 @@ class Airavata_createGroup_result {
Airavata_createGroup_result(const Airavata_createGroup_result&);
Airavata_createGroup_result& operator=(const Airavata_createGroup_result&);
- Airavata_createGroup_result() : success(0) {
+ Airavata_createGroup_result() : success() {
}
virtual ~Airavata_createGroup_result() throw();
- bool success;
+ std::string success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -26845,7 +26817,7 @@ class Airavata_createGroup_result {
_Airavata_createGroup_result__isset __isset;
- void __set_success(const bool val);
+ void __set_success(const std::string& val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -26894,7 +26866,7 @@ class Airavata_createGroup_presult {
virtual ~Airavata_createGroup_presult() throw();
- bool* success;
+ std::string* success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
@@ -27048,14 +27020,13 @@ class Airavata_deleteGroup_args {
Airavata_deleteGroup_args(const Airavata_deleteGroup_args&);
Airavata_deleteGroup_args& operator=(const Airavata_deleteGroup_args&);
- Airavata_deleteGroup_args() : groupId(), ownerId(), gatewayId() {
+ Airavata_deleteGroup_args() : groupId(), ownerId() {
}
virtual ~Airavata_deleteGroup_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string groupId;
std::string ownerId;
- std::string gatewayId;
void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
@@ -27063,8 +27034,6 @@ class Airavata_deleteGroup_args {
void __set_ownerId(const std::string& val);
- void __set_gatewayId(const std::string& val);
-
bool operator == (const Airavata_deleteGroup_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
@@ -27073,8 +27042,6 @@ class Airavata_deleteGroup_args {
return false;
if (!(ownerId == rhs.ownerId))
return false;
- if (!(gatewayId == rhs.gatewayId))
- return false;
return true;
}
bool operator != (const Airavata_deleteGroup_args &rhs) const {
@@ -27097,7 +27064,6 @@ class Airavata_deleteGroup_pargs {
const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* groupId;
const std::string* ownerId;
- const std::string* gatewayId;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -27332,28 +27298,23 @@ class Airavata_getAllGroupsUserBelongs_args {
Airavata_getAllGroupsUserBelongs_args(const Airavata_getAllGroupsUserBelongs_args&);
Airavata_getAllGroupsUserBelongs_args& operator=(const Airavata_getAllGroupsUserBelongs_args&);
- Airavata_getAllGroupsUserBelongs_args() : userName(), gatewayId() {
+ Airavata_getAllGroupsUserBelongs_args() : userName() {
}
virtual ~Airavata_getAllGroupsUserBelongs_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string userName;
- std::string gatewayId;
void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
void __set_userName(const std::string& val);
- void __set_gatewayId(const std::string& val);
-
bool operator == (const Airavata_getAllGroupsUserBelongs_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
if (!(userName == rhs.userName))
return false;
- if (!(gatewayId == rhs.gatewayId))
- return false;
return true;
}
bool operator != (const Airavata_getAllGroupsUserBelongs_args &rhs) const {
@@ -27375,7 +27336,6 @@ class Airavata_getAllGroupsUserBelongs_pargs {
virtual ~Airavata_getAllGroupsUserBelongs_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* userName;
- const std::string* gatewayId;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -27468,870 +27428,30 @@ class Airavata_getAllGroupsUserBelongs_presult {
};
-
-class Airavata_addUserProfile_args {
- public:
-
- Airavata_addUserProfile_args(const Airavata_addUserProfile_args&);
- Airavata_addUserProfile_args& operator=(const Airavata_addUserProfile_args&);
- Airavata_addUserProfile_args() {
- }
-
- virtual ~Airavata_addUserProfile_args() throw();
- ::apache::airavata::model::security::AuthzToken authzToken;
- ::apache::airavata::model::user::UserProfile userProfile;
-
- void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
-
- void __set_userProfile(const ::apache::airavata::model::user::UserProfile& val);
-
- bool operator == (const Airavata_addUserProfile_args & rhs) const
- {
- if (!(authzToken == rhs.authzToken))
- return false;
- if (!(userProfile == rhs.userProfile))
- return false;
- return true;
- }
- bool operator != (const Airavata_addUserProfile_args &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_addUserProfile_args & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class Airavata_addUserProfile_pargs {
- public:
-
-
- virtual ~Airavata_addUserProfile_pargs() throw();
- const ::apache::airavata::model::security::AuthzToken* authzToken;
- const ::apache::airavata::model::user::UserProfile* userProfile;
-
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_addUserProfile_result__isset {
- _Airavata_addUserProfile_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_addUserProfile_result__isset;
-
-class Airavata_addUserProfile_result {
+class AiravataClient : virtual public AiravataIf {
public:
-
- Airavata_addUserProfile_result(const Airavata_addUserProfile_result&);
- Airavata_addUserProfile_result& operator=(const Airavata_addUserProfile_result&);
- Airavata_addUserProfile_result() : success() {
- }
-
- virtual ~Airavata_addUserProfile_result() throw();
- std::string success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_addUserProfile_result__isset __isset;
-
- void __set_success(const std::string& val);
-
- void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
-
- void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
-
- void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
-
- void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
-
- bool operator == (const Airavata_addUserProfile_result & rhs) const
- {
- if (!(success == rhs.success))
- return false;
- if (!(ire == rhs.ire))
- return false;
- if (!(ace == rhs.ace))
- return false;
- if (!(ase == rhs.ase))
- return false;
- if (!(ae == rhs.ae))
- return false;
- return true;
- }
- bool operator != (const Airavata_addUserProfile_result &rhs) const {
- return !(*this == rhs);
+ AiravataClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
+ setProtocol(prot);
}
-
- bool operator < (const Airavata_addUserProfile_result & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_addUserProfile_presult__isset {
- _Airavata_addUserProfile_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_addUserProfile_presult__isset;
-
-class Airavata_addUserProfile_presult {
- public:
-
-
- virtual ~Airavata_addUserProfile_presult() throw();
- std::string* success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_addUserProfile_presult__isset __isset;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
-
-class Airavata_updateUserProfile_args {
- public:
-
- Airavata_updateUserProfile_args(const Airavata_updateUserProfile_args&);
- Airavata_updateUserProfile_args& operator=(const Airavata_updateUserProfile_args&);
- Airavata_updateUserProfile_args() {
+ AiravataClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
+ setProtocol(iprot,oprot);
}
-
- virtual ~Airavata_updateUserProfile_args() throw();
- ::apache::airavata::model::security::AuthzToken authzToken;
- ::apache::airavata::model::user::UserProfile userProfile;
-
- void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
-
- void __set_userProfile(const ::apache::airavata::model::user::UserProfile& val);
-
- bool operator == (const Airavata_updateUserProfile_args & rhs) const
- {
- if (!(authzToken == rhs.authzToken))
- return false;
- if (!(userProfile == rhs.userProfile))
- return false;
- return true;
+ private:
+ void setProtocol(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
+ setProtocol(prot,prot);
}
- bool operator != (const Airavata_updateUserProfile_args &rhs) const {
- return !(*this == rhs);
+ void setProtocol(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
+ piprot_=iprot;
+ poprot_=oprot;
+ iprot_ = iprot.get();
+ oprot_ = oprot.get();
}
-
- bool operator < (const Airavata_updateUserProfile_args & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class Airavata_updateUserProfile_pargs {
- public:
-
-
- virtual ~Airavata_updateUserProfile_pargs() throw();
- const ::apache::airavata::model::security::AuthzToken* authzToken;
- const ::apache::airavata::model::user::UserProfile* userProfile;
-
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_updateUserProfile_result__isset {
- _Airavata_updateUserProfile_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_updateUserProfile_result__isset;
-
-class Airavata_updateUserProfile_result {
public:
-
- Airavata_updateUserProfile_result(const Airavata_updateUserProfile_result&);
- Airavata_updateUserProfile_result& operator=(const Airavata_updateUserProfile_result&);
- Airavata_updateUserProfile_result() : success(0) {
- }
-
- virtual ~Airavata_updateUserProfile_result() throw();
- bool success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_updateUserProfile_result__isset __isset;
-
- void __set_success(const bool val);
-
- void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
-
- void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
-
- void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
-
- void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
-
- bool operator == (const Airavata_updateUserProfile_result & rhs) const
- {
- if (!(success == rhs.success))
- return false;
- if (!(ire == rhs.ire))
- return false;
- if (!(ace == rhs.ace))
- return false;
- if (!(ase == rhs.ase))
- return false;
- if (!(ae == rhs.ae))
- return false;
- return true;
+ boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
+ return piprot_;
}
- bool operator != (const Airavata_updateUserProfile_result &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_updateUserProfile_result & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_updateUserProfile_presult__isset {
- _Airavata_updateUserProfile_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_updateUserProfile_presult__isset;
-
-class Airavata_updateUserProfile_presult {
- public:
-
-
- virtual ~Airavata_updateUserProfile_presult() throw();
- bool* success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_updateUserProfile_presult__isset __isset;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
-
-class Airavata_getUserProfileById_args {
- public:
-
- Airavata_getUserProfileById_args(const Airavata_getUserProfileById_args&);
- Airavata_getUserProfileById_args& operator=(const Airavata_getUserProfileById_args&);
- Airavata_getUserProfileById_args() : userId(), gatewayId() {
- }
-
- virtual ~Airavata_getUserProfileById_args() throw();
- ::apache::airavata::model::security::AuthzToken authzToken;
- std::string userId;
- std::string gatewayId;
-
- void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
-
- void __set_userId(const std::string& val);
-
- void __set_gatewayId(const std::string& val);
-
- bool operator == (const Airavata_getUserProfileById_args & rhs) const
- {
- if (!(authzToken == rhs.authzToken))
- return false;
- if (!(userId == rhs.userId))
- return false;
- if (!(gatewayId == rhs.gatewayId))
- return false;
- return true;
- }
- bool operator != (const Airavata_getUserProfileById_args &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_getUserProfileById_args & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class Airavata_getUserProfileById_pargs {
- public:
-
-
- virtual ~Airavata_getUserProfileById_pargs() throw();
- const ::apache::airavata::model::security::AuthzToken* authzToken;
- const std::string* userId;
- const std::string* gatewayId;
-
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_getUserProfileById_result__isset {
- _Airavata_getUserProfileById_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_getUserProfileById_result__isset;
-
-class Airavata_getUserProfileById_result {
- public:
-
- Airavata_getUserProfileById_result(const Airavata_getUserProfileById_result&);
- Airavata_getUserProfileById_result& operator=(const Airavata_getUserProfileById_result&);
- Airavata_getUserProfileById_result() {
- }
-
- virtual ~Airavata_getUserProfileById_result() throw();
- ::apache::airavata::model::user::UserProfile success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_getUserProfileById_result__isset __isset;
-
- void __set_success(const ::apache::airavata::model::user::UserProfile& val);
-
- void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
-
- void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
-
- void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
-
- void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
-
- bool operator == (const Airavata_getUserProfileById_result & rhs) const
- {
- if (!(success == rhs.success))
- return false;
- if (!(ire == rhs.ire))
- return false;
- if (!(ace == rhs.ace))
- return false;
- if (!(ase == rhs.ase))
- return false;
- if (!(ae == rhs.ae))
- return false;
- return true;
- }
- bool operator != (const Airavata_getUserProfileById_result &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_getUserProfileById_result & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_getUserProfileById_presult__isset {
- _Airavata_getUserProfileById_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_getUserProfileById_presult__isset;
-
-class Airavata_getUserProfileById_presult {
- public:
-
-
- virtual ~Airavata_getUserProfileById_presult() throw();
- ::apache::airavata::model::user::UserProfile* success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_getUserProfileById_presult__isset __isset;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
-
-class Airavata_deleteUserProfile_args {
- public:
-
- Airavata_deleteUserProfile_args(const Airavata_deleteUserProfile_args&);
- Airavata_deleteUserProfile_args& operator=(const Airavata_deleteUserProfile_args&);
- Airavata_deleteUserProfile_args() : userId() {
- }
-
- virtual ~Airavata_deleteUserProfile_args() throw();
- ::apache::airavata::model::security::AuthzToken authzToken;
- std::string userId;
-
- void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
-
- void __set_userId(const std::string& val);
-
- bool operator == (const Airavata_deleteUserProfile_args & rhs) const
- {
- if (!(authzToken == rhs.authzToken))
- return false;
- if (!(userId == rhs.userId))
- return false;
- return true;
- }
- bool operator != (const Airavata_deleteUserProfile_args &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_deleteUserProfile_args & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class Airavata_deleteUserProfile_pargs {
- public:
-
-
- virtual ~Airavata_deleteUserProfile_pargs() throw();
- const ::apache::airavata::model::security::AuthzToken* authzToken;
- const std::string* userId;
-
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_deleteUserProfile_result__isset {
- _Airavata_deleteUserProfile_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_deleteUserProfile_result__isset;
-
-class Airavata_deleteUserProfile_result {
- public:
-
- Airavata_deleteUserProfile_result(const Airavata_deleteUserProfile_result&);
- Airavata_deleteUserProfile_result& operator=(const Airavata_deleteUserProfile_result&);
- Airavata_deleteUserProfile_result() : success(0) {
- }
-
- virtual ~Airavata_deleteUserProfile_result() throw();
- bool success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_deleteUserProfile_result__isset __isset;
-
- void __set_success(const bool val);
-
- void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
-
- void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
-
- void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
-
- void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
-
- bool operator == (const Airavata_deleteUserProfile_result & rhs) const
- {
- if (!(success == rhs.success))
- return false;
- if (!(ire == rhs.ire))
- return false;
- if (!(ace == rhs.ace))
- return false;
- if (!(ase == rhs.ase))
- return false;
- if (!(ae == rhs.ae))
- return false;
- return true;
- }
- bool operator != (const Airavata_deleteUserProfile_result &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_deleteUserProfile_result & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_deleteUserProfile_presult__isset {
- _Airavata_deleteUserProfile_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_deleteUserProfile_presult__isset;
-
-class Airavata_deleteUserProfile_presult {
- public:
-
-
- virtual ~Airavata_deleteUserProfile_presult() throw();
- bool* success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_deleteUserProfile_presult__isset __isset;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
-
-class Airavata_getAllUserProfilesInGateway_args {
- public:
-
- Airavata_getAllUserProfilesInGateway_args(const Airavata_getAllUserProfilesInGateway_args&);
- Airavata_getAllUserProfilesInGateway_args& operator=(const Airavata_getAllUserProfilesInGateway_args&);
- Airavata_getAllUserProfilesInGateway_args() : gatewayId(), offset(0), limit(0) {
- }
-
- virtual ~Airavata_getAllUserProfilesInGateway_args() throw();
- ::apache::airavata::model::security::AuthzToken authzToken;
- std::string gatewayId;
- int32_t offset;
- int32_t limit;
-
- void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
-
- void __set_gatewayId(const std::string& val);
-
- void __set_offset(const int32_t val);
-
- void __set_limit(const int32_t val);
-
- bool operator == (const Airavata_getAllUserProfilesInGateway_args & rhs) const
- {
- if (!(authzToken == rhs.authzToken))
- return false;
- if (!(gatewayId == rhs.gatewayId))
- return false;
- if (!(offset == rhs.offset))
- return false;
- if (!(limit == rhs.limit))
- return false;
- return true;
- }
- bool operator != (const Airavata_getAllUserProfilesInGateway_args &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_getAllUserProfilesInGateway_args & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class Airavata_getAllUserProfilesInGateway_pargs {
- public:
-
-
- virtual ~Airavata_getAllUserProfilesInGateway_pargs() throw();
- const ::apache::airavata::model::security::AuthzToken* authzToken;
- const std::string* gatewayId;
- const int32_t* offset;
- const int32_t* limit;
-
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_getAllUserProfilesInGateway_result__isset {
- _Airavata_getAllUserProfilesInGateway_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_getAllUserProfilesInGateway_result__isset;
-
-class Airavata_getAllUserProfilesInGateway_result {
- public:
-
- Airavata_getAllUserProfilesInGateway_result(const Airavata_getAllUserProfilesInGateway_result&);
- Airavata_getAllUserProfilesInGateway_result& operator=(const Airavata_getAllUserProfilesInGateway_result&);
- Airavata_getAllUserProfilesInGateway_result() {
- }
-
- virtual ~Airavata_getAllUserProfilesInGateway_result() throw();
- std::vector< ::apache::airavata::model::user::UserProfile> success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_getAllUserProfilesInGateway_result__isset __isset;
-
- void __set_success(const std::vector< ::apache::airavata::model::user::UserProfile> & val);
-
- void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
-
- void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
-
- void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
-
- void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
-
- bool operator == (const Airavata_getAllUserProfilesInGateway_result & rhs) const
- {
- if (!(success == rhs.success))
- return false;
- if (!(ire == rhs.ire))
- return false;
- if (!(ace == rhs.ace))
- return false;
- if (!(ase == rhs.ase))
- return false;
- if (!(ae == rhs.ae))
- return false;
- return true;
- }
- bool operator != (const Airavata_getAllUserProfilesInGateway_result &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_getAllUserProfilesInGateway_result & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_getAllUserProfilesInGateway_presult__isset {
- _Airavata_getAllUserProfilesInGateway_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_getAllUserProfilesInGateway_presult__isset;
-
-class Airavata_getAllUserProfilesInGateway_presult {
- public:
-
-
- virtual ~Airavata_getAllUserProfilesInGateway_presult() throw();
- std::vector< ::apache::airavata::model::user::UserProfile> * success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_getAllUserProfilesInGateway_presult__isset __isset;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
-
-class Airavata_doesUserProfileExist_args {
- public:
-
- Airavata_doesUserProfileExist_args(const Airavata_doesUserProfileExist_args&);
- Airavata_doesUserProfileExist_args& operator=(const Airavata_doesUserProfileExist_args&);
- Airavata_doesUserProfileExist_args() : userId(), gatewayId() {
- }
-
- virtual ~Airavata_doesUserProfileExist_args() throw();
- ::apache::airavata::model::security::AuthzToken authzToken;
- std::string userId;
- std::string gatewayId;
-
- void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
-
- void __set_userId(const std::string& val);
-
- void __set_gatewayId(const std::string& val);
-
- bool operator == (const Airavata_doesUserProfileExist_args & rhs) const
- {
- if (!(authzToken == rhs.authzToken))
- return false;
- if (!(userId == rhs.userId))
- return false;
- if (!(gatewayId == rhs.gatewayId))
- return false;
- return true;
- }
- bool operator != (const Airavata_doesUserProfileExist_args &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_doesUserProfileExist_args & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class Airavata_doesUserProfileExist_pargs {
- public:
-
-
- virtual ~Airavata_doesUserProfileExist_pargs() throw();
- const ::apache::airavata::model::security::AuthzToken* authzToken;
- const std::string* userId;
- const std::string* gatewayId;
-
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_doesUserProfileExist_result__isset {
- _Airavata_doesUserProfileExist_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_doesUserProfileExist_result__isset;
-
-class Airavata_doesUserProfileExist_result {
- public:
-
- Airavata_doesUserProfileExist_result(const Airavata_doesUserProfileExist_result&);
- Airavata_doesUserProfileExist_result& operator=(const Airavata_doesUserProfileExist_result&);
- Airavata_doesUserProfileExist_result() : success(0) {
- }
-
- virtual ~Airavata_doesUserProfileExist_result() throw();
- bool success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_doesUserProfileExist_result__isset __isset;
-
- void __set_success(const bool val);
-
- void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
-
- void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val);
-
- void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val);
-
- void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
-
- bool operator == (const Airavata_doesUserProfileExist_result & rhs) const
- {
- if (!(success == rhs.success))
- return false;
- if (!(ire == rhs.ire))
- return false;
- if (!(ace == rhs.ace))
- return false;
- if (!(ase == rhs.ase))
- return false;
- if (!(ae == rhs.ae))
- return false;
- return true;
- }
- bool operator != (const Airavata_doesUserProfileExist_result &rhs) const {
- return !(*this == rhs);
- }
-
- bool operator < (const Airavata_doesUserProfileExist_result & ) const;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _Airavata_doesUserProfileExist_presult__isset {
- _Airavata_doesUserProfileExist_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
- bool success :1;
- bool ire :1;
- bool ace :1;
- bool ase :1;
- bool ae :1;
-} _Airavata_doesUserProfileExist_presult__isset;
-
-class Airavata_doesUserProfileExist_presult {
- public:
-
-
- virtual ~Airavata_doesUserProfileExist_presult() throw();
- bool* success;
- ::apache::airavata::api::error::InvalidRequestException ire;
- ::apache::airavata::api::error::AiravataClientException ace;
- ::apache::airavata::api::error::AiravataSystemException ase;
- ::apache::airavata::api::error::AuthorizationException ae;
-
- _Airavata_doesUserProfileExist_presult__isset __isset;
-
- uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
-class AiravataClient : virtual public AiravataIf {
- public:
- AiravataClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
- setProtocol(prot);
- }
- AiravataClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
- setProtocol(iprot,oprot);
- }
- private:
- void setProtocol(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
- setProtocol(prot,prot);
- }
- void setProtocol(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
- piprot_=iprot;
- poprot_=oprot;
- iprot_ = iprot.get();
- oprot_ = oprot.get();
- }
- public:
- boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
- return piprot_;
- }
- boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
- return poprot_;
+ boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
+ return poprot_;
}
void getAPIVersion(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken);
void send_getAPIVersion(const ::apache::airavata::model::security::AuthzToken& authzToken);
@@ -28825,39 +27945,21 @@ class AiravataClient : virtual public AiravataIf {
void getAllAccessibleUsers(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType);
void send_getAllAccessibleUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType);
void recv_getAllAccessibleUsers(std::vector<std::string> & _return);
- bool createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel);
+ void createGroup(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel);
void send_createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel);
- bool recv_createGroup();
+ void recv_createGroup(std::string& _return);
bool updateGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel);
void send_updateGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel);
bool recv_updateGroup();
- bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId);
- void send_deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId);
+ bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId);
+ void send_deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId);
bool recv_deleteGroup();
void getGroup( ::apache::airavata::model::group::GroupModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId);
void send_getGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId);
void recv_getGroup( ::apache::airavata::model::group::GroupModel& _return);
- void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId);
- void send_getAllGroupsUserBelongs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId);
+ void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName);
+ void send_getAllGroupsUserBelongs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName);
void recv_getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return);
- void addUserProfile(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile);
- void send_addUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile);
- void recv_addUserProfile(std::string& _return);
- bool updateUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile);
- void send_updateUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile);
- bool recv_updateUserProfile();
- void getUserProfileById( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId);
- void send_getUserProfileById(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId);
- void recv_getUserProfileById( ::apache::airavata::model::user::UserProfile& _return);
- bool deleteUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId);
- void send_deleteUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId);
- bool recv_deleteUserProfile();
- void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit);
- void send_getAllUserProfilesInGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit);
- void recv_getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return);
- bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId);
- void send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId);
- bool recv_doesUserProfileExist();
protected:
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
@@ -29042,12 +28144,6 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
void process_deleteGroup(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getGroup(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getAllGroupsUserBelongs(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_addUserProfile(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_updateUserProfile(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_getUserProfileById(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_deleteUserProfile(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_getAllUserProfilesInGateway(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_doesUserProfileExist(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
public:
AiravataProcessor(boost::shared_ptr<AiravataIf> iface) :
iface_(iface) {
@@ -29220,12 +28316,6 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
processMap_["deleteGroup"] = &AiravataProcessor::process_deleteGroup;
processMap_["getGroup"] = &AiravataProcessor::process_getGroup;
processMap_["getAllGroupsUserBelongs"] = &AiravataProcessor::process_getAllGroupsUserBelongs;
- processMap_["addUserProfile"] = &AiravataProcessor::process_addUserProfile;
- processMap_["updateUserProfile"] = &AiravataProcessor::process_updateUserProfile;
- processMap_["getUserProfileById"] = &AiravataProcessor::process_getUserProfileById;
- processMap_["deleteUserProfile"] = &AiravataProcessor::process_deleteUserProfile;
- processMap_["getAllUserProfilesInGateway"] = &AiravataProcessor::process_getAllUserProfilesInGateway;
- processMap_["doesUserProfileExist"] = &AiravataProcessor::process_doesUserProfileExist;
}
virtual ~AiravataProcessor() {}
@@ -30829,13 +29919,14 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
- bool createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) {
+ void createGroup(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->createGroup(authzToken, groupModel);
+ ifaces_[i]->createGroup(_return, authzToken, groupModel);
}
- return ifaces_[i]->createGroup(authzToken, groupModel);
+ ifaces_[i]->createGroup(_return, authzToken, groupModel);
+ return;
}
bool updateGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) {
@@ -30847,13 +29938,13 @@ class AiravataMultiface : virtual public AiravataIf {
return ifaces_[i]->updateGroup(authzToken, groupModel);
}
- bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId) {
+ bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->deleteGroup(authzToken, groupId, ownerId, gatewayId);
+ ifaces_[i]->deleteGroup(authzToken, groupId, ownerId);
}
- return ifaces_[i]->deleteGroup(authzToken, groupId, ownerId, gatewayId);
+ return ifaces_[i]->deleteGroup(authzToken, groupId, ownerId);
}
void getGroup( ::apache::airavata::model::group::GroupModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId) {
@@ -30866,73 +29957,16 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
- void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) {
- size_t sz = ifaces_.size();
- size_t i = 0;
- for (; i < (sz - 1); ++i) {
- ifaces_[i]->getAllGroupsUserBelongs(_return, authzToken, userName, gatewayId);
- }
- ifaces_[i]->getAllGroupsUserBelongs(_return, authzToken, userName, gatewayId);
- return;
- }
-
- void addUserProfile(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile) {
+ void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->addUserProfile(_return, authzToken, userProfile);
+ ifaces_[i]->getAllGroupsUserBelongs(_return, authzToken, userName);
}
- ifaces_[i]->addUserProfile(_return, authzToken, userProfile);
+ ifaces_[i]->getAllGroupsUserBelongs(_return, authzToken, userName);
return;
}
- bool updateUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile) {
- size_t sz = ifaces_.size();
- size_t i = 0;
- for (; i < (sz - 1); ++i) {
- ifaces_[i]->updateUserProfile(authzToken, userProfile);
- }
- return ifaces_[i]->updateUserProfile(authzToken, userProfile);
- }
-
- void getUserProfileById( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) {
- size_t sz = ifaces_.size();
- size_t i = 0;
- for (; i < (sz - 1); ++i) {
- ifaces_[i]->getUserProfileById(_return, authzToken, userId, gatewayId);
- }
- ifaces_[i]->getUserProfileById(_return, authzToken, userId, gatewayId);
- return;
- }
-
- bool deleteUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId) {
- size_t sz = ifaces_.size();
- size_t i = 0;
- for (; i < (sz - 1); ++i) {
- ifaces_[i]->deleteUserProfile(authzToken, userId);
- }
- return ifaces_[i]->deleteUserProfile(authzToken, userId);
- }
-
- void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit) {
- size_t sz = ifaces_.size();
- size_t i = 0;
- for (; i < (sz - 1); ++i) {
- ifaces_[i]->getAllUserProfilesInGateway(_return, authzToken, gatewayId, offset, limit);
- }
- ifaces_[i]->getAllUserProfilesInGateway(_return, authzToken, gatewayId, offset, limit);
- return;
- }
-
- bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) {
- size_t sz = ifaces_.size();
- size_t i = 0;
- for (; i < (sz - 1); ++i) {
- ifaces_[i]->doesUserProfileExist(authzToken, userId, gatewayId);
- }
- return ifaces_[i]->doesUserProfileExist(authzToken, userId, gatewayId);
- }
-
};
// The 'concurrent' client is a thread safe client that correctly handles
@@ -31455,39 +30489,21 @@ class AiravataConcurrentClient : virtual public AiravataIf {
void getAllAccessibleUsers(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType);
int32_t send_getAllAccessibleUsers(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::group::ResourceType::type resourceType, const ::apache::airavata::model::group::ResourcePermissionType::type permissionType);
void recv_getAllAccessibleUsers(std::vector<std::string> & _return, const int32_t seqid);
- bool createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel);
+ void createGroup(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel);
int32_t send_createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel);
- bool recv_createGroup(const int32_t seqid);
+ void recv_createGroup(std::string& _return, const int32_t seqid);
bool updateGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel);
int32_t send_updateGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel);
bool recv_updateGroup(const int32_t seqid);
- bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId);
- int32_t send_deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId);
+ bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId);
+ int32_t send_deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId);
bool recv_deleteGroup(const int32_t seqid);
void getGroup( ::apache::airavata::model::group::GroupModel& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId);
int32_t send_getGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId);
void recv_getGroup( ::apache::airavata::model::group::GroupModel& _return, const int32_t seqid);
- void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId);
- int32_t send_getAllGroupsUserBelongs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId);
+ void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName);
+ int32_t send_getAllGroupsUserBelongs(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName);
void recv_getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const int32_t seqid);
- void addUserProfile(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile);
- int32_t send_addUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile);
- void recv_addUserProfile(std::string& _return, const int32_t seqid);
- bool updateUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile);
- int32_t send_updateUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile);
- bool recv_updateUserProfile(const int32_t seqid);
- void getUserProfileById( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId);
- int32_t send_getUserProfileById(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId);
- void recv_getUserProfileById( ::apache::airavata::model::user::UserProfile& _return, const int32_t seqid);
- bool deleteUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId);
- int32_t send_deleteUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId);
- bool recv_deleteUserProfile(const int32_t seqid);
- void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit);
- int32_t send_getAllUserProfilesInGateway(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit);
- void recv_getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const int32_t seqid);
- bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId);
- int32_t send_doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId);
- bool recv_doesUserProfileExist(const int32_t seqid);
protected:
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
index d0321c7..3cbc25f 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
@@ -3486,7 +3486,7 @@ class AiravataHandler : virtual public AiravataIf {
printf("getAllAccessibleUsers\n");
}
- bool createGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) {
+ void createGroup(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::group::GroupModel& groupModel) {
// Your implementation goes here
printf("createGroup\n");
}
@@ -3496,7 +3496,7 @@ class AiravataHandler : virtual public AiravataIf {
printf("updateGroup\n");
}
- bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId, const std::string& gatewayId) {
+ bool deleteGroup(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& groupId, const std::string& ownerId) {
// Your implementation goes here
printf("deleteGroup\n");
}
@@ -3506,41 +3506,11 @@ class AiravataHandler : virtual public AiravataIf {
printf("getGroup\n");
}
- void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName, const std::string& gatewayId) {
+ void getAllGroupsUserBelongs(std::vector< ::apache::airavata::model::group::GroupModel> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userName) {
// Your implementation goes here
printf("getAllGroupsUserBelongs\n");
}
- void addUserProfile(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile) {
- // Your implementation goes here
- printf("addUserProfile\n");
- }
-
- bool updateUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::user::UserProfile& userProfile) {
- // Your implementation goes here
- printf("updateUserProfile\n");
- }
-
- void getUserProfileById( ::apache::airavata::model::user::UserProfile& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) {
- // Your implementation goes here
- printf("getUserProfileById\n");
- }
-
- bool deleteUserProfile(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId) {
- // Your implementation goes here
- printf("deleteUserProfile\n");
- }
-
- void getAllUserProfilesInGateway(std::vector< ::apache::airavata::model::user::UserProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const int32_t offset, const int32_t limit) {
- // Your implementation goes here
- printf("getAllUserProfilesInGateway\n");
- }
-
- bool doesUserProfileExist(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& userId, const std::string& gatewayId) {
- // Your implementation goes here
- printf("doesUserProfileExist\n");
- }
-
};
int main(int argc, char **argv) {
[32/50] [abbrv] airavata git commit: Ansible: Georgia Tech ssh key
Posted by ma...@apache.org.
Ansible: Georgia Tech ssh key
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/461fdbbf
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/461fdbbf
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/461fdbbf
Branch: refs/heads/master
Commit: 461fdbbf62ed82be0496654aad70a011ab2f2783
Parents: f43c761
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Jul 12 16:27:25 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Jul 12 16:27:25 2017 -0500
----------------------------------------------------------------------
.../inventories/scigap/production/pga_config/gatech/vars.yml | 2 +-
dev-tools/ansible/pga-scigap-prod.yml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/461fdbbf/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
index 3e9bd16..ef31523 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
@@ -48,7 +48,7 @@ gateway_id: "georgia-tech"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/georgia-tech"
gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFSg9IEgsXlGhgPkj4hPuON30rbE3/gUUn4K3NVvBFKLyQQ8Pm/NR6dZmFglQR1HxBRSnq4WmH3EVyxHuT7MkQDAjTkclEuhaRjcYN0nua8g4dI9SgO9DeqbOyurVIuw/YChP5nC+6/ubMyzYPr6Z5xU5QHZI/QlVG4nz3joMIKkRXt/bsaEvv+/nzED/j6FTdK6P6dg1ESkNVZUPqhtWpwuC28Et7/86jcEObJedwx8geLoxKogPZ6kqO+Q/WUHDtMpFYtwuPaiYuN3Pb/GCvnDRsSoFmtRU+UH1UIdEy0piYUuBW+5aCv/PbH/UtHFg1Y1942TYCXv4rl1i/KW1z"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClwPzT95sK4eA5vuOHe+9cDewjkfBZA0GLt7SfHtJ5Zp/DBWRb5ykobX7JbwJGN9eHmVnW1yL5O708/dLL3y8kT0MjEP5jxZKMSayAiP9c2yN8dved4DIomX3omqsztIcbllei+QM9YvFY7tTtjWFTtAX6WxkZEvzcv2MDTLbgqJ537B4WRRWchXFws98QfDZvlfvdql6BcoZMwDCjdNOl8ZqSTS0PC22+HFesdhMh4mjjNj3Sm2MqxjU8FmSjVlC37dubqS9lZMeKuwsgT1nMjCB8tL+FH5eneNLVKvsvJL4AgQNo84YFi/Gels40zVuCqXVRNsAw/Tn+9sH9JgVx"
## Portal related variables
super_admin_portal: "false"
http://git-wip-us.apache.org/repos/asf/airavata/blob/461fdbbf/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index 441ad00..f5de405 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -21,6 +21,7 @@
---
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/accord"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/gatech"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
[09/50] [abbrv] airavata git commit: removing last commit: all owners
are treated as equal
Posted by ma...@apache.org.
removing last commit: all owners are treated as equal
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d49fcd72
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d49fcd72
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d49fcd72
Branch: refs/heads/master
Commit: d49fcd72e06c4ff26eacd4fd578042254093f7c3
Parents: 7af2047
Author: scnakandala <su...@gmail.com>
Authored: Fri Jul 7 12:38:14 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Jul 7 12:38:14 2017 -0400
----------------------------------------------------------------------
.../sharing/registry/db/repositories/UserRepository.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d49fcd72/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
index ee1f9b9..ea518ca 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
@@ -49,9 +49,9 @@ public class UserRepository extends AbstractRepository<User, UserEntity, UserPK>
query += "s." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId + "' AND ";
query += "s." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " = '" + permissionTypeId + "'";
-// if(permissionTypeId.equals((new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId))){
-// query += "AND s." + DBConstants.SharingTable.SHARING_TYPE + " LIKE 'DIRECT_%'";
-// }
+ if(permissionTypeId.equals((new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId))){
+ query += "AND s." + DBConstants.SharingTable.SHARING_TYPE + " LIKE 'DIRECT_%'";
+ }
query += " ORDER BY s.createdTime DESC";
return select(query, 0, -1);
[26/50] [abbrv] airavata git commit: Setting SSH keys for Accord,
Nano Shape gateway storage
Posted by ma...@apache.org.
Setting SSH keys for Accord, Nano Shape gateway storage
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/03d69180
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/03d69180
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/03d69180
Branch: refs/heads/master
Commit: 03d69180366d88fd59f87df0e1d12c27083f001e
Parents: 2aab0ea
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Jul 11 21:28:13 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Jul 11 21:28:13 2017 -0500
----------------------------------------------------------------------
.../inventories/scigap/production/pga_config/accord/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/nanoshape/vars.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/03d69180/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
index eea8032..cdae482 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
@@ -53,7 +53,7 @@ gateway_id: "virginaaccord"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/accord"
gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUF51b2cYYqqadLHL9M/oPY0ZHZlWbdOdaIgjpzIzMnO7M9hKrHVY2pqyLPvqCLzaunxITPWsTqw0E8hwub4ttGLAx/O4kIf+BgyZK7iuwXWhI7u85/o58IfrD4B+jVCYKRNayuLR+lJWsiOeS6HSlunpTKTEhFGeOHn2UzdbLfgWYQ3VUFDtKN1oDPDT78ml5c2RCibJ21jltpevVfEtCUctERpTfniWSuQZggP1qiLNa1+PfiJ3mGsEzJFDntQvQetdinaAbEaT7+sctS8nBNjapkmYMf6tBl3S0bLttYPH51f8lUQAFaAzrestO1JpJNnIeY01/S3MWIlAWASnn"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXi0HChWm8JB3dj2Spaz1uAsFWDjZE5NZ/GVQ9Wz++H2TSltoIAj/2lFiIMEwMXsJ4qs9vkHP/co0VHoEBVK7l8D/ZjWJ0imqrlsaagf3N9PowHMcC++VbjUFgdGgP8PYEZDOCNZY1gnokW5oMrxSTZCMgkYZf7Ldv3U+ngiQU1WQFeu2usGKXTLZ+FeIEGwElJKukaifm0jn6nE8osUtpwuhJvV9xZjRqoCZiMsruwyDO0b/fq0JpcUsz9CyYivjB5Y41qju1yYioxn579/o0iVMIwVXduN56Tb9mQ2+h2d8lkAR4Tm/bFGi/ADy46fKkMYkaABDIxDjhQRLGlrjH"
## Portal related variables
super_admin_portal: "false"
http://git-wip-us.apache.org/repos/asf/airavata/blob/03d69180/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
index 732f9fa..9bdc959 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
@@ -52,7 +52,7 @@ gateway_id: "nano-shape"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/nanoshape"
gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCIUqpKWHwawFHnbWvs6pie+fDA9NlqMZNvzil7e8FQz7543+FOzdTl/octACjGnSTwHewpyTe9sAUVcnq6VJ5XYtApR68zMasEzyCZUMWhMqEuxopRZcUGDJVcq5hD4RZcer3aMPWSVmXVCNJeT4EsB52Zp2DfDVgfaOOfY8Ga4mcR2IdOyizV8HWXTH6vWFK+dD1GoPY0ECikwlsF1QA0vzqAcb1NYOTc70hZ9Pb0/78XF790joZ80hRsHGIc7IfncoLgRUkKSkMaoXbfy/tbqf76V0ZxaQOgayaLGF19oBlREO6ZQ3rDCOWgVJC32dCwAsaL9qWd0IZrprUEUQOd"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdnkbcATgISewsDfUJaDwsQSswt7cWM//ONfTLhxlvFHe1NFdVk65of/tOwXIjp+037tpMMv8Pi3bc4OUmdlv3P9tPOBoDNoOb+CUpJ/6skEkiH+zgO+zLetVHLIS/UdgcSL7xdbj5RfoT13ksyRvdVYLGLq2S1t7p0s//FKcw7qdw/S2N3YiCQPpHq45C/r4GTHzRaIksiE2WnsuRbk0CmazIQDXwedFadJCUqM4SrFOdxGos9b++d1yS+I9GrVya/xDRtpDzWCpUrNPJc0BzRp1qIkUnmh52uApKyfJX82gMbAn62xmTZytdgk6BA3Za96lVvjJQ4CsD2wpS7qpp"
## Portal related variables
super_admin_portal: "false"
[02/50] [abbrv] airavata git commit: [AIRAVATA-2421] Clear the
EntityManager cache
Posted by ma...@apache.org.
[AIRAVATA-2421] Clear the EntityManager cache
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d3bc3b6e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d3bc3b6e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d3bc3b6e
Branch: refs/heads/master
Commit: d3bc3b6e2613c2395a949817e6a4d5df51ce8da1
Parents: f1f3712
Author: Gourav Shenoy <go...@apache.org>
Authored: Thu Jul 6 14:01:01 2017 -0400
Committer: Gourav Shenoy <go...@apache.org>
Committed: Thu Jul 6 14:01:01 2017 -0400
----------------------------------------------------------------------
.../registry/core/app/catalog/util/AppCatalogJPAUtils.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d3bc3b6e/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
index 01f9bbc..099c088 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
@@ -73,6 +73,10 @@ public class AppCatalogJPAUtils {
factory.getCache().evictAll();
}
appCatEntityManager = factory.createEntityManager();
+ // clear the entitymanager cache
+ if (appCatEntityManager != null) {
+ appCatEntityManager.clear();
+ }
return appCatEntityManager;
}
[05/50] [abbrv] airavata git commit: Production scigap url updates,
pga configs
Posted by ma...@apache.org.
Production scigap url updates, pga configs
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f169bb10
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f169bb10
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f169bb10
Branch: refs/heads/master
Commit: f169bb1068b0763468203cda5043104be960f3b3
Parents: ee6e3da
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Jul 6 18:12:08 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Jul 6 18:12:08 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/dreg-production/hosts | 10 +++++-----
.../ansible/inventories/scigap/production/hosts | 3 ++-
.../production/pga_config/brandeis/vars.yml | 2 +-
.../production/pga_config/georgiastate/vars.yml | 2 +-
.../production/pga_config/iugateway/vars.yml | 2 +-
.../scigap/production/pga_config/lsu/vars.yml | 2 +-
.../pga_config/nanoconfinement/vars.yml | 2 +-
.../scigap/production/pga_config/nsg/vars.yml | 2 +-
.../production/pga_config/oiitandy/vars.yml | 2 +-
.../scigap/production/pga_config/oscer/vars.yml | 2 +-
.../scigap/production/pga_config/phasta/vars.yml | 2 +-
.../scigap/production/pga_config/scigap/vars.yml | 16 ++++++++--------
.../scigap/production/pga_config/seagrid/vars.yml | 18 +++++++++---------
.../production/pga_config/simvascular/vars.yml | 2 +-
.../production/pga_config/southdakota/vars.yml | 2 +-
.../pga_config/southernillinois/vars.yml | 2 +-
.../production/pga_config/testdrive/vars.yml | 18 +++++++++---------
17 files changed, 45 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/dreg-production/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/dreg-production/hosts b/dev-tools/ansible/inventories/scigap/dreg-production/hosts
index bbfc7c9..858c50f 100644
--- a/dev-tools/ansible/inventories/scigap/dreg-production/hosts
+++ b/dev-tools/ansible/inventories/scigap/dreg-production/hosts
@@ -2,19 +2,19 @@
# inventory file : scigap production deployment
[zookeeper]
-gf5.ucs.indiana.edu
+scigap02.sciencegateways.iu.edu
[rabbitmq]
-gf5.ucs.indiana.edu
+scigap02.sciencegateways.iu.edu
[database]
-gf3.ucs.indiana.edu
+scigap01.sciencegateways.iu.edu
[api-orch]
-gf5.ucs.indiana.edu
+scigap02.sciencegateways.iu.edu
[gfac]
-gf6.ucs.indiana.edu
+scigap03.sciencegateways.iu.edu
[pga]
# Hosted on Jetstream
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/hosts b/dev-tools/ansible/inventories/scigap/production/hosts
index baceb63..2070472 100644
--- a/dev-tools/ansible/inventories/scigap/production/hosts
+++ b/dev-tools/ansible/inventories/scigap/production/hosts
@@ -17,7 +17,8 @@ scigap02.sciencegateways.iu.edu
scigap03.sciencegateways.iu.edu
[pga]
-scigap04.sciencegateways.iu.edu
+#scigap04.sciencegateways.iu.edu
+gf4.ucs.indiana.edu
[keycloak]
gf7.ucs.indiana.edu
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
index 1d2b909..50663dc 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/brandeis"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
index 161302e..1e37084 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/georgia-state"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
index c63e223..127bf76 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/iugateway"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
index d7bd5fb..ddc44e0 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/lsu"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
index 865ebe4..f7e7eec 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/nanoconfinement"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
index b4d5d0d..297c1fc 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/nsg"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
index 65a6cb1..5c27e53 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/oii-tandy"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
index 4db87ad..8d5ebf7 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/oscer"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
index 6a15508..b332339 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/phasta"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
index ca65ac7..4141adc 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
@@ -24,16 +24,16 @@ git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/scigap"
-#vhost_servername: "scigap.org"
-vhost_servername: "beta.scigap.org"
+vhost_servername: "scigap.org"
+#vhost_servername: "beta.scigap.org"
vhost_ssl: True
# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/pki/tls/certs/scigap_org_cert.cer"
-#ssl_certificate_chain_file: "/etc/pki/tls/certs/scigap_org_interm.cer"
-#ssl_certificate_key_file: "/etc/pki/tls/private/scigap.key"
-ssl_certificate_file: "/etc/letsencrypt/live/beta.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/beta.scigap.org/privkey.pem"
+ssl_certificate_file: "/etc/pki/tls/certs/scigap_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/scigap_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/scigap.key"
+#ssl_certificate_file: "/etc/letsencrypt/live/beta.scigap.org/cert.pem"
+#ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.scigap.org/fullchain.pem"
+#ssl_certificate_key_file: "/etc/letsencrypt/live/beta.scigap.org/privkey.pem"
## Keycloak related variables
tenant_domain: "{{ gateway_id }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
index 991f1df..15abca3 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
@@ -24,17 +24,17 @@ git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-#vhost_servername: "seagrid.org"
-#vhost_serveralias: "www.seagrid.org"
-vhost_servername: "beta.seagrid.org"
+vhost_servername: "seagrid.org"
+vhost_serveralias: "www.seagrid.org"
+#vhost_servername: "beta.seagrid.org"
vhost_ssl: True
# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/pki/tls/certs/seagrid_org_cert.cer"
-#ssl_certificate_chain_file: "/etc/pki/tls/certs/seagrid_org_interm.cer"
-#ssl_certificate_key_file: "/etc/pki/tls/private/portal.seagrid.key"
-ssl_certificate_file: "/etc/letsencrypt/live/beta.seagrid.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.seagrid.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/beta.seagrid.org/privkey.pem"
+ssl_certificate_file: "/etc/pki/tls/certs/seagrid_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/seagrid_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/portal.seagrid.key"
+#ssl_certificate_file: "/etc/letsencrypt/live/beta.seagrid.org/cert.pem"
+#ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.seagrid.org/fullchain.pem"
+#ssl_certificate_key_file: "/etc/letsencrypt/live/beta.seagrid.org/privkey.pem"
## Keycloak related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
index 16fd82a..a15daa8 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/simvascular"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
index 1b30bf1..b9cbed9 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/southdakota"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
index 0c49e40..364f624 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/southernillinois"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f169bb10/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
index 89f661b..7f91482 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
@@ -24,17 +24,17 @@ git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/testdrive"
-#vhost_servername: "testdrive.airavata.org"
-#vhost_serveralias: "www.testdrive.airavata.org"
-vhost_servername: "beta.testdrive.airavata.org"
+vhost_servername: "testdrive.airavata.org"
+vhost_serveralias: "www.testdrive.airavata.org"
+#vhost_servername: "beta.testdrive.airavata.org"
vhost_ssl: True
# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/pki/tls/certs/testdrive_airavata_org_cert.cer"
-#ssl_certificate_chain_file: "/etc/pki/tls/certs/testdrive_airavata_org_interm.cer"
-#ssl_certificate_key_file: "/etc/pki/tls/private/testdrive-airavata.key"
-ssl_certificate_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/privkey.pem"
+ssl_certificate_file: "/etc/pki/tls/certs/testdrive_airavata_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/testdrive_airavata_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/testdrive-airavata.key"
+#ssl_certificate_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/cert.pem"
+#ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/fullchain.pem"
+#ssl_certificate_key_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/privkey.pem"
## Keycloak related variables
tenant_domain: "{{ gateway_id }}"
[23/50] [abbrv] airavata git commit: May not get Gateway CREATE event
so add DOMAIN on UPDATE if not exists
Posted by ma...@apache.org.
May not get Gateway CREATE event so add DOMAIN on UPDATE if not exists
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/14633418
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/14633418
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/14633418
Branch: refs/heads/master
Commit: 14633418a45d80a793fa05d6c381b4ae7e386adc
Parents: 33a601f
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Jul 11 18:02:44 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Jul 11 18:02:44 2017 -0500
----------------------------------------------------------------------
.../registry/messaging/SharingServiceDBEventHandler.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/14633418/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java
index 2a28b8d..29f4ee0 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java
@@ -28,7 +28,6 @@ import org.apache.airavata.messaging.core.MessageContext;
import org.apache.airavata.messaging.core.MessageHandler;
import org.apache.airavata.model.dbevent.DBEventMessage;
import org.apache.airavata.model.dbevent.DBEventMessageContext;
-import org.apache.airavata.model.dbevent.EntityType;
import org.apache.airavata.model.error.DuplicateEntryException;
import org.apache.airavata.model.user.UserProfile;
import org.apache.airavata.model.workspace.Gateway;
@@ -127,6 +126,12 @@ public class SharingServiceDBEventHandler implements MessageHandler {
switch (dBEventMessageContext.getPublisher().getPublisherContext().getCrudType()){
case CREATE:
+ case UPDATE:
+
+ // Only create the domain is it doesn't already exist
+ if (sharingRegistryClient.isDomainExists(gateway.getGatewayId())){
+ break;
+ }
/*
Following set of DB operations should happen in a transaction
As these are thrift calls we cannot enforce this restriction
[37/50] [abbrv] airavata git commit: orderby clause in experiment
search
Posted by ma...@apache.org.
orderby clause in experiment search
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fe6e9a25
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fe6e9a25
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fe6e9a25
Branch: refs/heads/master
Commit: fe6e9a25763db27c5cc5f780848a0c6993df7627
Parents: 704ba66
Author: scnakandala <su...@gmail.com>
Authored: Tue Jul 18 13:43:23 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Jul 18 13:43:23 2017 -0400
----------------------------------------------------------------------
.../sharing/registry/db/repositories/EntityRepository.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/fe6e9a25/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
index b65481d..ecc5270 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
@@ -130,6 +130,8 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
}
query = query.substring(0, query.length() - 5);
+ query += " ORDER BY p."+DBConstants.EntityTable.ORIGINAL_ENTITY_CREATION_TIME+" DESC";
+
final String nativeQuery = query;
int newLimit = limit < 0 ? DBConstants.SELECT_MAX_ROWS: limit;
[48/50] [abbrv] airavata git commit: PICKSC PGA scripts
Posted by ma...@apache.org.
PICKSC PGA scripts
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d49f2527
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d49f2527
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d49f2527
Branch: refs/heads/master
Commit: d49f25271cdbcfc3f8d8c311d6f9c10ea9c346fc
Parents: 1f35ede
Author: Eroma Abeysinghe <er...@gmail.com>
Authored: Thu Jul 27 16:55:48 2017 -0400
Committer: Eroma Abeysinghe <er...@gmail.com>
Committed: Thu Jul 27 16:56:48 2017 -0400
----------------------------------------------------------------------
.../PICKSC-Production/group_vars/pga/vars.yml | 75 ++++++++++++++++++++
.../PICKSC-Production/group_vars/pga/vault.yml | 18 +++++
.../inventories/scigap/PICKSC-Production/hosts | 21 ++++++
3 files changed, 114 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d49f2527/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml
new file mode 100644
index 0000000..14188e4
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml
@@ -0,0 +1,75 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+---
+
+user_data_dir: "/var/www/portals/gateway-user-data"
+real_user_data_dir: "/data/gateway-user-data"
+## Airavata Client related variables
+airavata_server: "tls://{{ groups['api-orch'][0] }}"
+airavata_port: "9930"
+# FIXME: temporarily turn off SSL verification for WSO2 IS. Needed for WSO2 IS
+# auth_verify_peer: "false" Needed for WSO2 IS
+
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "develop"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/{{ gateway_id }}"
+vhost_servername: "picksc.scigap.org"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/picksc.scigap.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/picksc.scigap.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/picksc.scigap.org/privkey.pem"
+# pga_ssl_vhost_template: "{{ inventory_dir }}/files/pga-ssl-vhost.conf.j2" this is for dreg.
+airavata_profile_service_server: "{{ groups['api-orch'][0] }}"
+
+## WSO2 IS related variables
+tenant_domain: "{{ gateway_id }}"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+# dREG gateway automatically gives users the gateway-user role so they don't have to wait on admin approval
+# initial_role_name: "gateway-user"
+oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
+
+#Auth Options for Gateway
+auth_options:
+ - name: "picksc"
+ oauth_grant_type: "password"
+oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
+
+gateway_id: "picksc"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/picksc"
+gateway_data_store_resource_id: "js-157-100.jetstream-cloud.org_0a582f82-8fc6-4322-89b1-d106c7f2e935"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCZG7vihDK2fU8RwRGYolfEufjYXNI36raZylemGZIJgSaL02DhVLn9bQ6mG1MhDVf/xXwg9aZwEyyEz2H14SLYVeweGQzObk5TtWAoSVgl5sqXJegbEXcov4B0CCdKvboUUV7rBSIvy23voDTPG/3Qmc1IUsK5lA3Otr94eh1/1k4eMk5zuAF+UzK6xOFBdfvIOpeYJqlAZIb6WEx4jMY5vgyQMiGQAS1YeZbUMw6EluOIV/5UTJ2WvYJSxSpZNA6RnN6GbAKlbQiXAbfwE6Xo4Oh5yYldfum8LeTyMhfku11r1Jy3QWwGUSpNUWnFh/jmF/2lWyb3nIE+6ZNKLg2n"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgrc-iu-group@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+# The portal theme is included in the dreg-gateway branch of airavata-php-gateway
+portal_theme: "base"
+portal_title: "PICKSC Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/d49f2527/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vault.yml b/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vault.yml
new file mode 100644
index 0000000..95c8a4e
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+32653935313165306433636538646163316531656233336265313138323234323932326562363036
+3631643265396436313332336238666539373633343865300a363362636535363166646238313933
+66306162333434666631326138623332356664663131303934323361663435643938323063333764
+3731343862653834610a323261313061306662333730363762633833363235346637376432373637
+33333530623433666461666364333264336163616131653931316536643836373432613363386431
+61393131386533623630646361376630663137303435316639636465643937633365333933313865
+36623663326530636532373833363965313164386437356363396632646335643136616539373437
+65613066333636323866326363333638653630393736643065366661656133626563363331656430
+66386130653730356638313065363632396130333636313437393239363237386535343231303666
+33626564383433623331366633373563383338623061386163333032326438386133303166663665
+34343830363537393665323932303230646164656233636531333762346430376165393339346236
+30643163373230306463383238613765383139343638393837363263343237663966323963336664
+63336361346536656334323730396366653531306361636338323032313434396136303135666636
+64666639613934376366326564396663303962386164386437643962336161316333613437346261
+65333938633839373665393538316538313735616336613039306466313732383238363765663261
+39643738336633353332383635653930323861646563376336636331643838623430373936313931
+3333
http://git-wip-us.apache.org/repos/asf/airavata/blob/d49f2527/dev-tools/ansible/inventories/scigap/PICKSC-Production/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/PICKSC-Production/hosts b/dev-tools/ansible/inventories/scigap/PICKSC-Production/hosts
new file mode 100644
index 0000000..cbde396
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/PICKSC-Production/hosts
@@ -0,0 +1,21 @@
+---
+# inventory file : scigap production deployment
+
+[zookeeper]
+scigap02.sciencegateways.iu.edu
+
+[rabbitmq]
+scigap02.sciencegateways.iu.edu
+
+[database]
+scigap01.sciencegateways.iu.edu
+
+[api-orch]
+scigap02.sciencegateways.iu.edu
+
+[gfac]
+scigap03.sciencegateways.iu.edu
+
+[pga]
+# Hosted on Jetstream
+149.165.157.100 ansible_user=centos
[39/50] [abbrv] airavata git commit: orderby clause in experiment
search
Posted by ma...@apache.org.
orderby clause in experiment search
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7307b317
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7307b317
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7307b317
Branch: refs/heads/master
Commit: 7307b317a04faf0f375c8eb64b3d0514bd1ba8ff
Parents: edd1dbb
Author: scnakandala <su...@gmail.com>
Authored: Tue Jul 18 13:44:09 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Jul 18 13:44:09 2017 -0400
----------------------------------------------------------------------
.../sharing/registry/db/repositories/EntityRepository.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7307b317/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
index ecc5270..6945f44 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
@@ -130,7 +130,7 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
}
query = query.substring(0, query.length() - 5);
- query += " ORDER BY p."+DBConstants.EntityTable.ORIGINAL_ENTITY_CREATION_TIME+" DESC";
+ query += " ORDER BY E."+DBConstants.EntityTable.ORIGINAL_ENTITY_CREATION_TIME+" DESC";
final String nativeQuery = query;
int newLimit = limit < 0 ? DBConstants.SELECT_MAX_ROWS: limit;
[29/50] [abbrv] airavata git commit: Georgia Tech Ansible Script
Posted by ma...@apache.org.
Georgia Tech Ansible Script
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/75edff6f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/75edff6f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/75edff6f
Branch: refs/heads/master
Commit: 75edff6f68a511f78fa97fffc598fecee93e6052
Parents: d03c724
Author: Suresh Marru <sm...@apache.org>
Authored: Wed Jul 12 15:29:47 2017 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Wed Jul 12 15:29:47 2017 -0500
----------------------------------------------------------------------
.../production/pga_config/gatech/vars.yml | 61 ++++++++++++++++++++
.../production/pga_config/gatech/vault.yml | 18 ++++++
2 files changed, 79 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/75edff6f/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
new file mode 100644
index 0000000..5ccb3e2
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
@@ -0,0 +1,61 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "develop"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/georgia-tech"
+vhost_servername: "gatech.scigap.org"
+vhost_ssl: False
+# TODO: have Ansible manage these files as well
+#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/cert.pem"
+#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/fullchain.pem"
+#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/privkey.pem"
+
+## Keycloak related variables
+tenant_domain: "{{ gateway_id }}"
+admin_username: "adminuser"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
+
+auth_options:
+ - name: "Georgia Tech Science Gateway"
+ oauth_grant_type: "password"
+oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
+
+gateway_id: "georgiastate"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/georgia-tech"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFSg9IEgsXlGhgPkj4hPuON30rbE3/gUUn4K3NVvBFKLyQQ8Pm/NR6dZmFglQR1HxBRSnq4WmH3EVyxHuT7MkQDAjTkclEuhaRjcYN0nua8g4dI9SgO9DeqbOyurVIuw/YChP5nC+6/ubMyzYPr6Z5xU5QHZI/QlVG4nz3joMIKkRXt/bsaEvv+/nzED/j6FTdK6P6dg1ESkNVZUPqhtWpwuC28Et7/86jcEObJedwx8geLoxKogPZ6kqO+Q/WUHDtMpFYtwuPaiYuN3Pb/GCvnDRsSoFmtRU+UH1UIdEy0piYUuBW+5aCv/PbH/UtHFg1Y1942TYCXv4rl1i/KW1z"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgg@iu.edu', 'fang.liu@gatech.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+#portal_theme: "gsu-gateway-theme"
+#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
+portal_title: "Georgia Tech Science Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/75edff6f/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vault.yml
new file mode 100644
index 0000000..a35b80f
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+34323339333637343366613565366164626566366334646334396464353935326438373335383138
+3735616634653230613065616235316533373266376636610a326639346137373932663932643036
+35333631303936663231303166653335313433623136346632356362343234336437343466366365
+3231613235323933310a356337303036346430323932626635353164336264366361333161363466
+61373633303131656462333766356334333839613939333439613930353235643566383437366338
+64366239616331366263323234393361303366393537396434333337393763383534333538633331
+61643262656636353434363134333435626166396138396261373033323131323962363963323933
+30613337646438616439356230333034326666396438353663326566336432373738346334376162
+38313466363036613131346330393234636139363136313539333237346562366136616336396236
+62363164383336363265303438316234333439336439323034616130336236316531613062323038
+38616163616236616333383063356132616533366439313530646636626664633638363765393962
+66376639343066353931633234333835326361646262393763343933386166383936653438313161
+39613630373065616439333863366262396633316263303963393265333936303333366236613161
+35326532646434353339333439303966613039333331323433653566303566333866376531646531
+38633339333033613965653434613537656432373834663464643666343934663365666662623363
+37343835356163613033303735333263616163303861363736663261373636386239303032383663
+3664
[28/50] [abbrv] airavata git commit: Putting Utah PGA on develop
branch for Keycloak/CILogon integration
Posted by ma...@apache.org.
Putting Utah PGA on develop branch for Keycloak/CILogon integration
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1492fdca
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1492fdca
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1492fdca
Branch: refs/heads/master
Commit: 1492fdcab47a4e8634ff0f2c7b17969e71905dd7
Parents: c8ee09c
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Jul 12 14:04:09 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Jul 12 14:04:09 2017 -0500
----------------------------------------------------------------------
.../ansible/inventories/scigap/production/pga_config/utah/vars.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/1492fdca/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
index eb2bad8..a93f8c9 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/utah-university"
[17/50] [abbrv] airavata git commit: AIRAVATA-2405 loading all users
in batches
Posted by ma...@apache.org.
AIRAVATA-2405 loading all users in batches
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5d4d1057
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5d4d1057
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5d4d1057
Branch: refs/heads/master
Commit: 5d4d1057c70406ac03cb09aef706cd7020315eed
Parents: 86713ee
Author: Marcus Christie <ma...@apache.org>
Authored: Sun Jul 9 01:04:38 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Sun Jul 9 01:04:38 2017 -0500
----------------------------------------------------------------------
.../core/impl/TenantManagementKeycloakImpl.java | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5d4d1057/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
----------------------------------------------------------------------
diff --git a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
index 97039ed..e3ac6a3 100644
--- a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
+++ b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
@@ -535,12 +535,20 @@ public class TenantManagementKeycloakImpl implements TenantManagementInterface {
try{
client = TenantManagementKeycloakImpl.getClient(ServerSettings.getIamServerUrl(), tenantId, realmAdminCreds);
// FIXME: this only searches through the most recent 100 users for the given role (assuming there are no more than 10,000 users in the gateway)
- logger.debug("getUsersWithRole: fetching all users...");
- List<UserRepresentation> allUsers = client.realm(tenantId).users().search(null,
- null,
- null,
- null,
- 0, 100);
+ int totalUserCount = client.realm(tenantId).users().count();
+ logger.debug("getUsersWithRole: totalUserCount=" + totalUserCount);
+ // Load all users in batches
+ List<UserRepresentation> allUsers = new ArrayList<>();
+ int userBatchSize = 100;
+ for (int start = 0; start < totalUserCount; start=start+userBatchSize) {
+
+ logger.debug("getUsersWithRole: fetching " + userBatchSize + " users...");
+ allUsers.addAll(client.realm(tenantId).users().search(null,
+ null,
+ null,
+ null,
+ start, userBatchSize));
+ }
logger.debug("getUsersWithRole: all users count=" + allUsers.size());
allUsers.sort((a, b) -> a.getCreatedTimestamp() - b.getCreatedTimestamp() > 0 ? -1 : 1);
// The 100 most recently created users
[18/50] [abbrv] airavata git commit: Adding SIU theme
Posted by ma...@apache.org.
Adding SIU theme
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5baf04d3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5baf04d3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5baf04d3
Branch: refs/heads/master
Commit: 5baf04d3f3911edd56dc8928ec00d4a2d9cd7233
Parents: 5d4d105
Author: Suresh Marru <sm...@apache.org>
Authored: Mon Jul 10 14:32:43 2017 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon Jul 10 14:32:43 2017 -0500
----------------------------------------------------------------------
.../scigap/production/pga_config/southernillinois/vars.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5baf04d3/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
index 364f624..10c86e6 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
@@ -55,7 +55,7 @@ super_admin_portal: "false"
admin_emails: "['sgg@iu.edu']"
portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "base"
-#portal_theme_repo: ""
+portal_theme: "siu-gateway-theme"
+portal_theme_repo: "https://github.com/SciGaP/siu-gateway-theme.git"
portal_title: "Southern Illinois PHP Gateway"
...
[06/50] [abbrv] airavata git commit: Updating storage resource id
Posted by ma...@apache.org.
Updating storage resource id
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/217fa0fe
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/217fa0fe
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/217fa0fe
Branch: refs/heads/master
Commit: 217fa0feb9a77e7776338fd3b369458717608a4c
Parents: f169bb1
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Jul 7 09:14:17 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Jul 7 09:14:17 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/production/pga_config/seagrid/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/testdrive/vars.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/217fa0fe/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
index 15abca3..19ec435 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
@@ -57,7 +57,7 @@ oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
gateway_id: "seagrid"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/seagrid"
-gateway_data_store_resource_id: "scigap04.sciencegateways.iu.edu_6bfe414c-db48-4203-b8ea-b14812c72a32"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCApfdud3cJ7rx44M41gEKVgRfefk/Vd/7dIp9Xr9juX4jqmGuLoZR+hk287Hmbps6hZv23Av97XkCLldH0pueDekthcBDo4cRiQMDBp9NLz/9muqYVBl985psEbazYygagy/q/3ebi4CVEYVd4cHBee1V3GYyuJS2RklF0s/Otyf8x8auJSMniHGbTbVqtFlEOYuPdXlRBfH37k55N7+2iXKsIVvgn1MDweHEbQWJMx2LDCkLfJitreTiwcuST55w6N/n8WYZM2t+ie3BJEr6tcGAVIuyxj7CbMYMziM/hM5J+oQGPY/IBtiNZoxiZ0DeAC9SiEvE9fbTEW2iRWnQL"
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/217fa0fe/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
index 7f91482..de44cd7 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
@@ -56,7 +56,7 @@ oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
gateway_id: "default"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/testdrive"
-gateway_data_store_resource_id: "scigap04.sciencegateways.iu.edu_6bfe414c-db48-4203-b8ea-b14812c72a32"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUF51b2cYYqqadLHL9M/oPY0ZHZlWbdOdaIgjpzIzMnO7M9hKrHVY2pqyLPvqCLzaunxITPWsTqw0E8hwub4ttGLAx/O4kIf+BgyZK7iuwXWhI7u85/o58IfrD4B+jVCYKRNayuLR+lJWsiOeS6HSlunpTKTEhFGeOHn2UzdbLfgWYQ3VUFDtKN1oDPDT78ml5c2RCibJ21jltpevVfEtCUctERpTfniWSuQZggP1qiLNa1+PfiJ3mGsEzJFDntQvQetdinaAbEaT7+sctS8nBNjapkmYMf6tBl3S0bLttYPH51f8lUQAFaAzrestO1JpJNnIeY01/S3MWIlAWASnn"
## Portal related variables
[10/50] [abbrv] airavata git commit: fixing untaring issue in archive
task
Posted by ma...@apache.org.
fixing untaring issue in archive task
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/704ba661
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/704ba661
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/704ba661
Branch: refs/heads/master
Commit: 704ba661233136c338a5fc4e141a982e3fe0e795
Parents: d49fcd7
Author: scnakandala <su...@gmail.com>
Authored: Fri Jul 7 15:20:13 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Jul 7 15:20:13 2017 -0400
----------------------------------------------------------------------
.../main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/704ba661/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
index 1fbec86..62c729c 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/ArchiveTask.java
@@ -146,7 +146,7 @@ public class ArchiveTask implements Task {
commandInfo = new RawCommandInfo("cd " + destParent + " && mkdir " + storageArchiveDir +
" && tar -xvf " + archiveTar + " -C " + storageArchiveDir + " && rm " + archiveTar +
" && chmod 755 -R " + storageArchiveDir + "/*");
- executeCommand(srcSession, commandInfo, new StandardOutReader());
+ executeCommand(destSession, commandInfo, new StandardOutReader());
} catch (CredentialStoreException e) {
String msg = "Storage authentication issue, make sure you are passing valid credential token";
log.error(msg, e);
[14/50] [abbrv] airavata git commit: AIRAVATA-2405 Search only most
recent users for role
Posted by ma...@apache.org.
AIRAVATA-2405 Search only most recent users for role
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/45bbc256
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/45bbc256
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/45bbc256
Branch: refs/heads/master
Commit: 45bbc256e4bc480e44b1901ce1a959074e621447
Parents: a8e99e8
Author: Marcus Christie <ma...@apache.org>
Authored: Sat Jul 8 22:27:32 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Sat Jul 8 22:27:32 2017 -0500
----------------------------------------------------------------------
.../services/core/impl/TenantManagementKeycloakImpl.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/45bbc256/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
----------------------------------------------------------------------
diff --git a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
index 20d41f5..91c0f4e 100644
--- a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
+++ b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
@@ -534,15 +534,18 @@ public class TenantManagementKeycloakImpl implements TenantManagementInterface {
Keycloak client = null;
try{
client = TenantManagementKeycloakImpl.getClient(ServerSettings.getIamServerUrl(), tenantId, realmAdminCreds);
- // FIXME: this only gets the first 1000 users to search through for the given role
+ // FIXME: this only searches through the most recent 100 users for the given role (assuming there are no more than 10,000 users in the gateway)
List<UserRepresentation> allUsers = client.realm(tenantId).users().search(null,
null,
null,
null,
- 0, 1000);
+ 0, 10000);
+ allUsers.sort((a, b) -> a.getCreatedTimestamp() - b.getCreatedTimestamp() > 0 ? -1 : 1);
+ // The 100 most recently created users
+ List<UserRepresentation> mostRecentUsers = allUsers.subList(0, Math.min(allUsers.size(), 100));
List<UserProfile> usersWithRole = new ArrayList<>();
- for (UserRepresentation user: allUsers) {
+ for (UserRepresentation user: mostRecentUsers) {
UserResource userResource = client.realm(tenantId).users().get(user.getId());
List<RoleRepresentation> roleRepresentations = userResource.roles().realmLevel().listAll();
[15/50] [abbrv] airavata git commit: AIRAVATA-2405 getUsersWithRole
debug logging
Posted by ma...@apache.org.
AIRAVATA-2405 getUsersWithRole debug logging
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/226cd3fb
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/226cd3fb
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/226cd3fb
Branch: refs/heads/master
Commit: 226cd3fb734c9bdbd8fcb616fd0636c9be409697
Parents: 45bbc25
Author: Marcus Christie <ma...@apache.org>
Authored: Sat Jul 8 23:28:51 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Sat Jul 8 23:28:51 2017 -0500
----------------------------------------------------------------------
.../admin/services/core/impl/TenantManagementKeycloakImpl.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/226cd3fb/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
----------------------------------------------------------------------
diff --git a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
index 91c0f4e..fc6af61 100644
--- a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
+++ b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
@@ -535,14 +535,17 @@ public class TenantManagementKeycloakImpl implements TenantManagementInterface {
try{
client = TenantManagementKeycloakImpl.getClient(ServerSettings.getIamServerUrl(), tenantId, realmAdminCreds);
// FIXME: this only searches through the most recent 100 users for the given role (assuming there are no more than 10,000 users in the gateway)
+ logger.debug("getUsersWithRole: fetching all users...");
List<UserRepresentation> allUsers = client.realm(tenantId).users().search(null,
null,
null,
null,
0, 10000);
+ logger.debug("getUsersWithRole: all users count=" + allUsers.size());
allUsers.sort((a, b) -> a.getCreatedTimestamp() - b.getCreatedTimestamp() > 0 ? -1 : 1);
// The 100 most recently created users
List<UserRepresentation> mostRecentUsers = allUsers.subList(0, Math.min(allUsers.size(), 100));
+ logger.debug("getUsersWithRole: most recent users count=" + mostRecentUsers.size());
List<UserProfile> usersWithRole = new ArrayList<>();
for (UserRepresentation user: mostRecentUsers) {
@@ -556,6 +559,7 @@ public class TenantManagementKeycloakImpl implements TenantManagementInterface {
}
}
}
+ logger.debug("getUsersWithRole: most recent users with role count=" + usersWithRole.size());
return usersWithRole;
} catch (ApplicationSettingsException ex) {
logger.error("Error getting values from property file, reason: " + ex.getMessage(), ex);
[42/50] [abbrv] airavata git commit: updating some of the group
management API methods in AiravataServerHandler
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
index e195f71..ee69980 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
@@ -3429,13 +3429,12 @@ class Iface:
"""
pass
- def deleteGroup(self, authzToken, groupId, ownerId, gatewayId):
+ def deleteGroup(self, authzToken, groupId, ownerId):
"""
Parameters:
- authzToken
- groupId
- ownerId
- - gatewayId
"""
pass
@@ -3447,64 +3446,11 @@ class Iface:
"""
pass
- def getAllGroupsUserBelongs(self, authzToken, userName, gatewayId):
+ def getAllGroupsUserBelongs(self, authzToken, userName):
"""
Parameters:
- authzToken
- userName
- - gatewayId
- """
- pass
-
- def addUserProfile(self, authzToken, userProfile):
- """
- Parameters:
- - authzToken
- - userProfile
- """
- pass
-
- def updateUserProfile(self, authzToken, userProfile):
- """
- Parameters:
- - authzToken
- - userProfile
- """
- pass
-
- def getUserProfileById(self, authzToken, userId, gatewayId):
- """
- Parameters:
- - authzToken
- - userId
- - gatewayId
- """
- pass
-
- def deleteUserProfile(self, authzToken, userId):
- """
- Parameters:
- - authzToken
- - userId
- """
- pass
-
- def getAllUserProfilesInGateway(self, authzToken, gatewayId, offset, limit):
- """
- Parameters:
- - authzToken
- - gatewayId
- - offset
- - limit
- """
- pass
-
- def doesUserProfileExist(self, authzToken, userId, gatewayId):
- """
- Parameters:
- - authzToken
- - userId
- - gatewayId
"""
pass
@@ -12535,24 +12481,22 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "updateGroup failed: unknown result")
- def deleteGroup(self, authzToken, groupId, ownerId, gatewayId):
+ def deleteGroup(self, authzToken, groupId, ownerId):
"""
Parameters:
- authzToken
- groupId
- ownerId
- - gatewayId
"""
- self.send_deleteGroup(authzToken, groupId, ownerId, gatewayId)
+ self.send_deleteGroup(authzToken, groupId, ownerId)
return self.recv_deleteGroup()
- def send_deleteGroup(self, authzToken, groupId, ownerId, gatewayId):
+ def send_deleteGroup(self, authzToken, groupId, ownerId):
self._oprot.writeMessageBegin('deleteGroup', TMessageType.CALL, self._seqid)
args = deleteGroup_args()
args.authzToken = authzToken
args.groupId = groupId
args.ownerId = ownerId
- args.gatewayId = gatewayId
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
@@ -12621,22 +12565,20 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getGroup failed: unknown result")
- def getAllGroupsUserBelongs(self, authzToken, userName, gatewayId):
+ def getAllGroupsUserBelongs(self, authzToken, userName):
"""
Parameters:
- authzToken
- userName
- - gatewayId
"""
- self.send_getAllGroupsUserBelongs(authzToken, userName, gatewayId)
+ self.send_getAllGroupsUserBelongs(authzToken, userName)
return self.recv_getAllGroupsUserBelongs()
- def send_getAllGroupsUserBelongs(self, authzToken, userName, gatewayId):
+ def send_getAllGroupsUserBelongs(self, authzToken, userName):
self._oprot.writeMessageBegin('getAllGroupsUserBelongs', TMessageType.CALL, self._seqid)
args = getAllGroupsUserBelongs_args()
args.authzToken = authzToken
args.userName = userName
- args.gatewayId = gatewayId
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
@@ -12664,260 +12606,6 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGroupsUserBelongs failed: unknown result")
- def addUserProfile(self, authzToken, userProfile):
- """
- Parameters:
- - authzToken
- - userProfile
- """
- self.send_addUserProfile(authzToken, userProfile)
- return self.recv_addUserProfile()
-
- def send_addUserProfile(self, authzToken, userProfile):
- self._oprot.writeMessageBegin('addUserProfile', TMessageType.CALL, self._seqid)
- args = addUserProfile_args()
- args.authzToken = authzToken
- args.userProfile = userProfile
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_addUserProfile(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = addUserProfile_result()
- result.read(iprot)
- iprot.readMessageEnd()
- if result.success is not None:
- return result.success
- if result.ire is not None:
- raise result.ire
- if result.ace is not None:
- raise result.ace
- if result.ase is not None:
- raise result.ase
- if result.ae is not None:
- raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "addUserProfile failed: unknown result")
-
- def updateUserProfile(self, authzToken, userProfile):
- """
- Parameters:
- - authzToken
- - userProfile
- """
- self.send_updateUserProfile(authzToken, userProfile)
- return self.recv_updateUserProfile()
-
- def send_updateUserProfile(self, authzToken, userProfile):
- self._oprot.writeMessageBegin('updateUserProfile', TMessageType.CALL, self._seqid)
- args = updateUserProfile_args()
- args.authzToken = authzToken
- args.userProfile = userProfile
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_updateUserProfile(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = updateUserProfile_result()
- result.read(iprot)
- iprot.readMessageEnd()
- if result.success is not None:
- return result.success
- if result.ire is not None:
- raise result.ire
- if result.ace is not None:
- raise result.ace
- if result.ase is not None:
- raise result.ase
- if result.ae is not None:
- raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "updateUserProfile failed: unknown result")
-
- def getUserProfileById(self, authzToken, userId, gatewayId):
- """
- Parameters:
- - authzToken
- - userId
- - gatewayId
- """
- self.send_getUserProfileById(authzToken, userId, gatewayId)
- return self.recv_getUserProfileById()
-
- def send_getUserProfileById(self, authzToken, userId, gatewayId):
- self._oprot.writeMessageBegin('getUserProfileById', TMessageType.CALL, self._seqid)
- args = getUserProfileById_args()
- args.authzToken = authzToken
- args.userId = userId
- args.gatewayId = gatewayId
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getUserProfileById(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getUserProfileById_result()
- result.read(iprot)
- iprot.readMessageEnd()
- if result.success is not None:
- return result.success
- if result.ire is not None:
- raise result.ire
- if result.ace is not None:
- raise result.ace
- if result.ase is not None:
- raise result.ase
- if result.ae is not None:
- raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserProfileById failed: unknown result")
-
- def deleteUserProfile(self, authzToken, userId):
- """
- Parameters:
- - authzToken
- - userId
- """
- self.send_deleteUserProfile(authzToken, userId)
- return self.recv_deleteUserProfile()
-
- def send_deleteUserProfile(self, authzToken, userId):
- self._oprot.writeMessageBegin('deleteUserProfile', TMessageType.CALL, self._seqid)
- args = deleteUserProfile_args()
- args.authzToken = authzToken
- args.userId = userId
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_deleteUserProfile(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = deleteUserProfile_result()
- result.read(iprot)
- iprot.readMessageEnd()
- if result.success is not None:
- return result.success
- if result.ire is not None:
- raise result.ire
- if result.ace is not None:
- raise result.ace
- if result.ase is not None:
- raise result.ase
- if result.ae is not None:
- raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteUserProfile failed: unknown result")
-
- def getAllUserProfilesInGateway(self, authzToken, gatewayId, offset, limit):
- """
- Parameters:
- - authzToken
- - gatewayId
- - offset
- - limit
- """
- self.send_getAllUserProfilesInGateway(authzToken, gatewayId, offset, limit)
- return self.recv_getAllUserProfilesInGateway()
-
- def send_getAllUserProfilesInGateway(self, authzToken, gatewayId, offset, limit):
- self._oprot.writeMessageBegin('getAllUserProfilesInGateway', TMessageType.CALL, self._seqid)
- args = getAllUserProfilesInGateway_args()
- args.authzToken = authzToken
- args.gatewayId = gatewayId
- args.offset = offset
- args.limit = limit
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_getAllUserProfilesInGateway(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = getAllUserProfilesInGateway_result()
- result.read(iprot)
- iprot.readMessageEnd()
- if result.success is not None:
- return result.success
- if result.ire is not None:
- raise result.ire
- if result.ace is not None:
- raise result.ace
- if result.ase is not None:
- raise result.ase
- if result.ae is not None:
- raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllUserProfilesInGateway failed: unknown result")
-
- def doesUserProfileExist(self, authzToken, userId, gatewayId):
- """
- Parameters:
- - authzToken
- - userId
- - gatewayId
- """
- self.send_doesUserProfileExist(authzToken, userId, gatewayId)
- return self.recv_doesUserProfileExist()
-
- def send_doesUserProfileExist(self, authzToken, userId, gatewayId):
- self._oprot.writeMessageBegin('doesUserProfileExist', TMessageType.CALL, self._seqid)
- args = doesUserProfileExist_args()
- args.authzToken = authzToken
- args.userId = userId
- args.gatewayId = gatewayId
- args.write(self._oprot)
- self._oprot.writeMessageEnd()
- self._oprot.trans.flush()
-
- def recv_doesUserProfileExist(self):
- iprot = self._iprot
- (fname, mtype, rseqid) = iprot.readMessageBegin()
- if mtype == TMessageType.EXCEPTION:
- x = TApplicationException()
- x.read(iprot)
- iprot.readMessageEnd()
- raise x
- result = doesUserProfileExist_result()
- result.read(iprot)
- iprot.readMessageEnd()
- if result.success is not None:
- return result.success
- if result.ire is not None:
- raise result.ire
- if result.ace is not None:
- raise result.ace
- if result.ase is not None:
- raise result.ase
- if result.ae is not None:
- raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "doesUserProfileExist failed: unknown result")
-
class Processor(Iface, TProcessor):
def __init__(self, handler):
@@ -13092,12 +12780,6 @@ class Processor(Iface, TProcessor):
self._processMap["deleteGroup"] = Processor.process_deleteGroup
self._processMap["getGroup"] = Processor.process_getGroup
self._processMap["getAllGroupsUserBelongs"] = Processor.process_getAllGroupsUserBelongs
- self._processMap["addUserProfile"] = Processor.process_addUserProfile
- self._processMap["updateUserProfile"] = Processor.process_updateUserProfile
- self._processMap["getUserProfileById"] = Processor.process_getUserProfileById
- self._processMap["deleteUserProfile"] = Processor.process_deleteUserProfile
- self._processMap["getAllUserProfilesInGateway"] = Processor.process_getAllUserProfilesInGateway
- self._processMap["doesUserProfileExist"] = Processor.process_doesUserProfileExist
def process(self, iprot, oprot):
(name, type, seqid) = iprot.readMessageBegin()
@@ -18281,7 +17963,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = deleteGroup_result()
try:
- result.success = self._handler.deleteGroup(args.authzToken, args.groupId, args.ownerId, args.gatewayId)
+ result.success = self._handler.deleteGroup(args.authzToken, args.groupId, args.ownerId)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -18343,7 +18025,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = getAllGroupsUserBelongs_result()
try:
- result.success = self._handler.getAllGroupsUserBelongs(args.authzToken, args.userName, args.gatewayId)
+ result.success = self._handler.getAllGroupsUserBelongs(args.authzToken, args.userName)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -18368,192 +18050,6 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_addUserProfile(self, seqid, iprot, oprot):
- args = addUserProfile_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = addUserProfile_result()
- try:
- result.success = self._handler.addUserProfile(args.authzToken, args.userProfile)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("addUserProfile", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_updateUserProfile(self, seqid, iprot, oprot):
- args = updateUserProfile_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = updateUserProfile_result()
- try:
- result.success = self._handler.updateUserProfile(args.authzToken, args.userProfile)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("updateUserProfile", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_getUserProfileById(self, seqid, iprot, oprot):
- args = getUserProfileById_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = getUserProfileById_result()
- try:
- result.success = self._handler.getUserProfileById(args.authzToken, args.userId, args.gatewayId)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("getUserProfileById", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_deleteUserProfile(self, seqid, iprot, oprot):
- args = deleteUserProfile_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = deleteUserProfile_result()
- try:
- result.success = self._handler.deleteUserProfile(args.authzToken, args.userId)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("deleteUserProfile", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_getAllUserProfilesInGateway(self, seqid, iprot, oprot):
- args = getAllUserProfilesInGateway_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = getAllUserProfilesInGateway_result()
- try:
- result.success = self._handler.getAllUserProfilesInGateway(args.authzToken, args.gatewayId, args.offset, args.limit)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("getAllUserProfilesInGateway", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
- def process_doesUserProfileExist(self, seqid, iprot, oprot):
- args = doesUserProfileExist_args()
- args.read(iprot)
- iprot.readMessageEnd()
- result = doesUserProfileExist_result()
- try:
- result.success = self._handler.doesUserProfileExist(args.authzToken, args.userId, args.gatewayId)
- msg_type = TMessageType.REPLY
- except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
- raise
- except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
- msg_type = TMessageType.REPLY
- result.ire = ire
- except apache.airavata.api.error.ttypes.AiravataClientException as ace:
- msg_type = TMessageType.REPLY
- result.ace = ace
- except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
- msg_type = TMessageType.REPLY
- result.ase = ase
- except apache.airavata.api.error.ttypes.AuthorizationException as ae:
- msg_type = TMessageType.REPLY
- result.ae = ae
- except Exception as ex:
- msg_type = TMessageType.EXCEPTION
- logging.exception(ex)
- result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
- oprot.writeMessageBegin("doesUserProfileExist", msg_type, seqid)
- result.write(oprot)
- oprot.writeMessageEnd()
- oprot.trans.flush()
-
# HELPER FUNCTIONS AND STRUCTURES
@@ -30206,1082 +29702,25 @@ class getApplicationModule_result:
def __ne__(self, other):
return not (self == other)
-class updateApplicationModule_args:
- """
- Attributes:
- - authzToken
- - appModuleId
- - applicationModule
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'appModuleId', None, None, ), # 2
- (3, TType.STRUCT, 'applicationModule', (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule.thrift_spec), None, ), # 3
- )
-
- def __init__(self, authzToken=None, appModuleId=None, applicationModule=None,):
- self.authzToken = authzToken
- self.appModuleId = appModuleId
- self.applicationModule = applicationModule
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.appModuleId = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.applicationModule = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
- self.applicationModule.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('updateApplicationModule_args')
- if self.authzToken is not None:
- oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
- self.authzToken.write(oprot)
- oprot.writeFieldEnd()
- if self.appModuleId is not None:
- oprot.writeFieldBegin('appModuleId', TType.STRING, 2)
- oprot.writeString(self.appModuleId)
- oprot.writeFieldEnd()
- if self.applicationModule is not None:
- oprot.writeFieldBegin('applicationModule', TType.STRUCT, 3)
- self.applicationModule.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.authzToken is None:
- raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.appModuleId is None:
- raise TProtocol.TProtocolException(message='Required field appModuleId is unset!')
- if self.applicationModule is None:
- raise TProtocol.TProtocolException(message='Required field applicationModule is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.appModuleId)
- value = (value * 31) ^ hash(self.applicationModule)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class updateApplicationModule_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.BOOL, 'success', None, None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.BOOL:
- self.success = iprot.readBool()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRUCT:
- self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
- self.ae.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('updateApplicationModule_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.BOOL, 0)
- oprot.writeBool(self.success)
- oprot.writeFieldEnd()
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 2)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 3)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- self.ae.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.success)
- value = (value * 31) ^ hash(self.ire)
- value = (value * 31) ^ hash(self.ace)
- value = (value * 31) ^ hash(self.ase)
- value = (value * 31) ^ hash(self.ae)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class getAllAppModules_args:
- """
- Attributes:
- - authzToken
- - gatewayId
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', None, None, ), # 2
- )
-
- def __init__(self, authzToken=None, gatewayId=None,):
- self.authzToken = authzToken
- self.gatewayId = gatewayId
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('getAllAppModules_args')
- if self.authzToken is not None:
- oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
- self.authzToken.write(oprot)
- oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.authzToken is None:
- raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.gatewayId is None:
- raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.gatewayId)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class getAllAppModules_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule.thrift_spec)), None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype139, _size136) = iprot.readListBegin()
- for _i140 in xrange(_size136):
- _elem141 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
- _elem141.read(iprot)
- self.success.append(_elem141)
- iprot.readListEnd()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRUCT:
- self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
- self.ae.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('getAllAppModules_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter142 in self.success:
- iter142.write(oprot)
- oprot.writeListEnd()
- oprot.writeFieldEnd()
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 2)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 3)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- self.ae.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.success)
- value = (value * 31) ^ hash(self.ire)
- value = (value * 31) ^ hash(self.ace)
- value = (value * 31) ^ hash(self.ase)
- value = (value * 31) ^ hash(self.ae)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class deleteApplicationModule_args:
- """
- Attributes:
- - authzToken
- - appModuleId
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'appModuleId', None, None, ), # 2
- )
-
- def __init__(self, authzToken=None, appModuleId=None,):
- self.authzToken = authzToken
- self.appModuleId = appModuleId
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.appModuleId = iprot.readString()
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('deleteApplicationModule_args')
- if self.authzToken is not None:
- oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
- self.authzToken.write(oprot)
- oprot.writeFieldEnd()
- if self.appModuleId is not None:
- oprot.writeFieldBegin('appModuleId', TType.STRING, 2)
- oprot.writeString(self.appModuleId)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.authzToken is None:
- raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.appModuleId is None:
- raise TProtocol.TProtocolException(message='Required field appModuleId is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.appModuleId)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class deleteApplicationModule_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.BOOL, 'success', None, None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.BOOL:
- self.success = iprot.readBool()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRUCT:
- self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
- self.ae.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('deleteApplicationModule_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.BOOL, 0)
- oprot.writeBool(self.success)
- oprot.writeFieldEnd()
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 2)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 3)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- self.ae.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.success)
- value = (value * 31) ^ hash(self.ire)
- value = (value * 31) ^ hash(self.ace)
- value = (value * 31) ^ hash(self.ase)
- value = (value * 31) ^ hash(self.ae)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class registerApplicationDeployment_args:
- """
- Attributes:
- - authzToken
- - gatewayId
- - applicationDeployment
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'gatewayId', None, None, ), # 2
- (3, TType.STRUCT, 'applicationDeployment', (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription.thrift_spec), None, ), # 3
- )
-
- def __init__(self, authzToken=None, gatewayId=None, applicationDeployment=None,):
- self.authzToken = authzToken
- self.gatewayId = gatewayId
- self.applicationDeployment = applicationDeployment
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.applicationDeployment = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
- self.applicationDeployment.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('registerApplicationDeployment_args')
- if self.authzToken is not None:
- oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
- self.authzToken.write(oprot)
- oprot.writeFieldEnd()
- if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
- oprot.writeString(self.gatewayId)
- oprot.writeFieldEnd()
- if self.applicationDeployment is not None:
- oprot.writeFieldBegin('applicationDeployment', TType.STRUCT, 3)
- self.applicationDeployment.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.authzToken is None:
- raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.gatewayId is None:
- raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
- if self.applicationDeployment is None:
- raise TProtocol.TProtocolException(message='Required field applicationDeployment is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.gatewayId)
- value = (value * 31) ^ hash(self.applicationDeployment)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class registerApplicationDeployment_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.STRING, 'success', None, None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.STRING:
- self.success = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRUCT:
- self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
- self.ae.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('registerApplicationDeployment_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.STRING, 0)
- oprot.writeString(self.success)
- oprot.writeFieldEnd()
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 2)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 3)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- self.ae.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.success)
- value = (value * 31) ^ hash(self.ire)
- value = (value * 31) ^ hash(self.ace)
- value = (value * 31) ^ hash(self.ase)
- value = (value * 31) ^ hash(self.ae)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class getApplicationDeployment_args:
- """
- Attributes:
- - authzToken
- - appDeploymentId
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'appDeploymentId', None, None, ), # 2
- )
-
- def __init__(self, authzToken=None, appDeploymentId=None,):
- self.authzToken = authzToken
- self.appDeploymentId = appDeploymentId
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.appDeploymentId = iprot.readString()
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('getApplicationDeployment_args')
- if self.authzToken is not None:
- oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
- self.authzToken.write(oprot)
- oprot.writeFieldEnd()
- if self.appDeploymentId is not None:
- oprot.writeFieldBegin('appDeploymentId', TType.STRING, 2)
- oprot.writeString(self.appDeploymentId)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.authzToken is None:
- raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.appDeploymentId is None:
- raise TProtocol.TProtocolException(message='Required field appDeploymentId is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.appDeploymentId)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class getApplicationDeployment_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription.thrift_spec), None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.STRUCT:
- self.success = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
- self.success.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRUCT:
- self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
- self.ae.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('getApplicationDeployment_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.STRUCT, 0)
- self.success.write(oprot)
- oprot.writeFieldEnd()
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 2)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 3)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- self.ae.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.success)
- value = (value * 31) ^ hash(self.ire)
- value = (value * 31) ^ hash(self.ace)
- value = (value * 31) ^ hash(self.ase)
- value = (value * 31) ^ hash(self.ae)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class updateApplicationDeployment_args:
+class updateApplicationModule_args:
"""
Attributes:
- authzToken
- - appDeploymentId
- - applicationDeployment
+ - appModuleId
+ - applicationModule
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'appDeploymentId', None, None, ), # 2
- (3, TType.STRUCT, 'applicationDeployment', (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription.thrift_spec), None, ), # 3
+ (2, TType.STRING, 'appModuleId', None, None, ), # 2
+ (3, TType.STRUCT, 'applicationModule', (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule.thrift_spec), None, ), # 3
)
- def __init__(self, authzToken=None, appDeploymentId=None, applicationDeployment=None,):
+ def __init__(self, authzToken=None, appModuleId=None, applicationModule=None,):
self.authzToken = authzToken
- self.appDeploymentId = appDeploymentId
- self.applicationDeployment = applicationDeployment
+ self.appModuleId = appModuleId
+ self.applicationModule = applicationModule
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -31300,13 +29739,13 @@ class updateApplicationDeployment_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.appDeploymentId = iprot.readString()
+ self.appModuleId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRUCT:
- self.applicationDeployment = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
- self.applicationDeployment.read(iprot)
+ self.applicationModule = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
+ self.applicationModule.read(iprot)
else:
iprot.skip(ftype)
else:
@@ -31318,224 +29757,18 @@ class updateApplicationDeployment_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('updateApplicationDeployment_args')
+ oprot.writeStructBegin('updateApplicationModule_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.appDeploymentId is not None:
- oprot.writeFieldBegin('appDeploymentId', TType.STRING, 2)
- oprot.writeString(self.appDeploymentId)
- oprot.writeFieldEnd()
- if self.applicationDeployment is not None:
- oprot.writeFieldBegin('applicationDeployment', TType.STRUCT, 3)
- self.applicationDeployment.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- if self.authzToken is None:
- raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.appDeploymentId is None:
- raise TProtocol.TProtocolException(message='Required field appDeploymentId is unset!')
- if self.applicationDeployment is None:
- raise TProtocol.TProtocolException(message='Required field applicationDeployment is unset!')
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.appDeploymentId)
- value = (value * 31) ^ hash(self.applicationDeployment)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class updateApplicationDeployment_result:
- """
- Attributes:
- - success
- - ire
- - ace
- - ase
- - ae
- """
-
- thrift_spec = (
- (0, TType.BOOL, 'success', None, None, ), # 0
- (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
- (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
- (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
- (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ), # 4
- )
-
- def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
- self.success = success
- self.ire = ire
- self.ace = ace
- self.ase = ase
- self.ae = ae
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 0:
- if ftype == TType.BOOL:
- self.success = iprot.readBool()
- else:
- iprot.skip(ftype)
- elif fid == 1:
- if ftype == TType.STRUCT:
- self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
- self.ire.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRUCT:
- self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
- self.ace.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRUCT:
- self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
- self.ase.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRUCT:
- self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
- self.ae.read(iprot)
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('updateApplicationDeployment_result')
- if self.success is not None:
- oprot.writeFieldBegin('success', TType.BOOL, 0)
- oprot.writeBool(self.success)
- oprot.writeFieldEnd()
- if self.ire is not None:
- oprot.writeFieldBegin('ire', TType.STRUCT, 1)
- self.ire.write(oprot)
- oprot.writeFieldEnd()
- if self.ace is not None:
- oprot.writeFieldBegin('ace', TType.STRUCT, 2)
- self.ace.write(oprot)
- oprot.writeFieldEnd()
- if self.ase is not None:
- oprot.writeFieldBegin('ase', TType.STRUCT, 3)
- self.ase.write(oprot)
- oprot.writeFieldEnd()
- if self.ae is not None:
- oprot.writeFieldBegin('ae', TType.STRUCT, 4)
- self.ae.write(oprot)
- oprot.writeFieldEnd()
- oprot.writeFieldStop()
- oprot.writeStructEnd()
-
- def validate(self):
- return
-
-
- def __hash__(self):
- value = 17
- value = (value * 31) ^ hash(self.success)
- value = (value * 31) ^ hash(self.ire)
- value = (value * 31) ^ hash(self.ace)
- value = (value * 31) ^ hash(self.ase)
- value = (value * 31) ^ hash(self.ae)
- return value
-
- def __repr__(self):
- L = ['%s=%r' % (key, value)
- for key, value in self.__dict__.iteritems()]
- return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
- def __eq__(self, other):
- return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
- def __ne__(self, other):
- return not (self == other)
-
-class deleteApplicationDeployment_args:
- """
- Attributes:
- - authzToken
- - appDeploymentId
- """
-
- thrift_spec = (
- None, # 0
- (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'appDeploymentId', None, None, ), # 2
- )
-
- def __init__(self, authzToken=None, appDeploymentId=None,):
- self.authzToken = authzToken
- self.appDeploymentId = appDeploymentId
-
- def read(self, iprot):
- if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
- fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
- return
- iprot.readStructBegin()
- while True:
- (fname, ftype, fid) = iprot.readFieldBegin()
- if ftype == TType.STOP:
- break
- if fid == 1:
- if ftype == TType.STRUCT:
- self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
- self.authzToken.read(iprot)
- else:
- iprot.skip(ftype)
- elif fid == 2:
- if ftype == TType.STRING:
- self.appDeploymentId = iprot.readString()
- else:
- iprot.skip(ftype)
- else:
- iprot.skip(ftype)
- iprot.readFieldEnd()
- iprot.readStructEnd()
-
- def write(self, oprot):
- if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
- oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
- return
- oprot.writeStructBegin('deleteApplicationDeployment_args')
- if self.authzToken is not None:
- oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
- self.authzToken.write(oprot)
+ if self.appModuleId is not None:
+ oprot.writeFieldBegin('appModuleId', TType.STRING, 2)
+ oprot.writeString(self.appModuleId)
oprot.writeFieldEnd()
- if self.appDeploymentId is not None:
- oprot.writeFieldBegin('appDeploymentId', TType.STRING, 2)
- oprot.writeString(self.appDeploymentId)
+ if self.applicationModule is not None:
+ oprot.writeFieldBegin('applicationModule', TType.STRUCT, 3)
+ self.applicationModule.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -31543,15 +29776,18 @@ class deleteApplicationDeployment_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.appDeploymentId is None:
- raise TProtocol.TProtocolException(message='Required field appDeploymentId is unset!')
+ if self.appModuleId is None:
+ raise TProtocol.TProtocolException(message='Required field appModuleId is unset!')
+ if self.applicationModule is None:
+ raise TProtocol.TProtocolException(message='Required field applicationModule is unset!')
return
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.appDeploymentId)
+ value = (value * 31) ^ hash(self.appModuleId)
+ value = (value * 31) ^ hash(self.applicationModule)
return value
def __repr__(self):
@@ -31565,7 +29801,7 @@ class deleteApplicationDeployment_args:
def __ne__(self, other):
return not (self == other)
-class deleteApplicationDeployment_result:
+class updateApplicationModule_result:
"""
Attributes:
- success
@@ -31637,7 +29873,7 @@ class deleteApplicationDeployment_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('deleteApplicationDeployment_result')
+ oprot.writeStructBegin('updateApplicationModule_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.BOOL, 0)
oprot.writeBool(self.success)
@@ -31685,7 +29921,7 @@ class deleteApplicationDeployment_result:
def __ne__(self, other):
return not (self == other)
-class getAllApplicationDeployments_args:
+class getAllAppModules_args:
"""
Attributes:
- authzToken
@@ -31731,7 +29967,7 @@ class getAllApplicationDeployments_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllApplicationDeployments_args')
+ oprot.writeStructBegin('getAllAppModules_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -31768,7 +30004,7 @@ class getAllApplicationDeployments_args:
def __ne__(self, other):
return not (self == other)
-class getAllApplicationDeployments_result:
+class getAllAppModules_result:
"""
Attributes:
- success
@@ -31779,7 +30015,7 @@ class getAllApplicationDeployments_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -31805,11 +30041,11 @@ class getAllApplicationDeployments_result:
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype146, _size143) = iprot.readListBegin()
- for _i147 in xrange(_size143):
- _elem148 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
- _elem148.read(iprot)
- self.success.append(_elem148)
+ (_etype139, _size136) = iprot.readListBegin()
+ for _i140 in xrange(_size136):
+ _elem141 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
+ _elem141.read(iprot)
+ self.success.append(_elem141)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -31846,12 +30082,12 @@ class getAllApplicationDeployments_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllApplicationDeployments_result')
+ oprot.writeStructBegin('getAllAppModules_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter149 in self.success:
- iter149.write(oprot)
+ for iter142 in self.success:
+ iter142.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ire is not None:
@@ -31897,7 +30133,7 @@ class getAllApplicationDeployments_result:
def __ne__(self, other):
return not (self == other)
-class getAppModuleDeployedResources_args:
+class deleteApplicationModule_args:
"""
Attributes:
- authzToken
@@ -31943,7 +30179,7 @@ class getAppModuleDeployedResources_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAppModuleDeployedResources_args')
+ oprot.writeStructBegin('deleteApplicationModule_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -31980,7 +30216,7 @@ class getAppModuleDeployedResources_args:
def __ne__(self, other):
return not (self == other)
-class getAppModuleDeployedResources_result:
+class deleteApplicationModule_result:
"""
Attributes:
- success
@@ -31991,7 +30227,7 @@ class getAppModuleDeployedResources_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRING,None), None, ), # 0
+ (0, TType.BOOL, 'success', None, None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -32015,13 +30251,8 @@ class getAppModuleDeployedResources_result:
if ftype == TType.STOP:
break
if fid == 0:
- if ftype == TType.LIST:
- self.success = []
- (_etype153, _size150) = iprot.readListBegin()
- for _i154 in xrange(_size150):
- _elem155 = iprot.readString()
- self.success.append(_elem155)
- iprot.readListEnd()
+ if ftype == TType.BOOL:
+ self.success = iprot.readBool()
else:
iprot.skip(ftype)
elif fid == 1:
@@ -32057,13 +30288,10 @@ class getAppModuleDeployedResources_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAppModuleDeployedResources_result')
+ oprot.writeStructBegin('deleteApplicationModule_result')
if self.success is not None:
- oprot.writeFieldBegin('success', TType.LIST, 0)
- oprot.writeListBegin(TType.STRING, len(self.success))
- for iter156 in self.success:
- oprot.writeString(iter156)
- oprot.writeListEnd()
+ oprot.writeFieldBegin('success', TType.BOOL, 0)
+ oprot.writeBool(self.success)
oprot.writeFieldEnd()
if self.ire is not None:
oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -32108,25 +30336,25 @@ class getAppModuleDeployedResources_result:
def __ne__(self, other):
return not (self == other)
-class registerApplicationInterface_args:
+class registerApplicationDeployment_args:
"""
Attributes:
- authzToken
- gatewayId
- - applicationInterface
+ - applicationDeployment
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'gatewayId', None, None, ), # 2
- (3, TType.STRUCT, 'applicationInterface', (apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription, apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription.thrift_spec), None, ), # 3
+ (3, TType.STRUCT, 'applicationDeployment', (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription.thrift_spec), None, ), # 3
)
- def __init__(self, authzToken=None, gatewayId=None, applicationInterface=None,):
+ def __init__(self, authzToken=None, gatewayId=None, applicationDeployment=None,):
self.authzToken = authzToken
self.gatewayId = gatewayId
- self.applicationInterface = applicationInterface
+ self.applicationDeployment = applicationDeployment
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -32150,8 +30378,8 @@ class registerApplicationInterface_args:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRUCT:
- self.applicationInterface = apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
- self.applicationInterface.read(iprot)
+ self.applicationDeployment = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
+ self.applicationDeployment.read(iprot)
else:
iprot.skip(ftype)
else:
@@ -32163,7 +30391,7 @@ class registerApplicationInterface_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('registerApplicationInterface_args')
+ oprot.writeStructBegin('registerApplicationDeployment_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -32172,9 +30400,9 @@ class registerApplicationInterface_args:
oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
oprot.writeString(self.gatewayId)
oprot.writeFieldEnd()
- if self.applicationInterface is not None:
- oprot.writeFieldBegin('applicationInterface', TType.STRUCT, 3)
- self.applicationInterface.write(oprot)
+ if self.applicationDeployment is not None:
+ oprot.writeFieldBegin('applicationDeployment', TType.STRUCT, 3)
+ self.applicationDeployment.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -32184,8 +30412,8 @@ class registerApplicationInterface_args:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
if self.gatewayId is None:
raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
- if self.applicationInterface is None:
- raise TProtocol.TProtocolException(message='Required field applicationInterface is unset!')
+ if self.applicationDeployment is None:
+ raise TProtocol.TProtocolException(message='Required field applicationDeployment is unset!')
return
@@ -32193,7 +30421,7 @@ class registerApplicationInterface_args:
value = 17
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.gatewayId)
- value = (value * 31) ^ hash(self.applicationInterface)
+ value = (value * 31) ^ hash(self.applicationDeployment)
return value
def __repr__(self):
@@ -32207,7 +30435,7 @@ class registerApplicationInterface_args:
def __ne__(self, other):
return not (self == other)
-class registerApplicationInterface_result:
+class registerApplicationDeployment_result:
"""
Attributes:
- success
@@ -32279,7 +30507,7 @@ class registerApplicationInterface_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('registerApplicationInterface_result')
+ oprot.writeStructBegin('registerApplicationDeployment_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.STRING, 0)
oprot.writeString(self.success)
@@ -32327,28 +30555,22 @@ class registerApplicationInterface_result:
def __ne__(self, other):
return not (self == other)
-class cloneApplicationInterface_args:
+class getApplicationDeployment_args:
"""
Attributes:
- authzToken
- - existingAppInterfaceID
- - newApplicationName
- - gatewayId
+ - appDeploymentId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'existingAppInterfaceID', None, None, ), # 2
- (3, TType.STRING, 'newApplicationName', None, None, ), # 3
- (4, TType.STRING, 'gatewayId', None, None, ), # 4
+ (2, TType.STRING, 'appDeploymentId', None, None, ), # 2
)
- def __init__(self, authzToken=None, existingAppInterfaceID=None, newApplicationName=None, gatewayId=None,):
+ def __init__(self, authzToken=None, appDeploymentId=None,):
self.authzToken = authzToken
- self.existingAppInterfaceID = existingAppInterfaceID
- self.newApplicationName = newApplicationName
- self.gatewayId = gatewayId
+ self.appDeploymentId = appDeploymentId
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -32367,17 +30589,7 @@ class cloneApplicationInterface_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.existingAppInterfaceID = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 3:
- if ftype == TType.STRING:
- self.newApplicationName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 4:
- if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
+ self.appDeploymentId = iprot
<TRUNCATED>
[33/50] [abbrv] airavata git commit: Parameter binding for sharing
registry queries
Posted by ma...@apache.org.
Parameter binding for sharing registry queries
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/89e7e7f0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/89e7e7f0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/89e7e7f0
Branch: refs/heads/master
Commit: 89e7e7f0d47999ac7c4e7e73476fd7b8a06e5ca1
Parents: 461fdbb
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Jul 13 12:14:06 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Jul 13 12:14:06 2017 -0500
----------------------------------------------------------------------
.../db/repositories/AbstractRepository.java | 12 +++--
.../repositories/GroupMembershipRepository.java | 39 +++++++++------
.../db/repositories/SharingRepository.java | 50 +++++++++++---------
.../db/repositories/UserGroupRepository.java | 31 ++++++++----
.../db/repositories/UserRepository.java | 18 ++++---
.../server/SharingRegistryServerHandler.java | 2 +-
6 files changed, 94 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/89e7e7f0/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java
index 4869a4d..9900662 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java
@@ -29,6 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.persistence.EntityManager;
+import javax.persistence.Query;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -133,10 +134,15 @@ public abstract class AbstractRepository<T, E, Id> {
return gatewayList;
}
- public List<T> select(String queryString, int offset, int limit) throws SharingRegistryException {
+ public List<T> select(String queryString, Map<String,Object> queryParameters, int offset, int limit) throws SharingRegistryException {
int newLimit = limit < 0 ? DBConstants.SELECT_MAX_ROWS: limit;
- List resultSet = execute(entityManager -> entityManager.createQuery(queryString).setFirstResult(offset)
- .setMaxResults(newLimit).getResultList());
+ List resultSet = execute(entityManager -> {
+ Query q = entityManager.createQuery(queryString);
+ for(Map.Entry<String, Object> queryParam : queryParameters.entrySet()){
+ q.setParameter(queryParam.getKey(), queryParam.getValue());
+ }
+ return q.setFirstResult(offset).setMaxResults(newLimit).getResultList();
+ });
Mapper mapper = ObjectMapperSingleton.getInstance();
List<T> gatewayList = new ArrayList<>();
resultSet.stream().forEach(rs -> gatewayList.add(mapper.map(rs, thriftGenericClass)));
http://git-wip-us.apache.org/repos/asf/airavata/blob/89e7e7f0/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupMembershipRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupMembershipRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupMembershipRepository.java
index 2d98c89..c267dec 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupMembershipRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/GroupMembershipRepository.java
@@ -34,42 +34,51 @@ public class GroupMembershipRepository extends AbstractRepository<GroupMembershi
super(GroupMembership.class, GroupMembershipEntity.class);
}
- //TODO Replace with prepared statements
public List<User> getAllChildUsers(String domainId, String groupId) throws SharingRegistryException {
String queryString = "SELECT DISTINCT U FROM " + UserEntity.class.getSimpleName() + " U, " + GroupMembershipEntity.class.getSimpleName()
+ " GM WHERE GM." + DBConstants.GroupMembershipTable.CHILD_ID + " = U." + DBConstants.UserTable.USER_ID + " AND " +
"GM." + DBConstants.GroupMembershipTable.DOMAIN_ID + " = U." + DBConstants.UserTable.DOMAIN_ID + " AND " +
- "GM." + DBConstants.GroupMembershipTable.DOMAIN_ID + "='" + domainId + "' AND "+
- "GM." + DBConstants.GroupMembershipTable.PARENT_ID + "='" + groupId + "' AND GM." + DBConstants.GroupMembershipTable.CHILD_TYPE
- + "='" + GroupChildType.USER.toString() + "'";
+ "GM." + DBConstants.GroupMembershipTable.DOMAIN_ID + "=:" + DBConstants.GroupMembershipTable.DOMAIN_ID + " AND "+
+ "GM." + DBConstants.GroupMembershipTable.PARENT_ID + "=:" + DBConstants.GroupMembershipTable.PARENT_ID + " AND GM." + DBConstants.GroupMembershipTable.CHILD_TYPE
+ + "=:" + DBConstants.GroupMembershipTable.CHILD_TYPE;
+ Map<String,Object> queryParameters = new HashMap<>();
+ queryParameters.put(DBConstants.GroupMembershipTable.DOMAIN_ID, domainId);
+ queryParameters.put(DBConstants.GroupMembershipTable.PARENT_ID, groupId);
+ queryParameters.put(DBConstants.GroupMembershipTable.CHILD_TYPE, GroupChildType.USER.toString());
UserRepository userRepository = new UserRepository();
- List<User> users = userRepository.select(queryString, 0, -1);
+ List<User> users = userRepository.select(queryString, queryParameters, 0, -1);
return users;
}
- //TODO Replace with prepared statements
public List<UserGroup> getAllChildGroups(String domainId, String groupId) throws SharingRegistryException {
String queryString = "SELECT DISTINCT G FROM " + UserGroupEntity.class.getSimpleName() + " G, " + GroupMembershipEntity.class.getSimpleName()
+ " GM WHERE GM." + DBConstants.GroupMembershipTable.CHILD_ID + " = G." + DBConstants.UserGroupTable.GROUP_ID + " AND " +
"GM." + DBConstants.GroupMembershipTable.DOMAIN_ID + " = G." + DBConstants.UserGroupTable.DOMAIN_ID + " AND " +
- "GM." + DBConstants.GroupMembershipTable.DOMAIN_ID+"='"+domainId + "' AND "+
- "GM." + DBConstants.GroupMembershipTable.PARENT_ID+"='"+groupId + "' AND GM." + DBConstants.GroupMembershipTable.CHILD_TYPE
- + "='" + GroupChildType.GROUP.toString() + "'";
+ "GM." + DBConstants.GroupMembershipTable.DOMAIN_ID+"=:"+DBConstants.GroupMembershipTable.DOMAIN_ID + " AND "+
+ "GM." + DBConstants.GroupMembershipTable.PARENT_ID+"=:"+DBConstants.GroupMembershipTable.PARENT_ID + " AND GM." + DBConstants.GroupMembershipTable.CHILD_TYPE
+ + "=:" + DBConstants.GroupMembershipTable.CHILD_TYPE;
+ Map<String,Object> queryParameters = new HashMap<>();
+ queryParameters.put(DBConstants.GroupMembershipTable.DOMAIN_ID, domainId);
+ queryParameters.put(DBConstants.GroupMembershipTable.PARENT_ID, groupId);
+ queryParameters.put(DBConstants.GroupMembershipTable.CHILD_TYPE, GroupChildType.GROUP.toString());
UserGroupRepository userGroupRepository = new UserGroupRepository();
- List<UserGroup> groups = userGroupRepository.select(queryString, 0, -1);
+ List<UserGroup> groups = userGroupRepository.select(queryString, queryParameters,0, -1);
return groups;
}
- //TODO Replace with prepared statements
public List<UserGroup> getAllMemberGroupsForUser(String domainId, String userId) throws SharingRegistryException {
String queryString = "SELECT DISTINCT G FROM " + UserGroupEntity.class.getSimpleName() + " G, " + GroupMembershipEntity.class.getSimpleName()
+ " GM WHERE GM." + DBConstants.GroupMembershipTable.PARENT_ID + " = G." + DBConstants.UserGroupTable.GROUP_ID + " AND " +
"GM." + DBConstants.GroupMembershipTable.DOMAIN_ID + " = G." + DBConstants.UserGroupTable.DOMAIN_ID + " AND " +
- "GM." + DBConstants.GroupMembershipTable.DOMAIN_ID+"='"+domainId + "' AND "+
- "GM." + DBConstants.GroupMembershipTable.CHILD_ID+"='"+userId + "' AND GM." + DBConstants.GroupMembershipTable.CHILD_TYPE
- + "='" + GroupChildType.USER.toString() + "'";
+ "GM." + DBConstants.GroupMembershipTable.DOMAIN_ID+"=:"+DBConstants.GroupMembershipTable.DOMAIN_ID + " AND "+
+ "GM." + DBConstants.GroupMembershipTable.CHILD_ID+"=:"+DBConstants.GroupMembershipTable.CHILD_ID + " AND GM." + DBConstants.GroupMembershipTable.CHILD_TYPE
+ + "=:" + DBConstants.GroupMembershipTable.CHILD_TYPE;
+ Map<String,Object> queryParameters = new HashMap<>();
+ queryParameters.put(DBConstants.GroupMembershipTable.DOMAIN_ID, domainId);
+ queryParameters.put(DBConstants.GroupMembershipTable.CHILD_ID, userId);
+ queryParameters.put(DBConstants.GroupMembershipTable.CHILD_TYPE, GroupChildType.USER.toString());
UserGroupRepository userGroupRepository = new UserGroupRepository();
- List<UserGroup> groups = userGroupRepository.select(queryString, 0, -1);
+ List<UserGroup> groups = userGroupRepository.select(queryString, queryParameters, 0, -1);
return groups;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/89e7e7f0/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
index 6752fc8..cfe0bf0 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
@@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
public class SharingRepository extends AbstractRepository<Sharing, SharingEntity, SharingPK> {
private final static Logger logger = LoggerFactory.getLogger(SharingRepository.class);
@@ -48,46 +49,49 @@ public class SharingRepository extends AbstractRepository<Sharing, SharingEntity
return select(filters, 0, -1);
}
- //TODO Replace with prepared statements
public List<Sharing> getCascadingPermissionsForEntity(String domainId, String entityId) throws SharingRegistryException {
String query = "SELECT DISTINCT p from " + SharingEntity.class.getSimpleName() + " as p";
query += " WHERE ";
- query += "p." + DBConstants.SharingTable.DOMAIN_ID + " = '" + domainId + "' AND ";
- query += "p." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId + "' AND ";
+ query += "p." + DBConstants.SharingTable.DOMAIN_ID + " = :" + DBConstants.SharingTable.DOMAIN_ID + " AND ";
+ query += "p." + DBConstants.SharingTable.ENTITY_ID + " = :" + DBConstants.SharingTable.ENTITY_ID + " AND ";
query += "p." + DBConstants.SharingTable.SHARING_TYPE + " IN('" + SharingType.DIRECT_CASCADING.toString()
+ "', '" + SharingType.INDIRECT_CASCADING + "') ";
query += " ORDER BY p.createdTime DESC";
- return select(query, 0, -1);
+ Map<String,Object> queryParameters = new HashMap<>();
+ queryParameters.put(DBConstants.SharingTable.DOMAIN_ID, domainId);
+ queryParameters.put(DBConstants.SharingTable.ENTITY_ID, entityId);
+ return select(query, queryParameters, 0, -1);
}
- //TODO Replace with prepared statements
public boolean hasAccess(String domainId, String entityId, List<String> groupIds, List<String> permissionTypeIds) throws SharingRegistryException {
+ Map<String,Object> queryParameters = new HashMap<>();
String query = "SELECT p from " + SharingEntity.class.getSimpleName() + " as p";
query += " WHERE ";
- query += "p." + DBConstants.SharingTable.DOMAIN_ID + " = '" + domainId + "' AND ";
- query += "p." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId + "' AND ";
- String permissionTypeIdString = "'";
- for(String permissionId : permissionTypeIds)
- permissionTypeIdString += permissionId + "','";
- permissionTypeIdString = permissionTypeIdString.substring(0, permissionTypeIdString.length()-2);
- query += "p." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " IN(" + permissionTypeIdString + ") AND ";
- String groupIdString = "'";
- for(String groupId : groupIds)
- groupIdString += groupId + "','";
- groupIdString = groupIdString.substring(0, groupIdString.length()-2);
- query += "p." + DBConstants.SharingTable.GROUP_ID + " IN(" + groupIdString + ") ";
+ query += "p." + DBConstants.SharingTable.DOMAIN_ID + " = :" + DBConstants.SharingTable.DOMAIN_ID + " AND ";
+ query += "p." + DBConstants.SharingTable.ENTITY_ID + " = :" + DBConstants.SharingTable.ENTITY_ID + " AND ";
+ queryParameters.put(DBConstants.SharingTable.DOMAIN_ID, domainId);
+ queryParameters.put(DBConstants.SharingTable.ENTITY_ID, entityId);
+ query += "p." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " IN :" + DBConstants.SharingTable.PERMISSION_TYPE_ID + " AND ";
+ queryParameters.put(DBConstants.SharingTable.PERMISSION_TYPE_ID, permissionTypeIds);
+ query += "p." + DBConstants.SharingTable.GROUP_ID + " IN :" + DBConstants.SharingTable.GROUP_ID + " ";
+ queryParameters.put(DBConstants.SharingTable.GROUP_ID, groupIds);
query += " ORDER BY p.createdTime DESC";
- return select(query, 0, -1).size() > 0;
+ return select(query, queryParameters, 0, -1).size() > 0;
}
public int getSharedCount(String domainId, String entityId) throws SharingRegistryException {
+ Map<String,Object> queryParameters = new HashMap<>();
String query = "SELECT p from " + SharingEntity.class.getSimpleName() + " as p";
query += " WHERE ";
- query += "p." + DBConstants.SharingTable.DOMAIN_ID + " = '" + domainId + "' AND ";
- query += "p." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId + "' AND ";
+ query += "p." + DBConstants.SharingTable.DOMAIN_ID + " = :" + DBConstants.SharingTable.DOMAIN_ID + " AND ";
+ queryParameters.put(DBConstants.SharingTable.DOMAIN_ID, domainId);
+ query += "p." + DBConstants.SharingTable.ENTITY_ID + " = :" + DBConstants.SharingTable.ENTITY_ID + " AND ";
+ queryParameters.put(DBConstants.SharingTable.ENTITY_ID, entityId);
String permissionTypeIdString = (new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId);
- query += "p." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " <> '" + permissionTypeIdString + "' AND ";
- query += "p." + DBConstants.SharingTable.SHARING_TYPE + " <> '" + SharingType.INDIRECT_CASCADING + "'";
- return select(query, 0, -1).size();
+ query += "p." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " <> :" + DBConstants.SharingTable.PERMISSION_TYPE_ID + " AND ";
+ queryParameters.put(DBConstants.SharingTable.PERMISSION_TYPE_ID, permissionTypeIdString);
+ query += "p." + DBConstants.SharingTable.SHARING_TYPE + " <> :" + DBConstants.SharingTable.SHARING_TYPE;
+ queryParameters.put(DBConstants.SharingTable.SHARING_TYPE, SharingType.INDIRECT_CASCADING.toString());
+ return select(query, queryParameters, 0, -1).size();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/89e7e7f0/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java
index 2650288..25dda5d 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java
@@ -29,7 +29,9 @@ import org.apache.airavata.sharing.registry.models.UserGroup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
public class UserGroupRepository extends AbstractRepository<UserGroup, UserGroupEntity, UserGroupPK> {
private final static Logger logger = LoggerFactory.getLogger(UserGroupRepository.class);
@@ -38,18 +40,22 @@ public class UserGroupRepository extends AbstractRepository<UserGroup, UserGroup
super(UserGroup.class, UserGroupEntity.class);
}
- //TODO Replace with prepared statements
public List<UserGroup> getAccessibleGroups(String domainId, String entityId, String permissionTypeId) throws SharingRegistryException {
String query = "SELECT DISTINCT g from " + UserGroupEntity.class.getSimpleName() + " g, " + SharingEntity.class.getSimpleName() + " s";
query += " WHERE ";
query += "g." + DBConstants.UserGroupTable.GROUP_ID + " = s." + DBConstants.SharingTable.GROUP_ID + " AND ";
query += "g." + DBConstants.UserGroupTable.DOMAIN_ID + " = s." + DBConstants.SharingTable.DOMAIN_ID + " AND ";
- query += "g." + DBConstants.UserGroupTable.DOMAIN_ID + " = '" + domainId + "' AND ";
- query += "s." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId + "' AND ";
- query += "s." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " = '" + permissionTypeId + "' AND ";
- query += "g." + DBConstants.UserGroupTable.GROUP_CARDINALITY + " = '" + GroupCardinality.MULTI_USER.toString() + "'";
+ query += "g." + DBConstants.UserGroupTable.DOMAIN_ID + " = :" + DBConstants.UserGroupTable.DOMAIN_ID + " AND ";
+ query += "s." + DBConstants.SharingTable.ENTITY_ID + " = :" + DBConstants.SharingTable.ENTITY_ID + " AND ";
+ query += "s." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " = :" + DBConstants.SharingTable.PERMISSION_TYPE_ID + " AND ";
+ query += "g." + DBConstants.UserGroupTable.GROUP_CARDINALITY + " = :" + DBConstants.UserGroupTable.GROUP_CARDINALITY;
query += " ORDER BY s.createdTime DESC";
- return select(query, 0, -1);
+ Map<String,Object> queryParameters = new HashMap<>();
+ queryParameters.put(DBConstants.UserGroupTable.DOMAIN_ID, domainId);
+ queryParameters.put(DBConstants.SharingTable.ENTITY_ID, entityId);
+ queryParameters.put(DBConstants.SharingTable.PERMISSION_TYPE_ID, permissionTypeId);
+ queryParameters.put(DBConstants.UserGroupTable.GROUP_CARDINALITY, GroupCardinality.MULTI_USER.toString());
+ return select(query, queryParameters, 0, -1);
}
@@ -59,10 +65,15 @@ public class UserGroupRepository extends AbstractRepository<UserGroup, UserGroup
query += " WHERE ";
query += "g." + DBConstants.UserGroupTable.GROUP_ID + " = s." + DBConstants.SharingTable.GROUP_ID + " AND ";
query += "g." + DBConstants.UserGroupTable.DOMAIN_ID + " = s." + DBConstants.SharingTable.DOMAIN_ID + " AND ";
- query += "g." + DBConstants.UserGroupTable.DOMAIN_ID + " = '" + domainId + "' AND ";
- query += "s." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId + "' AND ";
- query += "s." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " <> '" + (new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId) + "'";
+ query += "g." + DBConstants.UserGroupTable.DOMAIN_ID + " = :" + DBConstants.UserGroupTable.DOMAIN_ID + " AND ";
+ query += "s." + DBConstants.SharingTable.ENTITY_ID + " = :" + DBConstants.SharingTable.ENTITY_ID + " AND ";
+ query += "s." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " <> :" + DBConstants.SharingTable.PERMISSION_TYPE_ID;
query += " ORDER BY s.createdTime DESC";
- return select(query, 0, -1).size() != 0;
+ Map<String,Object> queryParameters = new HashMap<>();
+ queryParameters.put(DBConstants.UserGroupTable.DOMAIN_ID, domainId);
+ queryParameters.put(DBConstants.SharingTable.ENTITY_ID, entityId);
+ String ownerPermissionTypeIdForDomain = (new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId);
+ queryParameters.put(DBConstants.SharingTable.PERMISSION_TYPE_ID, ownerPermissionTypeIdForDomain);
+ return select(query, queryParameters, 0, -1).size() != 0;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/89e7e7f0/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
index ea518ca..9bab5cc 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
@@ -29,7 +29,9 @@ import org.apache.airavata.sharing.registry.models.User;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
public class UserRepository extends AbstractRepository<User, UserEntity, UserPK> {
private final static Logger logger = LoggerFactory.getLogger(UserRepository.class);
@@ -39,21 +41,25 @@ public class UserRepository extends AbstractRepository<User, UserEntity, UserPK>
}
- //TODO Replace with prepared statements
public List<User> getAccessibleUsers(String domainId, String entityId, String permissionTypeId) throws SharingRegistryException {
+ Map<String,Object> queryParameters = new HashMap<>();
String query = "SELECT DISTINCT u from " + UserEntity.class.getSimpleName() + " u, " + SharingEntity.class.getSimpleName() + " s";
query += " WHERE ";
query += "u." + DBConstants.UserTable.USER_ID + " = s." + DBConstants.SharingTable.GROUP_ID + " AND ";
query += "u." + DBConstants.UserTable.DOMAIN_ID + " = s." + DBConstants.SharingTable.DOMAIN_ID + " AND ";
- query += "u." + DBConstants.UserTable.DOMAIN_ID + " = '" + domainId + "' AND ";
- query += "s." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId + "' AND ";
- query += "s." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " = '" + permissionTypeId + "'";
+ query += "u." + DBConstants.UserTable.DOMAIN_ID + " = :" + DBConstants.UserTable.DOMAIN_ID + " AND ";
+ query += "s." + DBConstants.SharingTable.ENTITY_ID + " = :" + DBConstants.SharingTable.ENTITY_ID + " AND ";
+ query += "s." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " = :" + DBConstants.SharingTable.PERMISSION_TYPE_ID;
+ queryParameters.put(DBConstants.UserTable.DOMAIN_ID, domainId);
+ queryParameters.put(DBConstants.SharingTable.ENTITY_ID, entityId);
+ queryParameters.put(DBConstants.SharingTable.PERMISSION_TYPE_ID, permissionTypeId);
if(permissionTypeId.equals((new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId))){
- query += "AND s." + DBConstants.SharingTable.SHARING_TYPE + " LIKE 'DIRECT_%'";
+ query += " AND s." + DBConstants.SharingTable.SHARING_TYPE + " LIKE :" + DBConstants.SharingTable.SHARING_TYPE;
+ queryParameters.put(DBConstants.SharingTable.SHARING_TYPE, "DIRECT_%");
}
query += " ORDER BY s.createdTime DESC";
- return select(query, 0, -1);
+ return select(query, queryParameters,0, -1);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/89e7e7f0/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
index 819dd16..c1fb86a 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
@@ -567,7 +567,7 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
try{
HashMap<String, String> filters = new HashMap<>();
filters.put(DBConstants.EntityTypeTable.DOMAIN_ID, domain);
- return (new EntityTypeRepository()).select(domain, offset, limit);
+ return (new EntityTypeRepository()).select(filters, offset, limit);
}catch (Throwable ex) {
logger.error(ex.getMessage(), ex);
throw new SharingRegistryException().setMessage(ex.getMessage() + " Stack trace:" + ExceptionUtils.getStackTrace(ex));
[36/50] [abbrv] airavata git commit: new-mexico-state and
alabama-birmingham ssh keys
Posted by ma...@apache.org.
new-mexico-state and alabama-birmingham ssh keys
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a0a66dc5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a0a66dc5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a0a66dc5
Branch: refs/heads/master
Commit: a0a66dc53a79d98906159b87ec13454c7759de10
Parents: 8df51da
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Jul 13 18:13:20 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Jul 13 18:13:20 2017 -0500
----------------------------------------------------------------------
.../scigap/production/pga_config/newmexicostate/vars.yml | 2 +-
.../ansible/inventories/scigap/production/pga_config/uab/vars.yml | 2 +-
dev-tools/ansible/pga-scigap-prod.yml | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a0a66dc5/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
index 52b38a9..7254a1f 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
@@ -48,7 +48,7 @@ gateway_id: "new-mexico-state"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/new-mexico-state"
gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFSg9IEgsXlGhgPkj4hPuON30rbE3/gUUn4K3NVvBFKLyQQ8Pm/NR6dZmFglQR1HxBRSnq4WmH3EVyxHuT7MkQDAjTkclEuhaRjcYN0nua8g4dI9SgO9DeqbOyurVIuw/YChP5nC+6/ubMyzYPr6Z5xU5QHZI/QlVG4nz3joMIKkRXt/bsaEvv+/nzED/j6FTdK6P6dg1ESkNVZUPqhtWpwuC28Et7/86jcEObJedwx8geLoxKogPZ6kqO+Q/WUHDtMpFYtwuPaiYuN3Pb/GCvnDRsSoFmtRU+UH1UIdEy0piYUuBW+5aCv/PbH/UtHFg1Y1942TYCXv4rl1i/KW1z"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCRYbUBGqEqUkcsAkQPetJDTTIWGGFbB7DBzvSQUT26SqHpRZQR3J4lCvzmH8/T3KoQC4uxnph5RpiemMeoQIxIJ8hH9Pod3Z0xK2qu6b/jDrbX+UbepkBl8Xc8aE6UWAX4C6rnn1X4ktqLp9GDE2G9CN4+pZxDanK5h7+68qsiz/rpzUEHVDPzo1A5YRPE2cFgOp4s207zE/GaXH2A/+vucdbTmoy2hND3uYkaaMe4ygMlakDDlkMTl5dlgaHuoqVu0pOSnsUimpxV87LpXqWaD1d6G+IVW1CNjKtVBvz/z4aFMLWhqWLYZlLpsoGi4ZqXf3u0A4ajL+6uXgiGuIRX"
## Portal related variables
super_admin_portal: "false"
http://git-wip-us.apache.org/repos/asf/airavata/blob/a0a66dc5/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
index c838723..7670791 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
@@ -48,7 +48,7 @@ gateway_id: "alabama-birmingham"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/alabama-birmingham"
gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFSg9IEgsXlGhgPkj4hPuON30rbE3/gUUn4K3NVvBFKLyQQ8Pm/NR6dZmFglQR1HxBRSnq4WmH3EVyxHuT7MkQDAjTkclEuhaRjcYN0nua8g4dI9SgO9DeqbOyurVIuw/YChP5nC+6/ubMyzYPr6Z5xU5QHZI/QlVG4nz3joMIKkRXt/bsaEvv+/nzED/j6FTdK6P6dg1ESkNVZUPqhtWpwuC28Et7/86jcEObJedwx8geLoxKogPZ6kqO+Q/WUHDtMpFYtwuPaiYuN3Pb/GCvnDRsSoFmtRU+UH1UIdEy0piYUuBW+5aCv/PbH/UtHFg1Y1942TYCXv4rl1i/KW1z"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA5artIAZPYC9GmFvb7HpvwbHpYoSXN0xJkHWoz8joWWBA3wW2De2Q72Rk5CYElpOLbrjJCsFK3YxiCQYYRl5R4VFadw0agGIxn0PssCR5sIUDpEe4ezQmEx3rA3RUEvA3uZ6SjzjuwqQtEKMvARP4mCwEC/vR0eLWe1/ZDLF71w7zVZAmt+K/Z/Dnas/NTE7yV9XadD2TctFWmBwMNQSEfSsDfW39cabwEghanoUMGTYT9f4EL6x4zOzdbcHl1aF5QlGHf91hQCwfxH6FSZYmu+HhcKshbOI/I0u+UDKV+CX/1SxUZNpwpJ3ESR4ke7jdgP+GTwwl4bBSTn738m9t"
## Portal related variables
super_admin_portal: "false"
http://git-wip-us.apache.org/repos/asf/airavata/blob/a0a66dc5/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index f5de405..ea2fea1 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -27,6 +27,7 @@
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoconfinement"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoshape"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/newmexicostate"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
@@ -37,6 +38,7 @@
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/uab"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah"
[21/50] [abbrv] airavata git commit: Adding DBEventManagerRunner to
server start
Posted by ma...@apache.org.
Adding DBEventManagerRunner to server start
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e72ddf0b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e72ddf0b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e72ddf0b
Branch: refs/heads/master
Commit: e72ddf0b3b2060356618c10113d4356219708317
Parents: d03c724
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Jul 11 11:34:35 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Jul 11 12:28:02 2017 -0500
----------------------------------------------------------------------
.../templates/airavata-server.properties.j2 | 5 ++
.../templates/airavata-server.properties.j2 | 5 ++
.../main/resources/airavata-server.properties | 7 +-
modules/db-event-manager/pom.xml | 2 +-
.../db/event/manager/DBEventManagerRunner.java | 67 +++++++++++++++++++-
modules/distribution/pom.xml | 5 ++
.../org/apache/airavata/server/ServerMain.java | 4 +-
pom.xml | 1 +
8 files changed, 92 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e72ddf0b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
index 2e87706..ab0ee9f 100644
--- a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
@@ -328,3 +328,8 @@ iam.server.url={{ iam_server_url }}
new.gateway.admin.temp.password=Password@123
iam.server.super.admin.username={{ iam_server_super_admin_username }}
iam.server.super.admin.password={{ iam_server_super_admin_password }}
+
+###########################################################################
+# DB Event Manager Runner
+###########################################################################
+db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
http://git-wip-us.apache.org/repos/asf/airavata/blob/e72ddf0b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
index c1d5388..0ed4071 100644
--- a/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
@@ -295,3 +295,8 @@ trust.store.password=airavata
authz.cache.enabled=true
authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
in.memory.cache.size=1000
+
+###########################################################################
+# DB Event Manager Runner
+###########################################################################
+db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
http://git-wip-us.apache.org/repos/asf/airavata/blob/e72ddf0b/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index 2be81ef..bf0bc6f 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -349,4 +349,9 @@ profile.service.jdbc.password=airavata
iam.server.url=https://iam.scigap.org/auth
new.gateway.admin.temp.password=Password@123
iam.server.super.admin.username=admin
-iam.server.super.admin.password=password
\ No newline at end of file
+iam.server.super.admin.password=password
+
+###########################################################################
+# DB Event Manager Runner
+###########################################################################
+db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/e72ddf0b/modules/db-event-manager/pom.xml
----------------------------------------------------------------------
diff --git a/modules/db-event-manager/pom.xml b/modules/db-event-manager/pom.xml
index 3069fb6..ef6b89d 100644
--- a/modules/db-event-manager/pom.xml
+++ b/modules/db-event-manager/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>db-event-manager</artifactId>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<name>Airavata DB Event Manager</name>
<url>http://airavata.apache.org/</url>
http://git-wip-us.apache.org/repos/asf/airavata/blob/e72ddf0b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/DBEventManagerRunner.java
----------------------------------------------------------------------
diff --git a/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/DBEventManagerRunner.java b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/DBEventManagerRunner.java
index 88e0455..e45646f 100644
--- a/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/DBEventManagerRunner.java
+++ b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/DBEventManagerRunner.java
@@ -21,6 +21,7 @@
package org.apache.airavata.db.event.manager;
import org.apache.airavata.common.exception.AiravataException;
+import org.apache.airavata.common.utils.IServer;
import org.apache.airavata.db.event.manager.messaging.DBEventManagerMessagingFactory;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
@@ -28,10 +29,15 @@ import org.apache.log4j.Logger;
/**
* Created by Ajinkya on 3/29/17.
*/
-public class DBEventManagerRunner {
+public class DBEventManagerRunner implements IServer {
private static final Logger log = LogManager.getLogger(DBEventManagerRunner.class);
+ private static final String SERVER_NAME = "DB Event Manager";
+ private static final String SERVER_VERSION = "1.0";
+
+ private ServerStatus status;
+
/**
* Start required messaging utilities
*/
@@ -75,4 +81,63 @@ public class DBEventManagerRunner {
}
}
+ @Override
+ public String getName() {
+ return SERVER_NAME;
+ }
+
+ @Override
+ public String getVersion() {
+ return SERVER_VERSION;
+ }
+
+ @Override
+ public void start() throws Exception {
+
+ try {
+ Runnable runner = new Runnable() {
+ @Override
+ public void run() {
+ DBEventManagerRunner dBEventManagerRunner = new DBEventManagerRunner();
+ dBEventManagerRunner.startDBEventManagerRunner();
+ }
+ };
+
+ // start the worker thread
+ log.info("Starting the DB Event Manager runner.");
+ new Thread(runner).start();
+ setStatus(ServerStatus.STARTED);
+ } catch (Exception ex) {
+ log.error("Something went wrong with the DB Event Manager runner. Error: " + ex, ex);
+ setStatus(ServerStatus.FAILED);
+ }
+ }
+
+ @Override
+ public void stop() throws Exception {
+
+ // TODO: implement stopping the DBEventManager
+ }
+
+ @Override
+ public void restart() throws Exception {
+
+ stop();
+ start();
+ }
+
+ @Override
+ public void configure() throws Exception {
+
+ }
+
+ @Override
+ public ServerStatus getStatus() throws Exception {
+ return status;
+ }
+
+ private void setStatus(ServerStatus stat){
+ status=stat;
+ status.updateTime();
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/e72ddf0b/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 336820c..de9cc8d 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -481,6 +481,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>db-event-manager</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<url>http://airavata.apache.org/</url>
http://git-wip-us.apache.org/repos/asf/airavata/blob/e72ddf0b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index c041622..36d317b 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -62,8 +62,8 @@ public class ServerMain {
private static final String SHARING_SERVER = "sharing_server";
private static final String GFAC_SERVER = "gfac";
private static final String ORCHESTRATOR = "orchestrator";
- private static final String USER_PROFILE = "user_profile";
private static final String PROFILE_SERVICE = "profile_service";
+ private static final String DB_EVENT_MANAGER = "db_event_manager";
private static ServerCnxnFactory cnxnFactory;
// private static boolean shutdownHookCalledBefore=false;
@@ -120,6 +120,7 @@ public class ServerMain {
serverList.add(ORCHESTRATOR);
serverList.add(GFAC_SERVER);
serverList.add(PROFILE_SERVICE);
+ serverList.add(DB_EVENT_MANAGER);
} else if (serverList.indexOf(API_ORCH) > -1) {
serverList.clear();
serverList.add(REGISTRY_SERVER); // registry server should start before everything
@@ -128,6 +129,7 @@ public class ServerMain {
serverList.add(API_SERVER);
serverList.add(ORCHESTRATOR);
serverList.add(PROFILE_SERVICE);
+ serverList.add(DB_EVENT_MANAGER);
} else if (serverList.indexOf(EXECUTION) > -1) {
serverList.clear();
serverList.add(GFAC_SERVER);
http://git-wip-us.apache.org/repos/asf/airavata/blob/e72ddf0b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3079a5d..9c78519 100644
--- a/pom.xml
+++ b/pom.xml
@@ -687,6 +687,7 @@
<module>modules/cluster-monitoring</module>
<module>modules/user-profile-migration</module>
<module>airavata-services</module>
+ <module>modules/db-event-manager</module>
<!-- Deprecated Modules-->
<!--<module>modules/integration-tests</module>-->
<!--<module>modules/workflow-model</module>-->
[43/50] [abbrv] airavata git commit: updating some of the group
management API methods in AiravataServerHandler
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.cpp
index 284f0d4..c6adfd2 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.cpp
@@ -37,7 +37,8 @@ int _kTenantApprovalStatusValues[] = {
TenantApprovalStatus::DEACTIVATED,
TenantApprovalStatus::CANCELLED,
TenantApprovalStatus::DENIED,
- TenantApprovalStatus::CREATED
+ TenantApprovalStatus::CREATED,
+ TenantApprovalStatus::DEPLOYED
};
const char* _kTenantApprovalStatusNames[] = {
"REQUESTED",
@@ -46,9 +47,296 @@ const char* _kTenantApprovalStatusNames[] = {
"DEACTIVATED",
"CANCELLED",
"DENIED",
- "CREATED"
+ "CREATED",
+ "DEPLOYED"
};
-const std::map<int, const char*> _TenantApprovalStatus_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kTenantApprovalStatusValues, _kTenantApprovalStatusNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _TenantApprovalStatus_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, _kTenantApprovalStatusValues, _kTenantApprovalStatusNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+
+TenantPreferences::~TenantPreferences() throw() {
+}
+
+
+void TenantPreferences::__set_tenantAdminFirstName(const std::string& val) {
+ this->tenantAdminFirstName = val;
+__isset.tenantAdminFirstName = true;
+}
+
+void TenantPreferences::__set_tenantAdminLastName(const std::string& val) {
+ this->tenantAdminLastName = val;
+__isset.tenantAdminLastName = true;
+}
+
+void TenantPreferences::__set_tenantAdminEmail(const std::string& val) {
+ this->tenantAdminEmail = val;
+__isset.tenantAdminEmail = true;
+}
+
+uint32_t TenantPreferences::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 10:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->tenantAdminFirstName);
+ this->__isset.tenantAdminFirstName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 11:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->tenantAdminLastName);
+ this->__isset.tenantAdminLastName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 12:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->tenantAdminEmail);
+ this->__isset.tenantAdminEmail = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t TenantPreferences::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("TenantPreferences");
+
+ if (this->__isset.tenantAdminFirstName) {
+ xfer += oprot->writeFieldBegin("tenantAdminFirstName", ::apache::thrift::protocol::T_STRING, 10);
+ xfer += oprot->writeString(this->tenantAdminFirstName);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.tenantAdminLastName) {
+ xfer += oprot->writeFieldBegin("tenantAdminLastName", ::apache::thrift::protocol::T_STRING, 11);
+ xfer += oprot->writeString(this->tenantAdminLastName);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.tenantAdminEmail) {
+ xfer += oprot->writeFieldBegin("tenantAdminEmail", ::apache::thrift::protocol::T_STRING, 12);
+ xfer += oprot->writeString(this->tenantAdminEmail);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+void swap(TenantPreferences &a, TenantPreferences &b) {
+ using ::std::swap;
+ swap(a.tenantAdminFirstName, b.tenantAdminFirstName);
+ swap(a.tenantAdminLastName, b.tenantAdminLastName);
+ swap(a.tenantAdminEmail, b.tenantAdminEmail);
+ swap(a.__isset, b.__isset);
+}
+
+TenantPreferences::TenantPreferences(const TenantPreferences& other0) {
+ tenantAdminFirstName = other0.tenantAdminFirstName;
+ tenantAdminLastName = other0.tenantAdminLastName;
+ tenantAdminEmail = other0.tenantAdminEmail;
+ __isset = other0.__isset;
+}
+TenantPreferences& TenantPreferences::operator=(const TenantPreferences& other1) {
+ tenantAdminFirstName = other1.tenantAdminFirstName;
+ tenantAdminLastName = other1.tenantAdminLastName;
+ tenantAdminEmail = other1.tenantAdminEmail;
+ __isset = other1.__isset;
+ return *this;
+}
+void TenantPreferences::printTo(std::ostream& out) const {
+ using ::apache::thrift::to_string;
+ out << "TenantPreferences(";
+ out << "tenantAdminFirstName="; (__isset.tenantAdminFirstName ? (out << to_string(tenantAdminFirstName)) : (out << "<null>"));
+ out << ", " << "tenantAdminLastName="; (__isset.tenantAdminLastName ? (out << to_string(tenantAdminLastName)) : (out << "<null>"));
+ out << ", " << "tenantAdminEmail="; (__isset.tenantAdminEmail ? (out << to_string(tenantAdminEmail)) : (out << "<null>"));
+ out << ")";
+}
+
+
+TenantConfig::~TenantConfig() throw() {
+}
+
+
+void TenantConfig::__set_oauthClientId(const std::string& val) {
+ this->oauthClientId = val;
+__isset.oauthClientId = true;
+}
+
+void TenantConfig::__set_oauthClientSecret(const std::string& val) {
+ this->oauthClientSecret = val;
+__isset.oauthClientSecret = true;
+}
+
+void TenantConfig::__set_identityServerUserName(const std::string& val) {
+ this->identityServerUserName = val;
+__isset.identityServerUserName = true;
+}
+
+void TenantConfig::__set_identityServerPasswordToken(const std::string& val) {
+ this->identityServerPasswordToken = val;
+__isset.identityServerPasswordToken = true;
+}
+
+uint32_t TenantConfig::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 16:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->oauthClientId);
+ this->__isset.oauthClientId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 17:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->oauthClientSecret);
+ this->__isset.oauthClientSecret = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 13:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->identityServerUserName);
+ this->__isset.identityServerUserName = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 14:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->identityServerPasswordToken);
+ this->__isset.identityServerPasswordToken = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t TenantConfig::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+ xfer += oprot->writeStructBegin("TenantConfig");
+
+ if (this->__isset.identityServerUserName) {
+ xfer += oprot->writeFieldBegin("identityServerUserName", ::apache::thrift::protocol::T_STRING, 13);
+ xfer += oprot->writeString(this->identityServerUserName);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.identityServerPasswordToken) {
+ xfer += oprot->writeFieldBegin("identityServerPasswordToken", ::apache::thrift::protocol::T_STRING, 14);
+ xfer += oprot->writeString(this->identityServerPasswordToken);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.oauthClientId) {
+ xfer += oprot->writeFieldBegin("oauthClientId", ::apache::thrift::protocol::T_STRING, 16);
+ xfer += oprot->writeString(this->oauthClientId);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.oauthClientSecret) {
+ xfer += oprot->writeFieldBegin("oauthClientSecret", ::apache::thrift::protocol::T_STRING, 17);
+ xfer += oprot->writeString(this->oauthClientSecret);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+void swap(TenantConfig &a, TenantConfig &b) {
+ using ::std::swap;
+ swap(a.oauthClientId, b.oauthClientId);
+ swap(a.oauthClientSecret, b.oauthClientSecret);
+ swap(a.identityServerUserName, b.identityServerUserName);
+ swap(a.identityServerPasswordToken, b.identityServerPasswordToken);
+ swap(a.__isset, b.__isset);
+}
+
+TenantConfig::TenantConfig(const TenantConfig& other2) {
+ oauthClientId = other2.oauthClientId;
+ oauthClientSecret = other2.oauthClientSecret;
+ identityServerUserName = other2.identityServerUserName;
+ identityServerPasswordToken = other2.identityServerPasswordToken;
+ __isset = other2.__isset;
+}
+TenantConfig& TenantConfig::operator=(const TenantConfig& other3) {
+ oauthClientId = other3.oauthClientId;
+ oauthClientSecret = other3.oauthClientSecret;
+ identityServerUserName = other3.identityServerUserName;
+ identityServerPasswordToken = other3.identityServerPasswordToken;
+ __isset = other3.__isset;
+ return *this;
+}
+void TenantConfig::printTo(std::ostream& out) const {
+ using ::apache::thrift::to_string;
+ out << "TenantConfig(";
+ out << "oauthClientId="; (__isset.oauthClientId ? (out << to_string(oauthClientId)) : (out << "<null>"));
+ out << ", " << "oauthClientSecret="; (__isset.oauthClientSecret ? (out << to_string(oauthClientSecret)) : (out << "<null>"));
+ out << ", " << "identityServerUserName="; (__isset.identityServerUserName ? (out << to_string(identityServerUserName)) : (out << "<null>"));
+ out << ", " << "identityServerPasswordToken="; (__isset.identityServerPasswordToken ? (out << to_string(identityServerPasswordToken)) : (out << "<null>"));
+ out << ")";
+}
Tenant::~Tenant() throw() {
@@ -98,46 +386,11 @@ void Tenant::__set_reviewProposalDescription(const std::string& val) {
__isset.reviewProposalDescription = true;
}
-void Tenant::__set_tenantAdminFirstName(const std::string& val) {
- this->tenantAdminFirstName = val;
-__isset.tenantAdminFirstName = true;
-}
-
-void Tenant::__set_tenantAdminLastName(const std::string& val) {
- this->tenantAdminLastName = val;
-__isset.tenantAdminLastName = true;
-}
-
-void Tenant::__set_tenantAdminEmail(const std::string& val) {
- this->tenantAdminEmail = val;
-__isset.tenantAdminEmail = true;
-}
-
-void Tenant::__set_identityServerUserName(const std::string& val) {
- this->identityServerUserName = val;
-__isset.identityServerUserName = true;
-}
-
-void Tenant::__set_identityServerPasswordToken(const std::string& val) {
- this->identityServerPasswordToken = val;
-__isset.identityServerPasswordToken = true;
-}
-
void Tenant::__set_declinedReason(const std::string& val) {
this->declinedReason = val;
__isset.declinedReason = true;
}
-void Tenant::__set_oauthClientId(const std::string& val) {
- this->oauthClientId = val;
-__isset.oauthClientId = true;
-}
-
-void Tenant::__set_oauthClientSecret(const std::string& val) {
- this->oauthClientSecret = val;
-__isset.oauthClientSecret = true;
-}
-
void Tenant::__set_requestCreationTime(const int64_t val) {
this->requestCreationTime = val;
__isset.requestCreationTime = true;
@@ -181,9 +434,9 @@ uint32_t Tenant::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast0;
- xfer += iprot->readI32(ecast0);
- this->tenantApprovalStatus = (TenantApprovalStatus::type)ecast0;
+ int32_t ecast4;
+ xfer += iprot->readI32(ecast4);
+ this->tenantApprovalStatus = (TenantApprovalStatus::type)ecast4;
isset_tenantApprovalStatus = true;
} else {
xfer += iprot->skip(ftype);
@@ -245,46 +498,6 @@ uint32_t Tenant::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 10:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->tenantAdminFirstName);
- this->__isset.tenantAdminFirstName = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 11:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->tenantAdminLastName);
- this->__isset.tenantAdminLastName = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 12:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->tenantAdminEmail);
- this->__isset.tenantAdminEmail = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 13:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->identityServerUserName);
- this->__isset.identityServerUserName = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 14:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->identityServerPasswordToken);
- this->__isset.identityServerPasswordToken = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
case 15:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->declinedReason);
@@ -293,22 +506,6 @@ uint32_t Tenant::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 16:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->oauthClientId);
- this->__isset.oauthClientId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
- case 17:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->oauthClientSecret);
- this->__isset.oauthClientSecret = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
case 18:
if (ftype == ::apache::thrift::protocol::T_I64) {
xfer += iprot->readI64(this->requestCreationTime);
@@ -389,46 +586,11 @@ uint32_t Tenant::write(::apache::thrift::protocol::TProtocol* oprot) const {
xfer += oprot->writeString(this->reviewProposalDescription);
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.tenantAdminFirstName) {
- xfer += oprot->writeFieldBegin("tenantAdminFirstName", ::apache::thrift::protocol::T_STRING, 10);
- xfer += oprot->writeString(this->tenantAdminFirstName);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.tenantAdminLastName) {
- xfer += oprot->writeFieldBegin("tenantAdminLastName", ::apache::thrift::protocol::T_STRING, 11);
- xfer += oprot->writeString(this->tenantAdminLastName);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.tenantAdminEmail) {
- xfer += oprot->writeFieldBegin("tenantAdminEmail", ::apache::thrift::protocol::T_STRING, 12);
- xfer += oprot->writeString(this->tenantAdminEmail);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.identityServerUserName) {
- xfer += oprot->writeFieldBegin("identityServerUserName", ::apache::thrift::protocol::T_STRING, 13);
- xfer += oprot->writeString(this->identityServerUserName);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.identityServerPasswordToken) {
- xfer += oprot->writeFieldBegin("identityServerPasswordToken", ::apache::thrift::protocol::T_STRING, 14);
- xfer += oprot->writeString(this->identityServerPasswordToken);
- xfer += oprot->writeFieldEnd();
- }
if (this->__isset.declinedReason) {
xfer += oprot->writeFieldBegin("declinedReason", ::apache::thrift::protocol::T_STRING, 15);
xfer += oprot->writeString(this->declinedReason);
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.oauthClientId) {
- xfer += oprot->writeFieldBegin("oauthClientId", ::apache::thrift::protocol::T_STRING, 16);
- xfer += oprot->writeString(this->oauthClientId);
- xfer += oprot->writeFieldEnd();
- }
- if (this->__isset.oauthClientSecret) {
- xfer += oprot->writeFieldBegin("oauthClientSecret", ::apache::thrift::protocol::T_STRING, 17);
- xfer += oprot->writeString(this->oauthClientSecret);
- xfer += oprot->writeFieldEnd();
- }
if (this->__isset.requestCreationTime) {
xfer += oprot->writeFieldBegin("requestCreationTime", ::apache::thrift::protocol::T_I64, 18);
xfer += oprot->writeI64(this->requestCreationTime);
@@ -455,62 +617,41 @@ void swap(Tenant &a, Tenant &b) {
swap(a.tenantURL, b.tenantURL);
swap(a.tenantPublicAbstract, b.tenantPublicAbstract);
swap(a.reviewProposalDescription, b.reviewProposalDescription);
- swap(a.tenantAdminFirstName, b.tenantAdminFirstName);
- swap(a.tenantAdminLastName, b.tenantAdminLastName);
- swap(a.tenantAdminEmail, b.tenantAdminEmail);
- swap(a.identityServerUserName, b.identityServerUserName);
- swap(a.identityServerPasswordToken, b.identityServerPasswordToken);
swap(a.declinedReason, b.declinedReason);
- swap(a.oauthClientId, b.oauthClientId);
- swap(a.oauthClientSecret, b.oauthClientSecret);
swap(a.requestCreationTime, b.requestCreationTime);
swap(a.requesterUsername, b.requesterUsername);
swap(a.__isset, b.__isset);
}
-Tenant::Tenant(const Tenant& other1) {
- tenantId = other1.tenantId;
- tenantApprovalStatus = other1.tenantApprovalStatus;
- tenantName = other1.tenantName;
- domain = other1.domain;
- emailAddress = other1.emailAddress;
- tenantAcronym = other1.tenantAcronym;
- tenantURL = other1.tenantURL;
- tenantPublicAbstract = other1.tenantPublicAbstract;
- reviewProposalDescription = other1.reviewProposalDescription;
- tenantAdminFirstName = other1.tenantAdminFirstName;
- tenantAdminLastName = other1.tenantAdminLastName;
- tenantAdminEmail = other1.tenantAdminEmail;
- identityServerUserName = other1.identityServerUserName;
- identityServerPasswordToken = other1.identityServerPasswordToken;
- declinedReason = other1.declinedReason;
- oauthClientId = other1.oauthClientId;
- oauthClientSecret = other1.oauthClientSecret;
- requestCreationTime = other1.requestCreationTime;
- requesterUsername = other1.requesterUsername;
- __isset = other1.__isset;
+Tenant::Tenant(const Tenant& other5) {
+ tenantId = other5.tenantId;
+ tenantApprovalStatus = other5.tenantApprovalStatus;
+ tenantName = other5.tenantName;
+ domain = other5.domain;
+ emailAddress = other5.emailAddress;
+ tenantAcronym = other5.tenantAcronym;
+ tenantURL = other5.tenantURL;
+ tenantPublicAbstract = other5.tenantPublicAbstract;
+ reviewProposalDescription = other5.reviewProposalDescription;
+ declinedReason = other5.declinedReason;
+ requestCreationTime = other5.requestCreationTime;
+ requesterUsername = other5.requesterUsername;
+ __isset = other5.__isset;
}
-Tenant& Tenant::operator=(const Tenant& other2) {
- tenantId = other2.tenantId;
- tenantApprovalStatus = other2.tenantApprovalStatus;
- tenantName = other2.tenantName;
- domain = other2.domain;
- emailAddress = other2.emailAddress;
- tenantAcronym = other2.tenantAcronym;
- tenantURL = other2.tenantURL;
- tenantPublicAbstract = other2.tenantPublicAbstract;
- reviewProposalDescription = other2.reviewProposalDescription;
- tenantAdminFirstName = other2.tenantAdminFirstName;
- tenantAdminLastName = other2.tenantAdminLastName;
- tenantAdminEmail = other2.tenantAdminEmail;
- identityServerUserName = other2.identityServerUserName;
- identityServerPasswordToken = other2.identityServerPasswordToken;
- declinedReason = other2.declinedReason;
- oauthClientId = other2.oauthClientId;
- oauthClientSecret = other2.oauthClientSecret;
- requestCreationTime = other2.requestCreationTime;
- requesterUsername = other2.requesterUsername;
- __isset = other2.__isset;
+Tenant& Tenant::operator=(const Tenant& other6) {
+ tenantId = other6.tenantId;
+ tenantApprovalStatus = other6.tenantApprovalStatus;
+ tenantName = other6.tenantName;
+ domain = other6.domain;
+ emailAddress = other6.emailAddress;
+ tenantAcronym = other6.tenantAcronym;
+ tenantURL = other6.tenantURL;
+ tenantPublicAbstract = other6.tenantPublicAbstract;
+ reviewProposalDescription = other6.reviewProposalDescription;
+ declinedReason = other6.declinedReason;
+ requestCreationTime = other6.requestCreationTime;
+ requesterUsername = other6.requesterUsername;
+ __isset = other6.__isset;
return *this;
}
void Tenant::printTo(std::ostream& out) const {
@@ -525,14 +666,7 @@ void Tenant::printTo(std::ostream& out) const {
out << ", " << "tenantURL="; (__isset.tenantURL ? (out << to_string(tenantURL)) : (out << "<null>"));
out << ", " << "tenantPublicAbstract="; (__isset.tenantPublicAbstract ? (out << to_string(tenantPublicAbstract)) : (out << "<null>"));
out << ", " << "reviewProposalDescription="; (__isset.reviewProposalDescription ? (out << to_string(reviewProposalDescription)) : (out << "<null>"));
- out << ", " << "tenantAdminFirstName="; (__isset.tenantAdminFirstName ? (out << to_string(tenantAdminFirstName)) : (out << "<null>"));
- out << ", " << "tenantAdminLastName="; (__isset.tenantAdminLastName ? (out << to_string(tenantAdminLastName)) : (out << "<null>"));
- out << ", " << "tenantAdminEmail="; (__isset.tenantAdminEmail ? (out << to_string(tenantAdminEmail)) : (out << "<null>"));
- out << ", " << "identityServerUserName="; (__isset.identityServerUserName ? (out << to_string(identityServerUserName)) : (out << "<null>"));
- out << ", " << "identityServerPasswordToken="; (__isset.identityServerPasswordToken ? (out << to_string(identityServerPasswordToken)) : (out << "<null>"));
out << ", " << "declinedReason="; (__isset.declinedReason ? (out << to_string(declinedReason)) : (out << "<null>"));
- out << ", " << "oauthClientId="; (__isset.oauthClientId ? (out << to_string(oauthClientId)) : (out << "<null>"));
- out << ", " << "oauthClientSecret="; (__isset.oauthClientSecret ? (out << to_string(oauthClientSecret)) : (out << "<null>"));
out << ", " << "requestCreationTime="; (__isset.requestCreationTime ? (out << to_string(requestCreationTime)) : (out << "<null>"));
out << ", " << "requesterUsername="; (__isset.requesterUsername ? (out << to_string(requesterUsername)) : (out << "<null>"));
out << ")";
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.h
index 2a815f8..ed8aaf0 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/tenant_profile_model_types.h
@@ -45,16 +45,157 @@ struct TenantApprovalStatus {
DEACTIVATED = 3,
CANCELLED = 4,
DENIED = 5,
- CREATED = 6
+ CREATED = 6,
+ DEPLOYED = 7
};
};
extern const std::map<int, const char*> _TenantApprovalStatus_VALUES_TO_NAMES;
+class TenantPreferences;
+
+class TenantConfig;
+
class Tenant;
+typedef struct _TenantPreferences__isset {
+ _TenantPreferences__isset() : tenantAdminFirstName(false), tenantAdminLastName(false), tenantAdminEmail(false) {}
+ bool tenantAdminFirstName :1;
+ bool tenantAdminLastName :1;
+ bool tenantAdminEmail :1;
+} _TenantPreferences__isset;
+
+class TenantPreferences {
+ public:
+
+ TenantPreferences(const TenantPreferences&);
+ TenantPreferences& operator=(const TenantPreferences&);
+ TenantPreferences() : tenantAdminFirstName(), tenantAdminLastName(), tenantAdminEmail() {
+ }
+
+ virtual ~TenantPreferences() throw();
+ std::string tenantAdminFirstName;
+ std::string tenantAdminLastName;
+ std::string tenantAdminEmail;
+
+ _TenantPreferences__isset __isset;
+
+ void __set_tenantAdminFirstName(const std::string& val);
+
+ void __set_tenantAdminLastName(const std::string& val);
+
+ void __set_tenantAdminEmail(const std::string& val);
+
+ bool operator == (const TenantPreferences & rhs) const
+ {
+ if (__isset.tenantAdminFirstName != rhs.__isset.tenantAdminFirstName)
+ return false;
+ else if (__isset.tenantAdminFirstName && !(tenantAdminFirstName == rhs.tenantAdminFirstName))
+ return false;
+ if (__isset.tenantAdminLastName != rhs.__isset.tenantAdminLastName)
+ return false;
+ else if (__isset.tenantAdminLastName && !(tenantAdminLastName == rhs.tenantAdminLastName))
+ return false;
+ if (__isset.tenantAdminEmail != rhs.__isset.tenantAdminEmail)
+ return false;
+ else if (__isset.tenantAdminEmail && !(tenantAdminEmail == rhs.tenantAdminEmail))
+ return false;
+ return true;
+ }
+ bool operator != (const TenantPreferences &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const TenantPreferences & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+ virtual void printTo(std::ostream& out) const;
+};
+
+void swap(TenantPreferences &a, TenantPreferences &b);
+
+inline std::ostream& operator<<(std::ostream& out, const TenantPreferences& obj)
+{
+ obj.printTo(out);
+ return out;
+}
+
+typedef struct _TenantConfig__isset {
+ _TenantConfig__isset() : oauthClientId(false), oauthClientSecret(false), identityServerUserName(false), identityServerPasswordToken(false) {}
+ bool oauthClientId :1;
+ bool oauthClientSecret :1;
+ bool identityServerUserName :1;
+ bool identityServerPasswordToken :1;
+} _TenantConfig__isset;
+
+class TenantConfig {
+ public:
+
+ TenantConfig(const TenantConfig&);
+ TenantConfig& operator=(const TenantConfig&);
+ TenantConfig() : oauthClientId(), oauthClientSecret(), identityServerUserName(), identityServerPasswordToken() {
+ }
+
+ virtual ~TenantConfig() throw();
+ std::string oauthClientId;
+ std::string oauthClientSecret;
+ std::string identityServerUserName;
+ std::string identityServerPasswordToken;
+
+ _TenantConfig__isset __isset;
+
+ void __set_oauthClientId(const std::string& val);
+
+ void __set_oauthClientSecret(const std::string& val);
+
+ void __set_identityServerUserName(const std::string& val);
+
+ void __set_identityServerPasswordToken(const std::string& val);
+
+ bool operator == (const TenantConfig & rhs) const
+ {
+ if (__isset.oauthClientId != rhs.__isset.oauthClientId)
+ return false;
+ else if (__isset.oauthClientId && !(oauthClientId == rhs.oauthClientId))
+ return false;
+ if (__isset.oauthClientSecret != rhs.__isset.oauthClientSecret)
+ return false;
+ else if (__isset.oauthClientSecret && !(oauthClientSecret == rhs.oauthClientSecret))
+ return false;
+ if (__isset.identityServerUserName != rhs.__isset.identityServerUserName)
+ return false;
+ else if (__isset.identityServerUserName && !(identityServerUserName == rhs.identityServerUserName))
+ return false;
+ if (__isset.identityServerPasswordToken != rhs.__isset.identityServerPasswordToken)
+ return false;
+ else if (__isset.identityServerPasswordToken && !(identityServerPasswordToken == rhs.identityServerPasswordToken))
+ return false;
+ return true;
+ }
+ bool operator != (const TenantConfig &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const TenantConfig & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+ virtual void printTo(std::ostream& out) const;
+};
+
+void swap(TenantConfig &a, TenantConfig &b);
+
+inline std::ostream& operator<<(std::ostream& out, const TenantConfig& obj)
+{
+ obj.printTo(out);
+ return out;
+}
+
typedef struct _Tenant__isset {
- _Tenant__isset() : tenantName(false), domain(false), emailAddress(false), tenantAcronym(false), tenantURL(false), tenantPublicAbstract(false), reviewProposalDescription(false), tenantAdminFirstName(false), tenantAdminLastName(false), tenantAdminEmail(false), identityServerUserName(false), identityServerPasswordToken(false), declinedReason(false), oauthClientId(false), oauthClientSecret(false), requestCreationTime(false), requesterUsername(false) {}
+ _Tenant__isset() : tenantName(false), domain(false), emailAddress(false), tenantAcronym(false), tenantURL(false), tenantPublicAbstract(false), reviewProposalDescription(false), declinedReason(false), requestCreationTime(false), requesterUsername(false) {}
bool tenantName :1;
bool domain :1;
bool emailAddress :1;
@@ -62,14 +203,7 @@ typedef struct _Tenant__isset {
bool tenantURL :1;
bool tenantPublicAbstract :1;
bool reviewProposalDescription :1;
- bool tenantAdminFirstName :1;
- bool tenantAdminLastName :1;
- bool tenantAdminEmail :1;
- bool identityServerUserName :1;
- bool identityServerPasswordToken :1;
bool declinedReason :1;
- bool oauthClientId :1;
- bool oauthClientSecret :1;
bool requestCreationTime :1;
bool requesterUsername :1;
} _Tenant__isset;
@@ -79,7 +213,7 @@ class Tenant {
Tenant(const Tenant&);
Tenant& operator=(const Tenant&);
- Tenant() : tenantId(), tenantApprovalStatus((TenantApprovalStatus::type)0), tenantName(), domain(), emailAddress(), tenantAcronym(), tenantURL(), tenantPublicAbstract(), reviewProposalDescription(), tenantAdminFirstName(), tenantAdminLastName(), tenantAdminEmail(), identityServerUserName(), identityServerPasswordToken(), declinedReason(), oauthClientId(), oauthClientSecret(), requestCreationTime(0), requesterUsername() {
+ Tenant() : tenantId(), tenantApprovalStatus((TenantApprovalStatus::type)0), tenantName(), domain(), emailAddress(), tenantAcronym(), tenantURL(), tenantPublicAbstract(), reviewProposalDescription(), declinedReason(), requestCreationTime(0), requesterUsername() {
}
virtual ~Tenant() throw();
@@ -92,14 +226,7 @@ class Tenant {
std::string tenantURL;
std::string tenantPublicAbstract;
std::string reviewProposalDescription;
- std::string tenantAdminFirstName;
- std::string tenantAdminLastName;
- std::string tenantAdminEmail;
- std::string identityServerUserName;
- std::string identityServerPasswordToken;
std::string declinedReason;
- std::string oauthClientId;
- std::string oauthClientSecret;
int64_t requestCreationTime;
std::string requesterUsername;
@@ -123,22 +250,8 @@ class Tenant {
void __set_reviewProposalDescription(const std::string& val);
- void __set_tenantAdminFirstName(const std::string& val);
-
- void __set_tenantAdminLastName(const std::string& val);
-
- void __set_tenantAdminEmail(const std::string& val);
-
- void __set_identityServerUserName(const std::string& val);
-
- void __set_identityServerPasswordToken(const std::string& val);
-
void __set_declinedReason(const std::string& val);
- void __set_oauthClientId(const std::string& val);
-
- void __set_oauthClientSecret(const std::string& val);
-
void __set_requestCreationTime(const int64_t val);
void __set_requesterUsername(const std::string& val);
@@ -177,38 +290,10 @@ class Tenant {
return false;
else if (__isset.reviewProposalDescription && !(reviewProposalDescription == rhs.reviewProposalDescription))
return false;
- if (__isset.tenantAdminFirstName != rhs.__isset.tenantAdminFirstName)
- return false;
- else if (__isset.tenantAdminFirstName && !(tenantAdminFirstName == rhs.tenantAdminFirstName))
- return false;
- if (__isset.tenantAdminLastName != rhs.__isset.tenantAdminLastName)
- return false;
- else if (__isset.tenantAdminLastName && !(tenantAdminLastName == rhs.tenantAdminLastName))
- return false;
- if (__isset.tenantAdminEmail != rhs.__isset.tenantAdminEmail)
- return false;
- else if (__isset.tenantAdminEmail && !(tenantAdminEmail == rhs.tenantAdminEmail))
- return false;
- if (__isset.identityServerUserName != rhs.__isset.identityServerUserName)
- return false;
- else if (__isset.identityServerUserName && !(identityServerUserName == rhs.identityServerUserName))
- return false;
- if (__isset.identityServerPasswordToken != rhs.__isset.identityServerPasswordToken)
- return false;
- else if (__isset.identityServerPasswordToken && !(identityServerPasswordToken == rhs.identityServerPasswordToken))
- return false;
if (__isset.declinedReason != rhs.__isset.declinedReason)
return false;
else if (__isset.declinedReason && !(declinedReason == rhs.declinedReason))
return false;
- if (__isset.oauthClientId != rhs.__isset.oauthClientId)
- return false;
- else if (__isset.oauthClientId && !(oauthClientId == rhs.oauthClientId))
- return false;
- if (__isset.oauthClientSecret != rhs.__isset.oauthClientSecret)
- return false;
- else if (__isset.oauthClientSecret && !(oauthClientSecret == rhs.oauthClientSecret))
- return false;
if (__isset.requestCreationTime != rhs.__isset.requestCreationTime)
return false;
else if (__isset.requestCreationTime && !(requestCreationTime == rhs.requestCreationTime))
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
index edd4822..6089cf6 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp
@@ -37,7 +37,8 @@ int _kGatewayApprovalStatusValues[] = {
GatewayApprovalStatus::DEACTIVATED,
GatewayApprovalStatus::CANCELLED,
GatewayApprovalStatus::DENIED,
- GatewayApprovalStatus::CREATED
+ GatewayApprovalStatus::CREATED,
+ GatewayApprovalStatus::DEPLOYED
};
const char* _kGatewayApprovalStatusNames[] = {
"REQUESTED",
@@ -46,9 +47,10 @@ const char* _kGatewayApprovalStatusNames[] = {
"DEACTIVATED",
"CANCELLED",
"DENIED",
- "CREATED"
+ "CREATED",
+ "DEPLOYED"
};
-const std::map<int, const char*> _GatewayApprovalStatus_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kGatewayApprovalStatusValues, _kGatewayApprovalStatusNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _GatewayApprovalStatus_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, _kGatewayApprovalStatusValues, _kGatewayApprovalStatusNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
int _kNotificationPriorityValues[] = {
NotificationPriority::LOW,
@@ -664,6 +666,11 @@ Gateway::~Gateway() throw() {
}
+void Gateway::__set_airavataInternalGatewayId(const std::string& val) {
+ this->airavataInternalGatewayId = val;
+__isset.airavataInternalGatewayId = true;
+}
+
void Gateway::__set_gatewayId(const std::string& val) {
this->gatewayId = val;
}
@@ -782,13 +789,21 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->airavataInternalGatewayId);
+ this->__isset.airavataInternalGatewayId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayId);
isset_gatewayId = true;
} else {
xfer += iprot->skip(ftype);
}
break;
- case 2:
+ case 3:
if (ftype == ::apache::thrift::protocol::T_I32) {
int32_t ecast18;
xfer += iprot->readI32(ecast18);
@@ -798,7 +813,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 3:
+ case 4:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayName);
this->__isset.gatewayName = true;
@@ -806,7 +821,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 4:
+ case 5:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->domain);
this->__isset.domain = true;
@@ -814,7 +829,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 5:
+ case 6:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->emailAddress);
this->__isset.emailAddress = true;
@@ -822,7 +837,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 6:
+ case 7:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayAcronym);
this->__isset.gatewayAcronym = true;
@@ -830,7 +845,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 7:
+ case 8:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayURL);
this->__isset.gatewayURL = true;
@@ -838,7 +853,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 8:
+ case 9:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayPublicAbstract);
this->__isset.gatewayPublicAbstract = true;
@@ -846,7 +861,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 9:
+ case 10:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->reviewProposalDescription);
this->__isset.reviewProposalDescription = true;
@@ -854,7 +869,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 10:
+ case 11:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayAdminFirstName);
this->__isset.gatewayAdminFirstName = true;
@@ -862,7 +877,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 11:
+ case 12:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayAdminLastName);
this->__isset.gatewayAdminLastName = true;
@@ -870,7 +885,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 12:
+ case 13:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->gatewayAdminEmail);
this->__isset.gatewayAdminEmail = true;
@@ -878,7 +893,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 13:
+ case 14:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->identityServerUserName);
this->__isset.identityServerUserName = true;
@@ -886,7 +901,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 14:
+ case 15:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->identityServerPasswordToken);
this->__isset.identityServerPasswordToken = true;
@@ -894,7 +909,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 15:
+ case 16:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->declinedReason);
this->__isset.declinedReason = true;
@@ -902,7 +917,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 16:
+ case 17:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->oauthClientId);
this->__isset.oauthClientId = true;
@@ -910,7 +925,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 17:
+ case 18:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->oauthClientSecret);
this->__isset.oauthClientSecret = true;
@@ -918,7 +933,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 18:
+ case 19:
if (ftype == ::apache::thrift::protocol::T_I64) {
xfer += iprot->readI64(this->requestCreationTime);
this->__isset.requestCreationTime = true;
@@ -926,7 +941,7 @@ uint32_t Gateway::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 19:
+ case 20:
if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->requesterUsername);
this->__isset.requesterUsername = true;
@@ -955,96 +970,101 @@ uint32_t Gateway::write(::apache::thrift::protocol::TProtocol* oprot) const {
apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
xfer += oprot->writeStructBegin("Gateway");
- xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ if (this->__isset.airavataInternalGatewayId) {
+ xfer += oprot->writeFieldBegin("airavataInternalGatewayId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->airavataInternalGatewayId);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->gatewayId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("gatewayApprovalStatus", ::apache::thrift::protocol::T_I32, 2);
+ xfer += oprot->writeFieldBegin("gatewayApprovalStatus", ::apache::thrift::protocol::T_I32, 3);
xfer += oprot->writeI32((int32_t)this->gatewayApprovalStatus);
xfer += oprot->writeFieldEnd();
if (this->__isset.gatewayName) {
- xfer += oprot->writeFieldBegin("gatewayName", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeFieldBegin("gatewayName", ::apache::thrift::protocol::T_STRING, 4);
xfer += oprot->writeString(this->gatewayName);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.domain) {
- xfer += oprot->writeFieldBegin("domain", ::apache::thrift::protocol::T_STRING, 4);
+ xfer += oprot->writeFieldBegin("domain", ::apache::thrift::protocol::T_STRING, 5);
xfer += oprot->writeString(this->domain);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.emailAddress) {
- xfer += oprot->writeFieldBegin("emailAddress", ::apache::thrift::protocol::T_STRING, 5);
+ xfer += oprot->writeFieldBegin("emailAddress", ::apache::thrift::protocol::T_STRING, 6);
xfer += oprot->writeString(this->emailAddress);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayAcronym) {
- xfer += oprot->writeFieldBegin("gatewayAcronym", ::apache::thrift::protocol::T_STRING, 6);
+ xfer += oprot->writeFieldBegin("gatewayAcronym", ::apache::thrift::protocol::T_STRING, 7);
xfer += oprot->writeString(this->gatewayAcronym);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayURL) {
- xfer += oprot->writeFieldBegin("gatewayURL", ::apache::thrift::protocol::T_STRING, 7);
+ xfer += oprot->writeFieldBegin("gatewayURL", ::apache::thrift::protocol::T_STRING, 8);
xfer += oprot->writeString(this->gatewayURL);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayPublicAbstract) {
- xfer += oprot->writeFieldBegin("gatewayPublicAbstract", ::apache::thrift::protocol::T_STRING, 8);
+ xfer += oprot->writeFieldBegin("gatewayPublicAbstract", ::apache::thrift::protocol::T_STRING, 9);
xfer += oprot->writeString(this->gatewayPublicAbstract);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.reviewProposalDescription) {
- xfer += oprot->writeFieldBegin("reviewProposalDescription", ::apache::thrift::protocol::T_STRING, 9);
+ xfer += oprot->writeFieldBegin("reviewProposalDescription", ::apache::thrift::protocol::T_STRING, 10);
xfer += oprot->writeString(this->reviewProposalDescription);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayAdminFirstName) {
- xfer += oprot->writeFieldBegin("gatewayAdminFirstName", ::apache::thrift::protocol::T_STRING, 10);
+ xfer += oprot->writeFieldBegin("gatewayAdminFirstName", ::apache::thrift::protocol::T_STRING, 11);
xfer += oprot->writeString(this->gatewayAdminFirstName);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayAdminLastName) {
- xfer += oprot->writeFieldBegin("gatewayAdminLastName", ::apache::thrift::protocol::T_STRING, 11);
+ xfer += oprot->writeFieldBegin("gatewayAdminLastName", ::apache::thrift::protocol::T_STRING, 12);
xfer += oprot->writeString(this->gatewayAdminLastName);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayAdminEmail) {
- xfer += oprot->writeFieldBegin("gatewayAdminEmail", ::apache::thrift::protocol::T_STRING, 12);
+ xfer += oprot->writeFieldBegin("gatewayAdminEmail", ::apache::thrift::protocol::T_STRING, 13);
xfer += oprot->writeString(this->gatewayAdminEmail);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.identityServerUserName) {
- xfer += oprot->writeFieldBegin("identityServerUserName", ::apache::thrift::protocol::T_STRING, 13);
+ xfer += oprot->writeFieldBegin("identityServerUserName", ::apache::thrift::protocol::T_STRING, 14);
xfer += oprot->writeString(this->identityServerUserName);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.identityServerPasswordToken) {
- xfer += oprot->writeFieldBegin("identityServerPasswordToken", ::apache::thrift::protocol::T_STRING, 14);
+ xfer += oprot->writeFieldBegin("identityServerPasswordToken", ::apache::thrift::protocol::T_STRING, 15);
xfer += oprot->writeString(this->identityServerPasswordToken);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.declinedReason) {
- xfer += oprot->writeFieldBegin("declinedReason", ::apache::thrift::protocol::T_STRING, 15);
+ xfer += oprot->writeFieldBegin("declinedReason", ::apache::thrift::protocol::T_STRING, 16);
xfer += oprot->writeString(this->declinedReason);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.oauthClientId) {
- xfer += oprot->writeFieldBegin("oauthClientId", ::apache::thrift::protocol::T_STRING, 16);
+ xfer += oprot->writeFieldBegin("oauthClientId", ::apache::thrift::protocol::T_STRING, 17);
xfer += oprot->writeString(this->oauthClientId);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.oauthClientSecret) {
- xfer += oprot->writeFieldBegin("oauthClientSecret", ::apache::thrift::protocol::T_STRING, 17);
+ xfer += oprot->writeFieldBegin("oauthClientSecret", ::apache::thrift::protocol::T_STRING, 18);
xfer += oprot->writeString(this->oauthClientSecret);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.requestCreationTime) {
- xfer += oprot->writeFieldBegin("requestCreationTime", ::apache::thrift::protocol::T_I64, 18);
+ xfer += oprot->writeFieldBegin("requestCreationTime", ::apache::thrift::protocol::T_I64, 19);
xfer += oprot->writeI64(this->requestCreationTime);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.requesterUsername) {
- xfer += oprot->writeFieldBegin("requesterUsername", ::apache::thrift::protocol::T_STRING, 19);
+ xfer += oprot->writeFieldBegin("requesterUsername", ::apache::thrift::protocol::T_STRING, 20);
xfer += oprot->writeString(this->requesterUsername);
xfer += oprot->writeFieldEnd();
}
@@ -1055,6 +1075,7 @@ uint32_t Gateway::write(::apache::thrift::protocol::TProtocol* oprot) const {
void swap(Gateway &a, Gateway &b) {
using ::std::swap;
+ swap(a.airavataInternalGatewayId, b.airavataInternalGatewayId);
swap(a.gatewayId, b.gatewayId);
swap(a.gatewayApprovalStatus, b.gatewayApprovalStatus);
swap(a.gatewayName, b.gatewayName);
@@ -1078,6 +1099,7 @@ void swap(Gateway &a, Gateway &b) {
}
Gateway::Gateway(const Gateway& other19) {
+ airavataInternalGatewayId = other19.airavataInternalGatewayId;
gatewayId = other19.gatewayId;
gatewayApprovalStatus = other19.gatewayApprovalStatus;
gatewayName = other19.gatewayName;
@@ -1100,6 +1122,7 @@ Gateway::Gateway(const Gateway& other19) {
__isset = other19.__isset;
}
Gateway& Gateway::operator=(const Gateway& other20) {
+ airavataInternalGatewayId = other20.airavataInternalGatewayId;
gatewayId = other20.gatewayId;
gatewayApprovalStatus = other20.gatewayApprovalStatus;
gatewayName = other20.gatewayName;
@@ -1125,7 +1148,8 @@ Gateway& Gateway::operator=(const Gateway& other20) {
void Gateway::printTo(std::ostream& out) const {
using ::apache::thrift::to_string;
out << "Gateway(";
- out << "gatewayId=" << to_string(gatewayId);
+ out << "airavataInternalGatewayId="; (__isset.airavataInternalGatewayId ? (out << to_string(airavataInternalGatewayId)) : (out << "<null>"));
+ out << ", " << "gatewayId=" << to_string(gatewayId);
out << ", " << "gatewayApprovalStatus=" << to_string(gatewayApprovalStatus);
out << ", " << "gatewayName="; (__isset.gatewayName ? (out << to_string(gatewayName)) : (out << "<null>"));
out << ", " << "domain="; (__isset.domain ? (out << to_string(domain)) : (out << "<null>"));
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
index d6db351..ecbf553 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h
@@ -45,7 +45,8 @@ struct GatewayApprovalStatus {
DEACTIVATED = 3,
CANCELLED = 4,
DENIED = 5,
- CREATED = 6
+ CREATED = 6,
+ DEPLOYED = 7
};
};
@@ -299,7 +300,8 @@ inline std::ostream& operator<<(std::ostream& out, const User& obj)
}
typedef struct _Gateway__isset {
- _Gateway__isset() : gatewayName(false), domain(false), emailAddress(false), gatewayAcronym(false), gatewayURL(false), gatewayPublicAbstract(false), reviewProposalDescription(false), gatewayAdminFirstName(false), gatewayAdminLastName(false), gatewayAdminEmail(false), identityServerUserName(false), identityServerPasswordToken(false), declinedReason(false), oauthClientId(false), oauthClientSecret(false), requestCreationTime(false), requesterUsername(false) {}
+ _Gateway__isset() : airavataInternalGatewayId(false), gatewayName(false), domain(false), emailAddress(false), gatewayAcronym(false), gatewayURL(false), gatewayPublicAbstract(false), reviewProposalDescription(false), gatewayAdminFirstName(false), gatewayAdminLastName(false), gatewayAdminEmail(false), identityServerUserName(false), identityServerPasswordToken(false), declinedReason(false), oauthClientId(false), oauthClientSecret(false), requestCreationTime(false), requesterUsername(false) {}
+ bool airavataInternalGatewayId :1;
bool gatewayName :1;
bool domain :1;
bool emailAddress :1;
@@ -324,10 +326,11 @@ class Gateway {
Gateway(const Gateway&);
Gateway& operator=(const Gateway&);
- Gateway() : gatewayId(), gatewayApprovalStatus((GatewayApprovalStatus::type)0), gatewayName(), domain(), emailAddress(), gatewayAcronym(), gatewayURL(), gatewayPublicAbstract(), reviewProposalDescription(), gatewayAdminFirstName(), gatewayAdminLastName(), gatewayAdminEmail(), identityServerUserName(), identityServerPasswordToken(), declinedReason(), oauthClientId(), oauthClientSecret(), requestCreationTime(0), requesterUsername() {
+ Gateway() : airavataInternalGatewayId(), gatewayId(), gatewayApprovalStatus((GatewayApprovalStatus::type)0), gatewayName(), domain(), emailAddress(), gatewayAcronym(), gatewayURL(), gatewayPublicAbstract(), reviewProposalDescription(), gatewayAdminFirstName(), gatewayAdminLastName(), gatewayAdminEmail(), identityServerUserName(), identityServerPasswordToken(), declinedReason(), oauthClientId(), oauthClientSecret(), requestCreationTime(0), requesterUsername() {
}
virtual ~Gateway() throw();
+ std::string airavataInternalGatewayId;
std::string gatewayId;
GatewayApprovalStatus::type gatewayApprovalStatus;
std::string gatewayName;
@@ -350,6 +353,8 @@ class Gateway {
_Gateway__isset __isset;
+ void __set_airavataInternalGatewayId(const std::string& val);
+
void __set_gatewayId(const std::string& val);
void __set_gatewayApprovalStatus(const GatewayApprovalStatus::type val);
@@ -390,6 +395,10 @@ class Gateway {
bool operator == (const Gateway & rhs) const
{
+ if (__isset.airavataInternalGatewayId != rhs.__isset.airavataInternalGatewayId)
+ return false;
+ else if (__isset.airavataInternalGatewayId && !(airavataInternalGatewayId == rhs.airavataInternalGatewayId))
+ return false;
if (!(gatewayId == rhs.gatewayId))
return false;
if (!(gatewayApprovalStatus == rhs.gatewayApprovalStatus))
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
index ae27035..18bfcf5 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
@@ -4045,7 +4045,7 @@ interface AiravataIf {
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param \Airavata\Model\Group\GroupModel $groupModel
- * @return bool
+ * @return string
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
@@ -4066,14 +4066,13 @@ interface AiravataIf {
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $groupId
* @param string $ownerId
- * @param string $gatewayId
* @return bool
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId, $gatewayId);
+ public function deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $groupId
@@ -4087,14 +4086,13 @@ interface AiravataIf {
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $userName
- * @param string $gatewayId
* @return \Airavata\Model\Group\GroupModel[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId);
+ public function getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName);
}
class AiravataClient implements \Airavata\API\AiravataIf {
@@ -14860,19 +14858,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("updateGroup failed: unknown result");
}
- public function deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId, $gatewayId)
+ public function deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId)
{
- $this->send_deleteGroup($authzToken, $groupId, $ownerId, $gatewayId);
+ $this->send_deleteGroup($authzToken, $groupId, $ownerId);
return $this->recv_deleteGroup();
}
- public function send_deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId, $gatewayId)
+ public function send_deleteGroup(\Airavata\Model\Security\AuthzToken $authzToken, $groupId, $ownerId)
{
$args = new \Airavata\API\Airavata_deleteGroup_args();
$args->authzToken = $authzToken;
$args->groupId = $groupId;
$args->ownerId = $ownerId;
- $args->gatewayId = $gatewayId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
@@ -14990,18 +14987,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getGroup failed: unknown result");
}
- public function getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId)
+ public function getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName)
{
- $this->send_getAllGroupsUserBelongs($authzToken, $userName, $gatewayId);
+ $this->send_getAllGroupsUserBelongs($authzToken, $userName);
return $this->recv_getAllGroupsUserBelongs();
}
- public function send_getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName, $gatewayId)
+ public function send_getAllGroupsUserBelongs(\Airavata\Model\Security\AuthzToken $authzToken, $userName)
{
$args = new \Airavata\API\Airavata_getAllGroupsUserBelongs_args();
$args->authzToken = $authzToken;
$args->userName = $userName;
- $args->gatewayId = $gatewayId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
@@ -65533,7 +65529,7 @@ class Airavata_createGroup_result {
static $_TSPEC;
/**
- * @var bool
+ * @var string
*/
public $success = null;
/**
@@ -65558,7 +65554,7 @@ class Airavata_createGroup_result {
self::$_TSPEC = array(
0 => array(
'var' => 'success',
- 'type' => TType::BOOL,
+ 'type' => TType::STRING,
),
1 => array(
'var' => 'ire',
@@ -65621,8 +65617,8 @@ class Airavata_createGroup_result {
switch ($fid)
{
case 0:
- if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->success);
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
} else {
$xfer += $input->skip($ftype);
}
@@ -65673,8 +65669,8 @@ class Airavata_createGroup_result {
$xfer = 0;
$xfer += $output->writeStructBegin('Airavata_createGroup_result');
if ($this->success !== null) {
- $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
- $xfer += $output->writeBool($this->success);
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
$xfer += $output->writeFieldEnd();
}
if ($this->ire !== null) {
@@ -66002,10 +65998,6 @@ class Airavata_deleteGroup_args {
* @var string
*/
public $ownerId = null;
- /**
- * @var string
- */
- public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -66023,10 +66015,6 @@ class Airavata_deleteGroup_args {
'var' => 'ownerId',
'type' => TType::STRING,
),
- 4 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -66039,9 +66027,6 @@ class Airavata_deleteGroup_args {
if (isset($vals['ownerId'])) {
$this->ownerId = $vals['ownerId'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
}
}
@@ -66086,13 +66071,6 @@ class Airavata_deleteGroup_args {
$xfer += $input->skip($ftype);
}
break;
- case 4:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -66124,11 +66102,6 @@ class Airavata_deleteGroup_args {
$xfer += $output->writeString($this->ownerId);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 4);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -66605,10 +66578,6 @@ class Airavata_getAllGroupsUserBelongs_args {
* @var string
*/
public $userName = null;
- /**
- * @var string
- */
- public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -66622,10 +66591,6 @@ class Airavata_getAllGroupsUserBelongs_args {
'var' => 'userName',
'type' => TType::STRING,
),
- 3 => array(
- 'var' => 'gatewayId',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -66635,9 +66600,6 @@ class Airavata_getAllGroupsUserBelongs_args {
if (isset($vals['userName'])) {
$this->userName = $vals['userName'];
}
- if (isset($vals['gatewayId'])) {
- $this->gatewayId = $vals['gatewayId'];
- }
}
}
@@ -66675,13 +66637,6 @@ class Airavata_getAllGroupsUserBelongs_args {
$xfer += $input->skip($ftype);
}
break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->gatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -66708,11 +66663,6 @@ class Airavata_getAllGroupsUserBelongs_args {
$xfer += $output->writeString($this->userName);
$xfer += $output->writeFieldEnd();
}
- if ($this->gatewayId !== null) {
- $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
- $xfer += $output->writeString($this->gatewayId);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php
index b217adf..c1ad4ec 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Tenant/Types.php
@@ -38,77 +38,314 @@ final class TenantApprovalStatus {
);
}
-class Tenant {
+class TenantPreferences {
static $_TSPEC;
/**
* @var string
*/
- public $tenantId = null;
+ public $tenantAdminFirstName = null;
/**
- * @var int
+ * @var string
*/
- public $tenantApprovalStatus = null;
+ public $tenantAdminLastName = null;
/**
* @var string
*/
- public $tenantName = null;
+ public $tenantAdminEmail = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 10 => array(
+ 'var' => 'tenantAdminFirstName',
+ 'type' => TType::STRING,
+ ),
+ 11 => array(
+ 'var' => 'tenantAdminLastName',
+ 'type' => TType::STRING,
+ ),
+ 12 => array(
+ 'var' => 'tenantAdminEmail',
+ 'type' => TType::STRING,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['tenantAdminFirstName'])) {
+ $this->tenantAdminFirstName = $vals['tenantAdminFirstName'];
+ }
+ if (isset($vals['tenantAdminLastName'])) {
+ $this->tenantAdminLastName = $vals['tenantAdminLastName'];
+ }
+ if (isset($vals['tenantAdminEmail'])) {
+ $this->tenantAdminEmail = $vals['tenantAdminEmail'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'TenantPreferences';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 10:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->tenantAdminFirstName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 11:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->tenantAdminLastName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 12:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->tenantAdminEmail);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('TenantPreferences');
+ if ($this->tenantAdminFirstName !== null) {
+ $xfer += $output->writeFieldBegin('tenantAdminFirstName', TType::STRING, 10);
+ $xfer += $output->writeString($this->tenantAdminFirstName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->tenantAdminLastName !== null) {
+ $xfer += $output->writeFieldBegin('tenantAdminLastName', TType::STRING, 11);
+ $xfer += $output->writeString($this->tenantAdminLastName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->tenantAdminEmail !== null) {
+ $xfer += $output->writeFieldBegin('tenantAdminEmail', TType::STRING, 12);
+ $xfer += $output->writeString($this->tenantAdminEmail);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class TenantConfig {
+ static $_TSPEC;
+
/**
* @var string
*/
- public $domain = null;
+ public $oauthClientId = null;
/**
* @var string
*/
- public $emailAddress = null;
+ public $oauthClientSecret = null;
/**
* @var string
*/
- public $tenantAcronym = null;
+ public $identityServerUserName = null;
/**
* @var string
*/
- public $tenantURL = null;
+ public $identityServerPasswordToken = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 16 => array(
+ 'var' => 'oauthClientId',
+ 'type' => TType::STRING,
+ ),
+ 17 => array(
+ 'var' => 'oauthClientSecret',
+ 'type' => TType::STRING,
+ ),
+ 13 => array(
+ 'var' => 'identityServerUserName',
+ 'type' => TType::STRING,
+ ),
+ 14 => array(
+ 'var' => 'identityServerPasswordToken',
+ 'type' => TType::STRING,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['oauthClientId'])) {
+ $this->oauthClientId = $vals['oauthClientId'];
+ }
+ if (isset($vals['oauthClientSecret'])) {
+ $this->oauthClientSecret = $vals['oauthClientSecret'];
+ }
+ if (isset($vals['identityServerUserName'])) {
+ $this->identityServerUserName = $vals['identityServerUserName'];
+ }
+ if (isset($vals['identityServerPasswordToken'])) {
+ $this->identityServerPasswordToken = $vals['identityServerPasswordToken'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'TenantConfig';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 16:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->oauthClientId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 17:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->oauthClientSecret);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 13:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->identityServerUserName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 14:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->identityServerPasswordToken);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('TenantConfig');
+ if ($this->identityServerUserName !== null) {
+ $xfer += $output->writeFieldBegin('identityServerUserName', TType::STRING, 13);
+ $xfer += $output->writeString($this->identityServerUserName);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->identityServerPasswordToken !== null) {
+ $xfer += $output->writeFieldBegin('identityServerPasswordToken', TType::STRING, 14);
+ $xfer += $output->writeString($this->identityServerPasswordToken);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->oauthClientId !== null) {
+ $xfer += $output->writeFieldBegin('oauthClientId', TType::STRING, 16);
+ $xfer += $output->writeString($this->oauthClientId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->oauthClientSecret !== null) {
+ $xfer += $output->writeFieldBegin('oauthClientSecret', TType::STRING, 17);
+ $xfer += $output->writeString($this->oauthClientSecret);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Tenant {
+ static $_TSPEC;
+
/**
* @var string
*/
- public $tenantPublicAbstract = null;
+ public $tenantId = null;
/**
- * @var string
+ * @var int
*/
- public $reviewProposalDescription = null;
+ public $tenantApprovalStatus = null;
/**
* @var string
*/
- public $tenantAdminFirstName = null;
+ public $tenantName = null;
/**
* @var string
*/
- public $tenantAdminLastName = null;
+ public $domain = null;
/**
* @var string
*/
- public $tenantAdminEmail = null;
+ public $emailAddress = null;
/**
* @var string
*/
- public $identityServerUserName = null;
+ public $tenantAcronym = null;
/**
* @var string
*/
- public $identityServerPasswordToken = null;
+ public $tenantURL = null;
/**
* @var string
*/
- public $declinedReason = null;
+ public $tenantPublicAbstract = null;
/**
* @var string
*/
- public $oauthClientId = null;
+ public $reviewProposalDescription = null;
/**
* @var string
*/
- public $oauthClientSecret = null;
+ public $declinedReason = null;
/**
* @var int
*/
@@ -157,38 +394,10 @@ class Tenant {
'var' => 'reviewProposalDescription',
'type' => TType::STRING,
),
- 10 => array(
- 'var' => 'tenantAdminFirstName',
- 'type' => TType::STRING,
- ),
- 11 => array(
- 'var' => 'tenantAdminLastName',
- 'type' => TType::STRING,
- ),
- 12 => array(
- 'var' => 'tenantAdminEmail',
- 'type' => TType::STRING,
- ),
- 13 => array(
- 'var' => 'identityServerUserName',
- 'type' => TType::STRING,
- ),
- 14 => array(
- 'var' => 'identityServerPasswordToken',
- 'type' => TType::STRING,
- ),
15 => array(
'var' => 'declinedReason',
'type' => TType::STRING,
),
- 16 => array(
- 'var' => 'oauthClientId',
- 'type' => TType::STRING,
- ),
- 17 => array(
- 'var' => 'oauthClientSecret',
- 'type' => TType::STRING,
- ),
18 => array(
'var' => 'requestCreationTime',
'type' => TType::I64,
@@ -227,30 +436,9 @@ class Tenant {
if (isset($vals['reviewProposalDescription'])) {
$this->reviewProposalDescription = $vals['reviewProposalDescription'];
}
- if (isset($vals['tenantAdminFirstName'])) {
- $this->tenantAdminFirstName = $vals['tenantAdminFirstName'];
- }
- if (isset($vals['tenantAdminLastName'])) {
- $this->tenantAdminLastName = $vals['tenantAdminLastName'];
- }
- if (isset($vals['tenantAdminEmail'])) {
- $this->tenantAdminEmail = $vals['tenantAdminEmail'];
- }
- if (isset($vals['identityServerUserName'])) {
- $this->identityServerUserName = $vals['identityServerUserName'];
- }
- if (isset($vals['identityServerPasswordToken'])) {
- $this->identityServerPasswordToken = $vals['identityServerPasswordToken'];
- }
if (isset($vals['declinedReason'])) {
$this->declinedReason = $vals['declinedReason'];
}
- if (isset($vals['oauthClientId'])) {
- $this->oauthClientId = $vals['oauthClientId'];
- }
- if (isset($vals['oauthClientSecret'])) {
- $this->oauthClientSecret = $vals['oauthClientSecret'];
- }
if (isset($vals['requestCreationTime'])) {
$this->requestCreationTime = $vals['requestCreationTime'];
}
@@ -342,41 +530,6 @@ class Tenant {
$xfer += $input->skip($ftype);
}
break;
- case 10:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->tenantAdminFirstName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 11:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->tenantAdminLastName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 12:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->tenantAdminEmail);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 13:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->identityServerUserName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 14:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->identityServerPasswordToken);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
case 15:
if ($ftype == TType::STRING) {
$xfer += $input->readString($this->declinedReason);
@@ -384,20 +537,6 @@ class Tenant {
$xfer += $input->skip($ftype);
}
break;
- case 16:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->oauthClientId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 17:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->oauthClientSecret);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
case 18:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->requestCreationTime);
@@ -470,46 +609,11 @@ class Tenant {
$xfer += $output->writeString($this->reviewProposalDescription);
$xfer += $output->writeFieldEnd();
}
- if ($this->tenantAdminFirstName !== null) {
- $xfer += $output->writeFieldBegin('tenantAdminFirstName', TType::STRING, 10);
- $xfer += $output->writeString($this->tenantAdminFirstName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->tenantAdminLastName !== null) {
- $xfer += $output->writeFieldBegin('tenantAdminLastName', TType::STRING, 11);
- $xfer += $output->writeString($this->tenantAdminLastName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->tenantAdminEmail !== null) {
- $xfer += $output->writeFieldBegin('tenantAdminEmail', TType::STRING, 12);
- $xfer += $output->writeString($this->tenantAdminEmail);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->identityServerUserName !== null) {
- $xfer += $output->writeFieldBegin('identityServerUserName', TType::STRING, 13);
- $xfer += $output->writeString($this->identityServerUserName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->identityServerPasswordToken !== null) {
- $xfer += $output->writeFieldBegin('identityServerPasswordToken', TType::STRING, 14);
- $xfer += $output->writeString($this->identityServerPasswordToken);
- $xfer += $output->writeFieldEnd();
- }
if ($this->declinedReason !== null) {
$xfer += $output->writeFieldBegin('declinedReason', TType::STRING, 15);
$xfer += $output->writeString($this->declinedReason);
$xfer += $output->writeFieldEnd();
}
- if ($this->oauthClientId !== null) {
- $xfer += $output->writeFieldBegin('oauthClientId', TType::STRING, 16);
- $xfer += $output->writeString($this->oauthClientId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->oauthClientSecret !== null) {
- $xfer += $output->writeFieldBegin('oauthClientSecret', TType::STRING, 17);
- $xfer += $output->writeString($this->oauthClientSecret);
- $xfer += $output->writeFieldEnd();
- }
if ($this->requestCreationTime !== null) {
$xfer += $output->writeFieldBegin('requestCreationTime', TType::I64, 18);
$xfer += $output->writeI64($this->requestCreationTime);
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
index 96f0e6f..6e93167 100755
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
@@ -188,17 +188,11 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' bool shareResourceWithUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType, userPermissionList)')
print(' bool revokeSharingOfResourceFromUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType, userPermissionList)')
print(' getAllAccessibleUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType, ResourcePermissionType permissionType)')
- print(' bool createGroup(AuthzToken authzToken, GroupModel groupModel)')
+ print(' string createGroup(AuthzToken authzToken, GroupModel groupModel)')
print(' bool updateGroup(AuthzToken authzToken, GroupModel groupModel)')
- print(' bool deleteGroup(AuthzToken authzToken, string groupId, string ownerId, string gatewayId)')
+ print(' bool deleteGroup(AuthzToken authzToken, string groupId, string ownerId)')
print(' GroupModel getGroup(AuthzToken authzToken, string groupId)')
- print(' getAllGroupsUserBelongs(AuthzToken authzToken, string userName, string gatewayId)')
- print(' string addUserProfile(AuthzToken authzToken, UserProfile userProfile)')
- print(' bool updateUserProfile(AuthzToken authzToken, UserProfile userProfile)')
- print(' UserProfile getUserProfileById(AuthzToken authzToken, string userId, string gatewayId)')
- print(' bool deleteUserProfile(AuthzToken authzToken, string userId)')
- print(' getAllUserProfilesInGateway(AuthzToken authzToken, string gatewayId, i32 offset, i32 limit)')
- print(' bool doesUserProfileExist(AuthzToken authzToken, string userId, string gatewayId)')
+ print(' getAllGroupsUserBelongs(AuthzToken authzToken, string userName)')
print('')
sys.exit(0)
@@ -1252,10 +1246,10 @@ elif cmd == 'updateGroup':
pp.pprint(client.updateGroup(eval(args[0]),eval(args[1]),))
elif cmd == 'deleteGroup':
- if len(args) != 4:
- print('deleteGroup requires 4 args')
+ if len(args) != 3:
+ print('deleteGroup requires 3 args')
sys.exit(1)
- pp.pprint(client.deleteGroup(eval(args[0]),args[1],args[2],args[3],))
+ pp.pprint(client.deleteGroup(eval(args[0]),args[1],args[2],))
elif cmd == 'getGroup':
if len(args) != 2:
@@ -1264,46 +1258,10 @@ elif cmd == 'getGroup':
pp.pprint(client.getGroup(eval(args[0]),args[1],))
elif cmd == 'getAllGroupsUserBelongs':
- if len(args) != 3:
- print('getAllGroupsUserBelongs requires 3 args')
- sys.exit(1)
- pp.pprint(client.getAllGroupsUserBelongs(eval(args[0]),args[1],args[2],))
-
-elif cmd == 'addUserProfile':
- if len(args) != 2:
- print('addUserProfile requires 2 args')
- sys.exit(1)
- pp.pprint(client.addUserProfile(eval(args[0]),eval(args[1]),))
-
-elif cmd == 'updateUserProfile':
- if len(args) != 2:
- print('updateUserProfile requires 2 args')
- sys.exit(1)
- pp.pprint(client.updateUserProfile(eval(args[0]),eval(args[1]),))
-
-elif cmd == 'getUserProfileById':
- if len(args) != 3:
- print('getUserProfileById requires 3 args')
- sys.exit(1)
- pp.pprint(client.getUserProfileById(eval(args[0]),args[1],args[2],))
-
-elif cmd == 'deleteUserProfile':
if len(args) != 2:
- print('deleteUserProfile requires 2 args')
- sys.exit(1)
- pp.pprint(client.deleteUserProfile(eval(args[0]),args[1],))
-
-elif cmd == 'getAllUserProfilesInGateway':
- if len(args) != 4:
- print('getAllUserProfilesInGateway requires 4 args')
- sys.exit(1)
- pp.pprint(client.getAllUserProfilesInGateway(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
-
-elif cmd == 'doesUserProfileExist':
- if len(args) != 3:
- print('doesUserProfileExist requires 3 args')
+ print('getAllGroupsUserBelongs requires 2 args')
sys.exit(1)
- pp.pprint(client.doesUserProfileExist(eval(args[0]),args[1],args[2],))
+ pp.pprint(client.getAllGroupsUserBelongs(eval(args[0]),args[1],))
else:
print('Unrecognized method %s' % cmd)
[08/50] [abbrv] airavata git commit: all owners are treated as equal
Posted by ma...@apache.org.
all owners are treated as equal
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7af20472
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7af20472
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7af20472
Branch: refs/heads/master
Commit: 7af20472a36cceb1a8d8696e3caad8d0ef2973f2
Parents: a0c6b89
Author: scnakandala <su...@gmail.com>
Authored: Fri Jul 7 12:09:52 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Jul 7 12:09:52 2017 -0400
----------------------------------------------------------------------
.../sharing/registry/db/repositories/UserRepository.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7af20472/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
index a70166d..ee1f9b9 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java
@@ -48,9 +48,11 @@ public class UserRepository extends AbstractRepository<User, UserEntity, UserPK>
query += "u." + DBConstants.UserTable.DOMAIN_ID + " = '" + domainId + "' AND ";
query += "s." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId + "' AND ";
query += "s." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " = '" + permissionTypeId + "'";
- if(permissionTypeId.equals((new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId))){
- query += "AND s." + DBConstants.SharingTable.SHARING_TYPE + " LIKE 'DIRECT_%'";
- }
+
+// if(permissionTypeId.equals((new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId))){
+// query += "AND s." + DBConstants.SharingTable.SHARING_TYPE + " LIKE 'DIRECT_%'";
+// }
+
query += " ORDER BY s.createdTime DESC";
return select(query, 0, -1);
}
[41/50] [abbrv] airavata git commit: updating some of the group
management API methods in AiravataServerHandler
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/tenant/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/tenant/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/tenant/ttypes.py
index f13ce58..493eaff 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/tenant/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/tenant/ttypes.py
@@ -26,6 +26,7 @@ class TenantApprovalStatus:
CANCELLED = 4
DENIED = 5
CREATED = 6
+ DEPLOYED = 7
_VALUES_TO_NAMES = {
0: "REQUESTED",
@@ -35,6 +36,7 @@ class TenantApprovalStatus:
4: "CANCELLED",
5: "DENIED",
6: "CREATED",
+ 7: "DEPLOYED",
}
_NAMES_TO_VALUES = {
@@ -45,9 +47,227 @@ class TenantApprovalStatus:
"CANCELLED": 4,
"DENIED": 5,
"CREATED": 6,
+ "DEPLOYED": 7,
}
+class TenantPreferences:
+ """
+ Attributes:
+ - tenantAdminFirstName
+ - tenantAdminLastName
+ - tenantAdminEmail
+ """
+
+ thrift_spec = (
+ None, # 0
+ None, # 1
+ None, # 2
+ None, # 3
+ None, # 4
+ None, # 5
+ None, # 6
+ None, # 7
+ None, # 8
+ None, # 9
+ (10, TType.STRING, 'tenantAdminFirstName', None, None, ), # 10
+ (11, TType.STRING, 'tenantAdminLastName', None, None, ), # 11
+ (12, TType.STRING, 'tenantAdminEmail', None, None, ), # 12
+ )
+
+ def __init__(self, tenantAdminFirstName=None, tenantAdminLastName=None, tenantAdminEmail=None,):
+ self.tenantAdminFirstName = tenantAdminFirstName
+ self.tenantAdminLastName = tenantAdminLastName
+ self.tenantAdminEmail = tenantAdminEmail
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 10:
+ if ftype == TType.STRING:
+ self.tenantAdminFirstName = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 11:
+ if ftype == TType.STRING:
+ self.tenantAdminLastName = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 12:
+ if ftype == TType.STRING:
+ self.tenantAdminEmail = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('TenantPreferences')
+ if self.tenantAdminFirstName is not None:
+ oprot.writeFieldBegin('tenantAdminFirstName', TType.STRING, 10)
+ oprot.writeString(self.tenantAdminFirstName)
+ oprot.writeFieldEnd()
+ if self.tenantAdminLastName is not None:
+ oprot.writeFieldBegin('tenantAdminLastName', TType.STRING, 11)
+ oprot.writeString(self.tenantAdminLastName)
+ oprot.writeFieldEnd()
+ if self.tenantAdminEmail is not None:
+ oprot.writeFieldBegin('tenantAdminEmail', TType.STRING, 12)
+ oprot.writeString(self.tenantAdminEmail)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.tenantAdminFirstName)
+ value = (value * 31) ^ hash(self.tenantAdminLastName)
+ value = (value * 31) ^ hash(self.tenantAdminEmail)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
+class TenantConfig:
+ """
+ Attributes:
+ - oauthClientId
+ - oauthClientSecret
+ - identityServerUserName
+ - identityServerPasswordToken
+ """
+
+ thrift_spec = (
+ None, # 0
+ None, # 1
+ None, # 2
+ None, # 3
+ None, # 4
+ None, # 5
+ None, # 6
+ None, # 7
+ None, # 8
+ None, # 9
+ None, # 10
+ None, # 11
+ None, # 12
+ (13, TType.STRING, 'identityServerUserName', None, None, ), # 13
+ (14, TType.STRING, 'identityServerPasswordToken', None, None, ), # 14
+ None, # 15
+ (16, TType.STRING, 'oauthClientId', None, None, ), # 16
+ (17, TType.STRING, 'oauthClientSecret', None, None, ), # 17
+ )
+
+ def __init__(self, oauthClientId=None, oauthClientSecret=None, identityServerUserName=None, identityServerPasswordToken=None,):
+ self.oauthClientId = oauthClientId
+ self.oauthClientSecret = oauthClientSecret
+ self.identityServerUserName = identityServerUserName
+ self.identityServerPasswordToken = identityServerPasswordToken
+
+ def read(self, iprot):
+ if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
+ fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
+ return
+ iprot.readStructBegin()
+ while True:
+ (fname, ftype, fid) = iprot.readFieldBegin()
+ if ftype == TType.STOP:
+ break
+ if fid == 16:
+ if ftype == TType.STRING:
+ self.oauthClientId = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 17:
+ if ftype == TType.STRING:
+ self.oauthClientSecret = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 13:
+ if ftype == TType.STRING:
+ self.identityServerUserName = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 14:
+ if ftype == TType.STRING:
+ self.identityServerPasswordToken = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ else:
+ iprot.skip(ftype)
+ iprot.readFieldEnd()
+ iprot.readStructEnd()
+
+ def write(self, oprot):
+ if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
+ oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
+ return
+ oprot.writeStructBegin('TenantConfig')
+ if self.identityServerUserName is not None:
+ oprot.writeFieldBegin('identityServerUserName', TType.STRING, 13)
+ oprot.writeString(self.identityServerUserName)
+ oprot.writeFieldEnd()
+ if self.identityServerPasswordToken is not None:
+ oprot.writeFieldBegin('identityServerPasswordToken', TType.STRING, 14)
+ oprot.writeString(self.identityServerPasswordToken)
+ oprot.writeFieldEnd()
+ if self.oauthClientId is not None:
+ oprot.writeFieldBegin('oauthClientId', TType.STRING, 16)
+ oprot.writeString(self.oauthClientId)
+ oprot.writeFieldEnd()
+ if self.oauthClientSecret is not None:
+ oprot.writeFieldBegin('oauthClientSecret', TType.STRING, 17)
+ oprot.writeString(self.oauthClientSecret)
+ oprot.writeFieldEnd()
+ oprot.writeFieldStop()
+ oprot.writeStructEnd()
+
+ def validate(self):
+ return
+
+
+ def __hash__(self):
+ value = 17
+ value = (value * 31) ^ hash(self.oauthClientId)
+ value = (value * 31) ^ hash(self.oauthClientSecret)
+ value = (value * 31) ^ hash(self.identityServerUserName)
+ value = (value * 31) ^ hash(self.identityServerPasswordToken)
+ return value
+
+ def __repr__(self):
+ L = ['%s=%r' % (key, value)
+ for key, value in self.__dict__.iteritems()]
+ return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+ def __eq__(self, other):
+ return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+ def __ne__(self, other):
+ return not (self == other)
+
class Tenant:
"""
Attributes:
@@ -60,14 +280,7 @@ class Tenant:
- tenantURL
- tenantPublicAbstract
- reviewProposalDescription
- - tenantAdminFirstName
- - tenantAdminLastName
- - tenantAdminEmail
- - identityServerUserName
- - identityServerPasswordToken
- declinedReason
- - oauthClientId
- - oauthClientSecret
- requestCreationTime
- requesterUsername
"""
@@ -83,19 +296,19 @@ class Tenant:
(7, TType.STRING, 'tenantURL', None, None, ), # 7
(8, TType.STRING, 'tenantPublicAbstract', None, None, ), # 8
(9, TType.STRING, 'reviewProposalDescription', None, None, ), # 9
- (10, TType.STRING, 'tenantAdminFirstName', None, None, ), # 10
- (11, TType.STRING, 'tenantAdminLastName', None, None, ), # 11
- (12, TType.STRING, 'tenantAdminEmail', None, None, ), # 12
- (13, TType.STRING, 'identityServerUserName', None, None, ), # 13
- (14, TType.STRING, 'identityServerPasswordToken', None, None, ), # 14
+ None, # 10
+ None, # 11
+ None, # 12
+ None, # 13
+ None, # 14
(15, TType.STRING, 'declinedReason', None, None, ), # 15
- (16, TType.STRING, 'oauthClientId', None, None, ), # 16
- (17, TType.STRING, 'oauthClientSecret', None, None, ), # 17
+ None, # 16
+ None, # 17
(18, TType.I64, 'requestCreationTime', None, None, ), # 18
(19, TType.STRING, 'requesterUsername', None, None, ), # 19
)
- def __init__(self, tenantId=None, tenantApprovalStatus=None, tenantName=None, domain=None, emailAddress=None, tenantAcronym=None, tenantURL=None, tenantPublicAbstract=None, reviewProposalDescription=None, tenantAdminFirstName=None, tenantAdminLastName=None, tenantAdminEmail=None, identityServerUserName=None, identityServerPasswordToken=None, declinedReason=None, oauthClientId=None, oauthClientSecret=None, requestCreationTime=None, requesterUsername=None,):
+ def __init__(self, tenantId=None, tenantApprovalStatus=None, tenantName=None, domain=None, emailAddress=None, tenantAcronym=None, tenantURL=None, tenantPublicAbstract=None, reviewProposalDescription=None, declinedReason=None, requestCreationTime=None, requesterUsername=None,):
self.tenantId = tenantId
self.tenantApprovalStatus = tenantApprovalStatus
self.tenantName = tenantName
@@ -105,14 +318,7 @@ class Tenant:
self.tenantURL = tenantURL
self.tenantPublicAbstract = tenantPublicAbstract
self.reviewProposalDescription = reviewProposalDescription
- self.tenantAdminFirstName = tenantAdminFirstName
- self.tenantAdminLastName = tenantAdminLastName
- self.tenantAdminEmail = tenantAdminEmail
- self.identityServerUserName = identityServerUserName
- self.identityServerPasswordToken = identityServerPasswordToken
self.declinedReason = declinedReason
- self.oauthClientId = oauthClientId
- self.oauthClientSecret = oauthClientSecret
self.requestCreationTime = requestCreationTime
self.requesterUsername = requesterUsername
@@ -170,46 +376,11 @@ class Tenant:
self.reviewProposalDescription = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 10:
- if ftype == TType.STRING:
- self.tenantAdminFirstName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 11:
- if ftype == TType.STRING:
- self.tenantAdminLastName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 12:
- if ftype == TType.STRING:
- self.tenantAdminEmail = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 13:
- if ftype == TType.STRING:
- self.identityServerUserName = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 14:
- if ftype == TType.STRING:
- self.identityServerPasswordToken = iprot.readString()
- else:
- iprot.skip(ftype)
elif fid == 15:
if ftype == TType.STRING:
self.declinedReason = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 16:
- if ftype == TType.STRING:
- self.oauthClientId = iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 17:
- if ftype == TType.STRING:
- self.oauthClientSecret = iprot.readString()
- else:
- iprot.skip(ftype)
elif fid == 18:
if ftype == TType.I64:
self.requestCreationTime = iprot.readI64()
@@ -266,38 +437,10 @@ class Tenant:
oprot.writeFieldBegin('reviewProposalDescription', TType.STRING, 9)
oprot.writeString(self.reviewProposalDescription)
oprot.writeFieldEnd()
- if self.tenantAdminFirstName is not None:
- oprot.writeFieldBegin('tenantAdminFirstName', TType.STRING, 10)
- oprot.writeString(self.tenantAdminFirstName)
- oprot.writeFieldEnd()
- if self.tenantAdminLastName is not None:
- oprot.writeFieldBegin('tenantAdminLastName', TType.STRING, 11)
- oprot.writeString(self.tenantAdminLastName)
- oprot.writeFieldEnd()
- if self.tenantAdminEmail is not None:
- oprot.writeFieldBegin('tenantAdminEmail', TType.STRING, 12)
- oprot.writeString(self.tenantAdminEmail)
- oprot.writeFieldEnd()
- if self.identityServerUserName is not None:
- oprot.writeFieldBegin('identityServerUserName', TType.STRING, 13)
- oprot.writeString(self.identityServerUserName)
- oprot.writeFieldEnd()
- if self.identityServerPasswordToken is not None:
- oprot.writeFieldBegin('identityServerPasswordToken', TType.STRING, 14)
- oprot.writeString(self.identityServerPasswordToken)
- oprot.writeFieldEnd()
if self.declinedReason is not None:
oprot.writeFieldBegin('declinedReason', TType.STRING, 15)
oprot.writeString(self.declinedReason)
oprot.writeFieldEnd()
- if self.oauthClientId is not None:
- oprot.writeFieldBegin('oauthClientId', TType.STRING, 16)
- oprot.writeString(self.oauthClientId)
- oprot.writeFieldEnd()
- if self.oauthClientSecret is not None:
- oprot.writeFieldBegin('oauthClientSecret', TType.STRING, 17)
- oprot.writeString(self.oauthClientSecret)
- oprot.writeFieldEnd()
if self.requestCreationTime is not None:
oprot.writeFieldBegin('requestCreationTime', TType.I64, 18)
oprot.writeI64(self.requestCreationTime)
@@ -328,14 +471,7 @@ class Tenant:
value = (value * 31) ^ hash(self.tenantURL)
value = (value * 31) ^ hash(self.tenantPublicAbstract)
value = (value * 31) ^ hash(self.reviewProposalDescription)
- value = (value * 31) ^ hash(self.tenantAdminFirstName)
- value = (value * 31) ^ hash(self.tenantAdminLastName)
- value = (value * 31) ^ hash(self.tenantAdminEmail)
- value = (value * 31) ^ hash(self.identityServerUserName)
- value = (value * 31) ^ hash(self.identityServerPasswordToken)
value = (value * 31) ^ hash(self.declinedReason)
- value = (value * 31) ^ hash(self.oauthClientId)
- value = (value * 31) ^ hash(self.oauthClientSecret)
value = (value * 31) ^ hash(self.requestCreationTime)
value = (value * 31) ^ hash(self.requesterUsername)
return value
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
index d3e6914..707c995 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py
@@ -26,6 +26,7 @@ class GatewayApprovalStatus:
CANCELLED = 4
DENIED = 5
CREATED = 6
+ DEPLOYED = 7
_VALUES_TO_NAMES = {
0: "REQUESTED",
@@ -35,6 +36,7 @@ class GatewayApprovalStatus:
4: "CANCELLED",
5: "DENIED",
6: "CREATED",
+ 7: "DEPLOYED",
}
_NAMES_TO_VALUES = {
@@ -45,6 +47,7 @@ class GatewayApprovalStatus:
"CANCELLED": 4,
"DENIED": 5,
"CREATED": 6,
+ "DEPLOYED": 7,
}
class NotificationPriority:
@@ -462,6 +465,7 @@ class User:
class Gateway:
"""
Attributes:
+ - airavataInternalGatewayId
- gatewayId
- gatewayApprovalStatus
- gatewayName
@@ -485,28 +489,30 @@ class Gateway:
thrift_spec = (
None, # 0
- (1, TType.STRING, 'gatewayId', None, None, ), # 1
- (2, TType.I32, 'gatewayApprovalStatus', None, None, ), # 2
- (3, TType.STRING, 'gatewayName', None, None, ), # 3
- (4, TType.STRING, 'domain', None, None, ), # 4
- (5, TType.STRING, 'emailAddress', None, None, ), # 5
- (6, TType.STRING, 'gatewayAcronym', None, None, ), # 6
- (7, TType.STRING, 'gatewayURL', None, None, ), # 7
- (8, TType.STRING, 'gatewayPublicAbstract', None, None, ), # 8
- (9, TType.STRING, 'reviewProposalDescription', None, None, ), # 9
- (10, TType.STRING, 'gatewayAdminFirstName', None, None, ), # 10
- (11, TType.STRING, 'gatewayAdminLastName', None, None, ), # 11
- (12, TType.STRING, 'gatewayAdminEmail', None, None, ), # 12
- (13, TType.STRING, 'identityServerUserName', None, None, ), # 13
- (14, TType.STRING, 'identityServerPasswordToken', None, None, ), # 14
- (15, TType.STRING, 'declinedReason', None, None, ), # 15
- (16, TType.STRING, 'oauthClientId', None, None, ), # 16
- (17, TType.STRING, 'oauthClientSecret', None, None, ), # 17
- (18, TType.I64, 'requestCreationTime', None, None, ), # 18
- (19, TType.STRING, 'requesterUsername', None, None, ), # 19
+ (1, TType.STRING, 'airavataInternalGatewayId', None, None, ), # 1
+ (2, TType.STRING, 'gatewayId', None, None, ), # 2
+ (3, TType.I32, 'gatewayApprovalStatus', None, None, ), # 3
+ (4, TType.STRING, 'gatewayName', None, None, ), # 4
+ (5, TType.STRING, 'domain', None, None, ), # 5
+ (6, TType.STRING, 'emailAddress', None, None, ), # 6
+ (7, TType.STRING, 'gatewayAcronym', None, None, ), # 7
+ (8, TType.STRING, 'gatewayURL', None, None, ), # 8
+ (9, TType.STRING, 'gatewayPublicAbstract', None, None, ), # 9
+ (10, TType.STRING, 'reviewProposalDescription', None, None, ), # 10
+ (11, TType.STRING, 'gatewayAdminFirstName', None, None, ), # 11
+ (12, TType.STRING, 'gatewayAdminLastName', None, None, ), # 12
+ (13, TType.STRING, 'gatewayAdminEmail', None, None, ), # 13
+ (14, TType.STRING, 'identityServerUserName', None, None, ), # 14
+ (15, TType.STRING, 'identityServerPasswordToken', None, None, ), # 15
+ (16, TType.STRING, 'declinedReason', None, None, ), # 16
+ (17, TType.STRING, 'oauthClientId', None, None, ), # 17
+ (18, TType.STRING, 'oauthClientSecret', None, None, ), # 18
+ (19, TType.I64, 'requestCreationTime', None, None, ), # 19
+ (20, TType.STRING, 'requesterUsername', None, None, ), # 20
)
- def __init__(self, gatewayId=None, gatewayApprovalStatus=None, gatewayName=None, domain=None, emailAddress=None, gatewayAcronym=None, gatewayURL=None, gatewayPublicAbstract=None, reviewProposalDescription=None, gatewayAdminFirstName=None, gatewayAdminLastName=None, gatewayAdminEmail=None, identityServerUserName=None, identityServerPasswordToken=None, declinedReason=None, oauthClientId=None, oauthClientSecret=None, requestCreationTime=None, requesterUsername=None,):
+ def __init__(self, airavataInternalGatewayId=None, gatewayId=None, gatewayApprovalStatus=None, gatewayName=None, domain=None, emailAddress=None, gatewayAcronym=None, gatewayURL=None, gatewayPublicAbstract=None, reviewProposalDescription=None, gatewayAdminFirstName=None, gatewayAdminLastName=None, gatewayAdminEmail=None, identityServerUserName=None, identityServerPasswordToken=None, declinedReason=None, oauthClientId=None, oauthClientSecret=None, requestCreationTime=None, requesterUsername=None,):
+ self.airavataInternalGatewayId = airavataInternalGatewayId
self.gatewayId = gatewayId
self.gatewayApprovalStatus = gatewayApprovalStatus
self.gatewayName = gatewayName
@@ -538,95 +544,100 @@ class Gateway:
break
if fid == 1:
if ftype == TType.STRING:
- self.gatewayId = iprot.readString()
+ self.airavataInternalGatewayId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 2:
+ if ftype == TType.STRING:
+ self.gatewayId = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 3:
if ftype == TType.I32:
self.gatewayApprovalStatus = iprot.readI32()
else:
iprot.skip(ftype)
- elif fid == 3:
+ elif fid == 4:
if ftype == TType.STRING:
self.gatewayName = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 4:
+ elif fid == 5:
if ftype == TType.STRING:
self.domain = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 5:
+ elif fid == 6:
if ftype == TType.STRING:
self.emailAddress = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 6:
+ elif fid == 7:
if ftype == TType.STRING:
self.gatewayAcronym = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 7:
+ elif fid == 8:
if ftype == TType.STRING:
self.gatewayURL = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 8:
+ elif fid == 9:
if ftype == TType.STRING:
self.gatewayPublicAbstract = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 9:
+ elif fid == 10:
if ftype == TType.STRING:
self.reviewProposalDescription = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 10:
+ elif fid == 11:
if ftype == TType.STRING:
self.gatewayAdminFirstName = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 11:
+ elif fid == 12:
if ftype == TType.STRING:
self.gatewayAdminLastName = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 12:
+ elif fid == 13:
if ftype == TType.STRING:
self.gatewayAdminEmail = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 13:
+ elif fid == 14:
if ftype == TType.STRING:
self.identityServerUserName = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 14:
+ elif fid == 15:
if ftype == TType.STRING:
self.identityServerPasswordToken = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 15:
+ elif fid == 16:
if ftype == TType.STRING:
self.declinedReason = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 16:
+ elif fid == 17:
if ftype == TType.STRING:
self.oauthClientId = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 17:
+ elif fid == 18:
if ftype == TType.STRING:
self.oauthClientSecret = iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 18:
+ elif fid == 19:
if ftype == TType.I64:
self.requestCreationTime = iprot.readI64()
else:
iprot.skip(ftype)
- elif fid == 19:
+ elif fid == 20:
if ftype == TType.STRING:
self.requesterUsername = iprot.readString()
else:
@@ -641,80 +652,84 @@ class Gateway:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('Gateway')
+ if self.airavataInternalGatewayId is not None:
+ oprot.writeFieldBegin('airavataInternalGatewayId', TType.STRING, 1)
+ oprot.writeString(self.airavataInternalGatewayId)
+ oprot.writeFieldEnd()
if self.gatewayId is not None:
- oprot.writeFieldBegin('gatewayId', TType.STRING, 1)
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
oprot.writeString(self.gatewayId)
oprot.writeFieldEnd()
if self.gatewayApprovalStatus is not None:
- oprot.writeFieldBegin('gatewayApprovalStatus', TType.I32, 2)
+ oprot.writeFieldBegin('gatewayApprovalStatus', TType.I32, 3)
oprot.writeI32(self.gatewayApprovalStatus)
oprot.writeFieldEnd()
if self.gatewayName is not None:
- oprot.writeFieldBegin('gatewayName', TType.STRING, 3)
+ oprot.writeFieldBegin('gatewayName', TType.STRING, 4)
oprot.writeString(self.gatewayName)
oprot.writeFieldEnd()
if self.domain is not None:
- oprot.writeFieldBegin('domain', TType.STRING, 4)
+ oprot.writeFieldBegin('domain', TType.STRING, 5)
oprot.writeString(self.domain)
oprot.writeFieldEnd()
if self.emailAddress is not None:
- oprot.writeFieldBegin('emailAddress', TType.STRING, 5)
+ oprot.writeFieldBegin('emailAddress', TType.STRING, 6)
oprot.writeString(self.emailAddress)
oprot.writeFieldEnd()
if self.gatewayAcronym is not None:
- oprot.writeFieldBegin('gatewayAcronym', TType.STRING, 6)
+ oprot.writeFieldBegin('gatewayAcronym', TType.STRING, 7)
oprot.writeString(self.gatewayAcronym)
oprot.writeFieldEnd()
if self.gatewayURL is not None:
- oprot.writeFieldBegin('gatewayURL', TType.STRING, 7)
+ oprot.writeFieldBegin('gatewayURL', TType.STRING, 8)
oprot.writeString(self.gatewayURL)
oprot.writeFieldEnd()
if self.gatewayPublicAbstract is not None:
- oprot.writeFieldBegin('gatewayPublicAbstract', TType.STRING, 8)
+ oprot.writeFieldBegin('gatewayPublicAbstract', TType.STRING, 9)
oprot.writeString(self.gatewayPublicAbstract)
oprot.writeFieldEnd()
if self.reviewProposalDescription is not None:
- oprot.writeFieldBegin('reviewProposalDescription', TType.STRING, 9)
+ oprot.writeFieldBegin('reviewProposalDescription', TType.STRING, 10)
oprot.writeString(self.reviewProposalDescription)
oprot.writeFieldEnd()
if self.gatewayAdminFirstName is not None:
- oprot.writeFieldBegin('gatewayAdminFirstName', TType.STRING, 10)
+ oprot.writeFieldBegin('gatewayAdminFirstName', TType.STRING, 11)
oprot.writeString(self.gatewayAdminFirstName)
oprot.writeFieldEnd()
if self.gatewayAdminLastName is not None:
- oprot.writeFieldBegin('gatewayAdminLastName', TType.STRING, 11)
+ oprot.writeFieldBegin('gatewayAdminLastName', TType.STRING, 12)
oprot.writeString(self.gatewayAdminLastName)
oprot.writeFieldEnd()
if self.gatewayAdminEmail is not None:
- oprot.writeFieldBegin('gatewayAdminEmail', TType.STRING, 12)
+ oprot.writeFieldBegin('gatewayAdminEmail', TType.STRING, 13)
oprot.writeString(self.gatewayAdminEmail)
oprot.writeFieldEnd()
if self.identityServerUserName is not None:
- oprot.writeFieldBegin('identityServerUserName', TType.STRING, 13)
+ oprot.writeFieldBegin('identityServerUserName', TType.STRING, 14)
oprot.writeString(self.identityServerUserName)
oprot.writeFieldEnd()
if self.identityServerPasswordToken is not None:
- oprot.writeFieldBegin('identityServerPasswordToken', TType.STRING, 14)
+ oprot.writeFieldBegin('identityServerPasswordToken', TType.STRING, 15)
oprot.writeString(self.identityServerPasswordToken)
oprot.writeFieldEnd()
if self.declinedReason is not None:
- oprot.writeFieldBegin('declinedReason', TType.STRING, 15)
+ oprot.writeFieldBegin('declinedReason', TType.STRING, 16)
oprot.writeString(self.declinedReason)
oprot.writeFieldEnd()
if self.oauthClientId is not None:
- oprot.writeFieldBegin('oauthClientId', TType.STRING, 16)
+ oprot.writeFieldBegin('oauthClientId', TType.STRING, 17)
oprot.writeString(self.oauthClientId)
oprot.writeFieldEnd()
if self.oauthClientSecret is not None:
- oprot.writeFieldBegin('oauthClientSecret', TType.STRING, 17)
+ oprot.writeFieldBegin('oauthClientSecret', TType.STRING, 18)
oprot.writeString(self.oauthClientSecret)
oprot.writeFieldEnd()
if self.requestCreationTime is not None:
- oprot.writeFieldBegin('requestCreationTime', TType.I64, 18)
+ oprot.writeFieldBegin('requestCreationTime', TType.I64, 19)
oprot.writeI64(self.requestCreationTime)
oprot.writeFieldEnd()
if self.requesterUsername is not None:
- oprot.writeFieldBegin('requesterUsername', TType.STRING, 19)
+ oprot.writeFieldBegin('requesterUsername', TType.STRING, 20)
oprot.writeString(self.requesterUsername)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -730,6 +745,7 @@ class Gateway:
def __hash__(self):
value = 17
+ value = (value * 31) ^ hash(self.airavataInternalGatewayId)
value = (value * 31) ^ hash(self.gatewayId)
value = (value * 31) ^ hash(self.gatewayApprovalStatus)
value = (value * 31) ^ hash(self.gatewayName)
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/Tenant.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/Tenant.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/Tenant.java
index 77dd186..188c2da 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/Tenant.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/tenant/Tenant.java
@@ -64,14 +64,7 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
private static final org.apache.thrift.protocol.TField TENANT_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("tenantURL", org.apache.thrift.protocol.TType.STRING, (short)7);
private static final org.apache.thrift.protocol.TField TENANT_PUBLIC_ABSTRACT_FIELD_DESC = new org.apache.thrift.protocol.TField("tenantPublicAbstract", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final org.apache.thrift.protocol.TField REVIEW_PROPOSAL_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("reviewProposalDescription", org.apache.thrift.protocol.TType.STRING, (short)9);
- private static final org.apache.thrift.protocol.TField TENANT_ADMIN_FIRST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tenantAdminFirstName", org.apache.thrift.protocol.TType.STRING, (short)10);
- private static final org.apache.thrift.protocol.TField TENANT_ADMIN_LAST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tenantAdminLastName", org.apache.thrift.protocol.TType.STRING, (short)11);
- private static final org.apache.thrift.protocol.TField TENANT_ADMIN_EMAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("tenantAdminEmail", org.apache.thrift.protocol.TType.STRING, (short)12);
- private static final org.apache.thrift.protocol.TField IDENTITY_SERVER_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("identityServerUserName", org.apache.thrift.protocol.TType.STRING, (short)13);
- private static final org.apache.thrift.protocol.TField IDENTITY_SERVER_PASSWORD_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("identityServerPasswordToken", org.apache.thrift.protocol.TType.STRING, (short)14);
private static final org.apache.thrift.protocol.TField DECLINED_REASON_FIELD_DESC = new org.apache.thrift.protocol.TField("declinedReason", org.apache.thrift.protocol.TType.STRING, (short)15);
- private static final org.apache.thrift.protocol.TField OAUTH_CLIENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("oauthClientId", org.apache.thrift.protocol.TType.STRING, (short)16);
- private static final org.apache.thrift.protocol.TField OAUTH_CLIENT_SECRET_FIELD_DESC = new org.apache.thrift.protocol.TField("oauthClientSecret", org.apache.thrift.protocol.TType.STRING, (short)17);
private static final org.apache.thrift.protocol.TField REQUEST_CREATION_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("requestCreationTime", org.apache.thrift.protocol.TType.I64, (short)18);
private static final org.apache.thrift.protocol.TField REQUESTER_USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("requesterUsername", org.apache.thrift.protocol.TType.STRING, (short)19);
@@ -90,14 +83,7 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
private String tenantURL; // optional
private String tenantPublicAbstract; // optional
private String reviewProposalDescription; // optional
- private String tenantAdminFirstName; // optional
- private String tenantAdminLastName; // optional
- private String tenantAdminEmail; // optional
- private String identityServerUserName; // optional
- private String identityServerPasswordToken; // optional
private String declinedReason; // optional
- private String oauthClientId; // optional
- private String oauthClientSecret; // optional
private long requestCreationTime; // optional
private String requesterUsername; // optional
@@ -116,14 +102,7 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
TENANT_URL((short)7, "tenantURL"),
TENANT_PUBLIC_ABSTRACT((short)8, "tenantPublicAbstract"),
REVIEW_PROPOSAL_DESCRIPTION((short)9, "reviewProposalDescription"),
- TENANT_ADMIN_FIRST_NAME((short)10, "tenantAdminFirstName"),
- TENANT_ADMIN_LAST_NAME((short)11, "tenantAdminLastName"),
- TENANT_ADMIN_EMAIL((short)12, "tenantAdminEmail"),
- IDENTITY_SERVER_USER_NAME((short)13, "identityServerUserName"),
- IDENTITY_SERVER_PASSWORD_TOKEN((short)14, "identityServerPasswordToken"),
DECLINED_REASON((short)15, "declinedReason"),
- OAUTH_CLIENT_ID((short)16, "oauthClientId"),
- OAUTH_CLIENT_SECRET((short)17, "oauthClientSecret"),
REQUEST_CREATION_TIME((short)18, "requestCreationTime"),
REQUESTER_USERNAME((short)19, "requesterUsername");
@@ -158,22 +137,8 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
return TENANT_PUBLIC_ABSTRACT;
case 9: // REVIEW_PROPOSAL_DESCRIPTION
return REVIEW_PROPOSAL_DESCRIPTION;
- case 10: // TENANT_ADMIN_FIRST_NAME
- return TENANT_ADMIN_FIRST_NAME;
- case 11: // TENANT_ADMIN_LAST_NAME
- return TENANT_ADMIN_LAST_NAME;
- case 12: // TENANT_ADMIN_EMAIL
- return TENANT_ADMIN_EMAIL;
- case 13: // IDENTITY_SERVER_USER_NAME
- return IDENTITY_SERVER_USER_NAME;
- case 14: // IDENTITY_SERVER_PASSWORD_TOKEN
- return IDENTITY_SERVER_PASSWORD_TOKEN;
case 15: // DECLINED_REASON
return DECLINED_REASON;
- case 16: // OAUTH_CLIENT_ID
- return OAUTH_CLIENT_ID;
- case 17: // OAUTH_CLIENT_SECRET
- return OAUTH_CLIENT_SECRET;
case 18: // REQUEST_CREATION_TIME
return REQUEST_CREATION_TIME;
case 19: // REQUESTER_USERNAME
@@ -220,7 +185,7 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
// isset id assignments
private static final int __REQUESTCREATIONTIME_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.TENANT_NAME,_Fields.DOMAIN,_Fields.EMAIL_ADDRESS,_Fields.TENANT_ACRONYM,_Fields.TENANT_URL,_Fields.TENANT_PUBLIC_ABSTRACT,_Fields.REVIEW_PROPOSAL_DESCRIPTION,_Fields.TENANT_ADMIN_FIRST_NAME,_Fields.TENANT_ADMIN_LAST_NAME,_Fields.TENANT_ADMIN_EMAIL,_Fields.IDENTITY_SERVER_USER_NAME,_Fields.IDENTITY_SERVER_PASSWORD_TOKEN,_Fields.DECLINED_REASON,_Fields.OAUTH_CLIENT_ID,_Fields.OAUTH_CLIENT_SECRET,_Fields.REQUEST_CREATION_TIME,_Fields.REQUESTER_USERNAME};
+ private static final _Fields optionals[] = {_Fields.TENANT_NAME,_Fields.DOMAIN,_Fields.EMAIL_ADDRESS,_Fields.TENANT_ACRONYM,_Fields.TENANT_URL,_Fields.TENANT_PUBLIC_ABSTRACT,_Fields.REVIEW_PROPOSAL_DESCRIPTION,_Fields.DECLINED_REASON,_Fields.REQUEST_CREATION_TIME,_Fields.REQUESTER_USERNAME};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -242,22 +207,8 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.REVIEW_PROPOSAL_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("reviewProposalDescription", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.TENANT_ADMIN_FIRST_NAME, new org.apache.thrift.meta_data.FieldMetaData("tenantAdminFirstName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.TENANT_ADMIN_LAST_NAME, new org.apache.thrift.meta_data.FieldMetaData("tenantAdminLastName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.TENANT_ADMIN_EMAIL, new org.apache.thrift.meta_data.FieldMetaData("tenantAdminEmail", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.IDENTITY_SERVER_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("identityServerUserName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.IDENTITY_SERVER_PASSWORD_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("identityServerPasswordToken", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.DECLINED_REASON, new org.apache.thrift.meta_data.FieldMetaData("declinedReason", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.OAUTH_CLIENT_ID, new org.apache.thrift.meta_data.FieldMetaData("oauthClientId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.OAUTH_CLIENT_SECRET, new org.apache.thrift.meta_data.FieldMetaData("oauthClientSecret", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.REQUEST_CREATION_TIME, new org.apache.thrift.meta_data.FieldMetaData("requestCreationTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.REQUESTER_USERNAME, new org.apache.thrift.meta_data.FieldMetaData("requesterUsername", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -310,30 +261,9 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
if (other.isSetReviewProposalDescription()) {
this.reviewProposalDescription = other.reviewProposalDescription;
}
- if (other.isSetTenantAdminFirstName()) {
- this.tenantAdminFirstName = other.tenantAdminFirstName;
- }
- if (other.isSetTenantAdminLastName()) {
- this.tenantAdminLastName = other.tenantAdminLastName;
- }
- if (other.isSetTenantAdminEmail()) {
- this.tenantAdminEmail = other.tenantAdminEmail;
- }
- if (other.isSetIdentityServerUserName()) {
- this.identityServerUserName = other.identityServerUserName;
- }
- if (other.isSetIdentityServerPasswordToken()) {
- this.identityServerPasswordToken = other.identityServerPasswordToken;
- }
if (other.isSetDeclinedReason()) {
this.declinedReason = other.declinedReason;
}
- if (other.isSetOauthClientId()) {
- this.oauthClientId = other.oauthClientId;
- }
- if (other.isSetOauthClientSecret()) {
- this.oauthClientSecret = other.oauthClientSecret;
- }
this.requestCreationTime = other.requestCreationTime;
if (other.isSetRequesterUsername()) {
this.requesterUsername = other.requesterUsername;
@@ -355,14 +285,7 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
this.tenantURL = null;
this.tenantPublicAbstract = null;
this.reviewProposalDescription = null;
- this.tenantAdminFirstName = null;
- this.tenantAdminLastName = null;
- this.tenantAdminEmail = null;
- this.identityServerUserName = null;
- this.identityServerPasswordToken = null;
this.declinedReason = null;
- this.oauthClientId = null;
- this.oauthClientSecret = null;
setRequestCreationTimeIsSet(false);
this.requestCreationTime = 0;
this.requesterUsername = null;
@@ -583,121 +506,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
}
}
- public String getTenantAdminFirstName() {
- return this.tenantAdminFirstName;
- }
-
- public void setTenantAdminFirstName(String tenantAdminFirstName) {
- this.tenantAdminFirstName = tenantAdminFirstName;
- }
-
- public void unsetTenantAdminFirstName() {
- this.tenantAdminFirstName = null;
- }
-
- /** Returns true if field tenantAdminFirstName is set (has been assigned a value) and false otherwise */
- public boolean isSetTenantAdminFirstName() {
- return this.tenantAdminFirstName != null;
- }
-
- public void setTenantAdminFirstNameIsSet(boolean value) {
- if (!value) {
- this.tenantAdminFirstName = null;
- }
- }
-
- public String getTenantAdminLastName() {
- return this.tenantAdminLastName;
- }
-
- public void setTenantAdminLastName(String tenantAdminLastName) {
- this.tenantAdminLastName = tenantAdminLastName;
- }
-
- public void unsetTenantAdminLastName() {
- this.tenantAdminLastName = null;
- }
-
- /** Returns true if field tenantAdminLastName is set (has been assigned a value) and false otherwise */
- public boolean isSetTenantAdminLastName() {
- return this.tenantAdminLastName != null;
- }
-
- public void setTenantAdminLastNameIsSet(boolean value) {
- if (!value) {
- this.tenantAdminLastName = null;
- }
- }
-
- public String getTenantAdminEmail() {
- return this.tenantAdminEmail;
- }
-
- public void setTenantAdminEmail(String tenantAdminEmail) {
- this.tenantAdminEmail = tenantAdminEmail;
- }
-
- public void unsetTenantAdminEmail() {
- this.tenantAdminEmail = null;
- }
-
- /** Returns true if field tenantAdminEmail is set (has been assigned a value) and false otherwise */
- public boolean isSetTenantAdminEmail() {
- return this.tenantAdminEmail != null;
- }
-
- public void setTenantAdminEmailIsSet(boolean value) {
- if (!value) {
- this.tenantAdminEmail = null;
- }
- }
-
- public String getIdentityServerUserName() {
- return this.identityServerUserName;
- }
-
- public void setIdentityServerUserName(String identityServerUserName) {
- this.identityServerUserName = identityServerUserName;
- }
-
- public void unsetIdentityServerUserName() {
- this.identityServerUserName = null;
- }
-
- /** Returns true if field identityServerUserName is set (has been assigned a value) and false otherwise */
- public boolean isSetIdentityServerUserName() {
- return this.identityServerUserName != null;
- }
-
- public void setIdentityServerUserNameIsSet(boolean value) {
- if (!value) {
- this.identityServerUserName = null;
- }
- }
-
- public String getIdentityServerPasswordToken() {
- return this.identityServerPasswordToken;
- }
-
- public void setIdentityServerPasswordToken(String identityServerPasswordToken) {
- this.identityServerPasswordToken = identityServerPasswordToken;
- }
-
- public void unsetIdentityServerPasswordToken() {
- this.identityServerPasswordToken = null;
- }
-
- /** Returns true if field identityServerPasswordToken is set (has been assigned a value) and false otherwise */
- public boolean isSetIdentityServerPasswordToken() {
- return this.identityServerPasswordToken != null;
- }
-
- public void setIdentityServerPasswordTokenIsSet(boolean value) {
- if (!value) {
- this.identityServerPasswordToken = null;
- }
- }
-
public String getDeclinedReason() {
return this.declinedReason;
}
@@ -721,52 +529,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
}
}
- public String getOauthClientId() {
- return this.oauthClientId;
- }
-
- public void setOauthClientId(String oauthClientId) {
- this.oauthClientId = oauthClientId;
- }
-
- public void unsetOauthClientId() {
- this.oauthClientId = null;
- }
-
- /** Returns true if field oauthClientId is set (has been assigned a value) and false otherwise */
- public boolean isSetOauthClientId() {
- return this.oauthClientId != null;
- }
-
- public void setOauthClientIdIsSet(boolean value) {
- if (!value) {
- this.oauthClientId = null;
- }
- }
-
- public String getOauthClientSecret() {
- return this.oauthClientSecret;
- }
-
- public void setOauthClientSecret(String oauthClientSecret) {
- this.oauthClientSecret = oauthClientSecret;
- }
-
- public void unsetOauthClientSecret() {
- this.oauthClientSecret = null;
- }
-
- /** Returns true if field oauthClientSecret is set (has been assigned a value) and false otherwise */
- public boolean isSetOauthClientSecret() {
- return this.oauthClientSecret != null;
- }
-
- public void setOauthClientSecretIsSet(boolean value) {
- if (!value) {
- this.oauthClientSecret = null;
- }
- }
-
public long getRequestCreationTime() {
return this.requestCreationTime;
}
@@ -886,46 +648,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
}
break;
- case TENANT_ADMIN_FIRST_NAME:
- if (value == null) {
- unsetTenantAdminFirstName();
- } else {
- setTenantAdminFirstName((String)value);
- }
- break;
-
- case TENANT_ADMIN_LAST_NAME:
- if (value == null) {
- unsetTenantAdminLastName();
- } else {
- setTenantAdminLastName((String)value);
- }
- break;
-
- case TENANT_ADMIN_EMAIL:
- if (value == null) {
- unsetTenantAdminEmail();
- } else {
- setTenantAdminEmail((String)value);
- }
- break;
-
- case IDENTITY_SERVER_USER_NAME:
- if (value == null) {
- unsetIdentityServerUserName();
- } else {
- setIdentityServerUserName((String)value);
- }
- break;
-
- case IDENTITY_SERVER_PASSWORD_TOKEN:
- if (value == null) {
- unsetIdentityServerPasswordToken();
- } else {
- setIdentityServerPasswordToken((String)value);
- }
- break;
-
case DECLINED_REASON:
if (value == null) {
unsetDeclinedReason();
@@ -934,22 +656,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
}
break;
- case OAUTH_CLIENT_ID:
- if (value == null) {
- unsetOauthClientId();
- } else {
- setOauthClientId((String)value);
- }
- break;
-
- case OAUTH_CLIENT_SECRET:
- if (value == null) {
- unsetOauthClientSecret();
- } else {
- setOauthClientSecret((String)value);
- }
- break;
-
case REQUEST_CREATION_TIME:
if (value == null) {
unsetRequestCreationTime();
@@ -998,30 +704,9 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
case REVIEW_PROPOSAL_DESCRIPTION:
return getReviewProposalDescription();
- case TENANT_ADMIN_FIRST_NAME:
- return getTenantAdminFirstName();
-
- case TENANT_ADMIN_LAST_NAME:
- return getTenantAdminLastName();
-
- case TENANT_ADMIN_EMAIL:
- return getTenantAdminEmail();
-
- case IDENTITY_SERVER_USER_NAME:
- return getIdentityServerUserName();
-
- case IDENTITY_SERVER_PASSWORD_TOKEN:
- return getIdentityServerPasswordToken();
-
case DECLINED_REASON:
return getDeclinedReason();
- case OAUTH_CLIENT_ID:
- return getOauthClientId();
-
- case OAUTH_CLIENT_SECRET:
- return getOauthClientSecret();
-
case REQUEST_CREATION_TIME:
return getRequestCreationTime();
@@ -1057,22 +742,8 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
return isSetTenantPublicAbstract();
case REVIEW_PROPOSAL_DESCRIPTION:
return isSetReviewProposalDescription();
- case TENANT_ADMIN_FIRST_NAME:
- return isSetTenantAdminFirstName();
- case TENANT_ADMIN_LAST_NAME:
- return isSetTenantAdminLastName();
- case TENANT_ADMIN_EMAIL:
- return isSetTenantAdminEmail();
- case IDENTITY_SERVER_USER_NAME:
- return isSetIdentityServerUserName();
- case IDENTITY_SERVER_PASSWORD_TOKEN:
- return isSetIdentityServerPasswordToken();
case DECLINED_REASON:
return isSetDeclinedReason();
- case OAUTH_CLIENT_ID:
- return isSetOauthClientId();
- case OAUTH_CLIENT_SECRET:
- return isSetOauthClientSecret();
case REQUEST_CREATION_TIME:
return isSetRequestCreationTime();
case REQUESTER_USERNAME:
@@ -1175,51 +846,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
return false;
}
- boolean this_present_tenantAdminFirstName = true && this.isSetTenantAdminFirstName();
- boolean that_present_tenantAdminFirstName = true && that.isSetTenantAdminFirstName();
- if (this_present_tenantAdminFirstName || that_present_tenantAdminFirstName) {
- if (!(this_present_tenantAdminFirstName && that_present_tenantAdminFirstName))
- return false;
- if (!this.tenantAdminFirstName.equals(that.tenantAdminFirstName))
- return false;
- }
-
- boolean this_present_tenantAdminLastName = true && this.isSetTenantAdminLastName();
- boolean that_present_tenantAdminLastName = true && that.isSetTenantAdminLastName();
- if (this_present_tenantAdminLastName || that_present_tenantAdminLastName) {
- if (!(this_present_tenantAdminLastName && that_present_tenantAdminLastName))
- return false;
- if (!this.tenantAdminLastName.equals(that.tenantAdminLastName))
- return false;
- }
-
- boolean this_present_tenantAdminEmail = true && this.isSetTenantAdminEmail();
- boolean that_present_tenantAdminEmail = true && that.isSetTenantAdminEmail();
- if (this_present_tenantAdminEmail || that_present_tenantAdminEmail) {
- if (!(this_present_tenantAdminEmail && that_present_tenantAdminEmail))
- return false;
- if (!this.tenantAdminEmail.equals(that.tenantAdminEmail))
- return false;
- }
-
- boolean this_present_identityServerUserName = true && this.isSetIdentityServerUserName();
- boolean that_present_identityServerUserName = true && that.isSetIdentityServerUserName();
- if (this_present_identityServerUserName || that_present_identityServerUserName) {
- if (!(this_present_identityServerUserName && that_present_identityServerUserName))
- return false;
- if (!this.identityServerUserName.equals(that.identityServerUserName))
- return false;
- }
-
- boolean this_present_identityServerPasswordToken = true && this.isSetIdentityServerPasswordToken();
- boolean that_present_identityServerPasswordToken = true && that.isSetIdentityServerPasswordToken();
- if (this_present_identityServerPasswordToken || that_present_identityServerPasswordToken) {
- if (!(this_present_identityServerPasswordToken && that_present_identityServerPasswordToken))
- return false;
- if (!this.identityServerPasswordToken.equals(that.identityServerPasswordToken))
- return false;
- }
-
boolean this_present_declinedReason = true && this.isSetDeclinedReason();
boolean that_present_declinedReason = true && that.isSetDeclinedReason();
if (this_present_declinedReason || that_present_declinedReason) {
@@ -1229,24 +855,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
return false;
}
- boolean this_present_oauthClientId = true && this.isSetOauthClientId();
- boolean that_present_oauthClientId = true && that.isSetOauthClientId();
- if (this_present_oauthClientId || that_present_oauthClientId) {
- if (!(this_present_oauthClientId && that_present_oauthClientId))
- return false;
- if (!this.oauthClientId.equals(that.oauthClientId))
- return false;
- }
-
- boolean this_present_oauthClientSecret = true && this.isSetOauthClientSecret();
- boolean that_present_oauthClientSecret = true && that.isSetOauthClientSecret();
- if (this_present_oauthClientSecret || that_present_oauthClientSecret) {
- if (!(this_present_oauthClientSecret && that_present_oauthClientSecret))
- return false;
- if (!this.oauthClientSecret.equals(that.oauthClientSecret))
- return false;
- }
-
boolean this_present_requestCreationTime = true && this.isSetRequestCreationTime();
boolean that_present_requestCreationTime = true && that.isSetRequestCreationTime();
if (this_present_requestCreationTime || that_present_requestCreationTime) {
@@ -1317,46 +925,11 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
if (present_reviewProposalDescription)
list.add(reviewProposalDescription);
- boolean present_tenantAdminFirstName = true && (isSetTenantAdminFirstName());
- list.add(present_tenantAdminFirstName);
- if (present_tenantAdminFirstName)
- list.add(tenantAdminFirstName);
-
- boolean present_tenantAdminLastName = true && (isSetTenantAdminLastName());
- list.add(present_tenantAdminLastName);
- if (present_tenantAdminLastName)
- list.add(tenantAdminLastName);
-
- boolean present_tenantAdminEmail = true && (isSetTenantAdminEmail());
- list.add(present_tenantAdminEmail);
- if (present_tenantAdminEmail)
- list.add(tenantAdminEmail);
-
- boolean present_identityServerUserName = true && (isSetIdentityServerUserName());
- list.add(present_identityServerUserName);
- if (present_identityServerUserName)
- list.add(identityServerUserName);
-
- boolean present_identityServerPasswordToken = true && (isSetIdentityServerPasswordToken());
- list.add(present_identityServerPasswordToken);
- if (present_identityServerPasswordToken)
- list.add(identityServerPasswordToken);
-
boolean present_declinedReason = true && (isSetDeclinedReason());
list.add(present_declinedReason);
if (present_declinedReason)
list.add(declinedReason);
- boolean present_oauthClientId = true && (isSetOauthClientId());
- list.add(present_oauthClientId);
- if (present_oauthClientId)
- list.add(oauthClientId);
-
- boolean present_oauthClientSecret = true && (isSetOauthClientSecret());
- list.add(present_oauthClientSecret);
- if (present_oauthClientSecret)
- list.add(oauthClientSecret);
-
boolean present_requestCreationTime = true && (isSetRequestCreationTime());
list.add(present_requestCreationTime);
if (present_requestCreationTime)
@@ -1468,56 +1041,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetTenantAdminFirstName()).compareTo(other.isSetTenantAdminFirstName());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetTenantAdminFirstName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tenantAdminFirstName, other.tenantAdminFirstName);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetTenantAdminLastName()).compareTo(other.isSetTenantAdminLastName());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetTenantAdminLastName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tenantAdminLastName, other.tenantAdminLastName);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetTenantAdminEmail()).compareTo(other.isSetTenantAdminEmail());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetTenantAdminEmail()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tenantAdminEmail, other.tenantAdminEmail);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetIdentityServerUserName()).compareTo(other.isSetIdentityServerUserName());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetIdentityServerUserName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.identityServerUserName, other.identityServerUserName);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetIdentityServerPasswordToken()).compareTo(other.isSetIdentityServerPasswordToken());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetIdentityServerPasswordToken()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.identityServerPasswordToken, other.identityServerPasswordToken);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = Boolean.valueOf(isSetDeclinedReason()).compareTo(other.isSetDeclinedReason());
if (lastComparison != 0) {
return lastComparison;
@@ -1528,26 +1051,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetOauthClientId()).compareTo(other.isSetOauthClientId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetOauthClientId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.oauthClientId, other.oauthClientId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetOauthClientSecret()).compareTo(other.isSetOauthClientSecret());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetOauthClientSecret()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.oauthClientSecret, other.oauthClientSecret);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = Boolean.valueOf(isSetRequestCreationTime()).compareTo(other.isSetRequestCreationTime());
if (lastComparison != 0) {
return lastComparison;
@@ -1673,56 +1176,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
}
first = false;
}
- if (isSetTenantAdminFirstName()) {
- if (!first) sb.append(", ");
- sb.append("tenantAdminFirstName:");
- if (this.tenantAdminFirstName == null) {
- sb.append("null");
- } else {
- sb.append(this.tenantAdminFirstName);
- }
- first = false;
- }
- if (isSetTenantAdminLastName()) {
- if (!first) sb.append(", ");
- sb.append("tenantAdminLastName:");
- if (this.tenantAdminLastName == null) {
- sb.append("null");
- } else {
- sb.append(this.tenantAdminLastName);
- }
- first = false;
- }
- if (isSetTenantAdminEmail()) {
- if (!first) sb.append(", ");
- sb.append("tenantAdminEmail:");
- if (this.tenantAdminEmail == null) {
- sb.append("null");
- } else {
- sb.append(this.tenantAdminEmail);
- }
- first = false;
- }
- if (isSetIdentityServerUserName()) {
- if (!first) sb.append(", ");
- sb.append("identityServerUserName:");
- if (this.identityServerUserName == null) {
- sb.append("null");
- } else {
- sb.append(this.identityServerUserName);
- }
- first = false;
- }
- if (isSetIdentityServerPasswordToken()) {
- if (!first) sb.append(", ");
- sb.append("identityServerPasswordToken:");
- if (this.identityServerPasswordToken == null) {
- sb.append("null");
- } else {
- sb.append(this.identityServerPasswordToken);
- }
- first = false;
- }
if (isSetDeclinedReason()) {
if (!first) sb.append(", ");
sb.append("declinedReason:");
@@ -1733,26 +1186,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
}
first = false;
}
- if (isSetOauthClientId()) {
- if (!first) sb.append(", ");
- sb.append("oauthClientId:");
- if (this.oauthClientId == null) {
- sb.append("null");
- } else {
- sb.append(this.oauthClientId);
- }
- first = false;
- }
- if (isSetOauthClientSecret()) {
- if (!first) sb.append(", ");
- sb.append("oauthClientSecret:");
- if (this.oauthClientSecret == null) {
- sb.append("null");
- } else {
- sb.append(this.oauthClientSecret);
- }
- first = false;
- }
if (isSetRequestCreationTime()) {
if (!first) sb.append(", ");
sb.append("requestCreationTime:");
@@ -1894,46 +1327,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 10: // TENANT_ADMIN_FIRST_NAME
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.tenantAdminFirstName = iprot.readString();
- struct.setTenantAdminFirstNameIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 11: // TENANT_ADMIN_LAST_NAME
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.tenantAdminLastName = iprot.readString();
- struct.setTenantAdminLastNameIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 12: // TENANT_ADMIN_EMAIL
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.tenantAdminEmail = iprot.readString();
- struct.setTenantAdminEmailIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 13: // IDENTITY_SERVER_USER_NAME
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.identityServerUserName = iprot.readString();
- struct.setIdentityServerUserNameIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 14: // IDENTITY_SERVER_PASSWORD_TOKEN
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.identityServerPasswordToken = iprot.readString();
- struct.setIdentityServerPasswordTokenIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
case 15: // DECLINED_REASON
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.declinedReason = iprot.readString();
@@ -1942,22 +1335,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 16: // OAUTH_CLIENT_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.oauthClientId = iprot.readString();
- struct.setOauthClientIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 17: // OAUTH_CLIENT_SECRET
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.oauthClientSecret = iprot.readString();
- struct.setOauthClientSecretIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
case 18: // REQUEST_CREATION_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.requestCreationTime = iprot.readI64();
@@ -2046,41 +1423,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
oprot.writeFieldEnd();
}
}
- if (struct.tenantAdminFirstName != null) {
- if (struct.isSetTenantAdminFirstName()) {
- oprot.writeFieldBegin(TENANT_ADMIN_FIRST_NAME_FIELD_DESC);
- oprot.writeString(struct.tenantAdminFirstName);
- oprot.writeFieldEnd();
- }
- }
- if (struct.tenantAdminLastName != null) {
- if (struct.isSetTenantAdminLastName()) {
- oprot.writeFieldBegin(TENANT_ADMIN_LAST_NAME_FIELD_DESC);
- oprot.writeString(struct.tenantAdminLastName);
- oprot.writeFieldEnd();
- }
- }
- if (struct.tenantAdminEmail != null) {
- if (struct.isSetTenantAdminEmail()) {
- oprot.writeFieldBegin(TENANT_ADMIN_EMAIL_FIELD_DESC);
- oprot.writeString(struct.tenantAdminEmail);
- oprot.writeFieldEnd();
- }
- }
- if (struct.identityServerUserName != null) {
- if (struct.isSetIdentityServerUserName()) {
- oprot.writeFieldBegin(IDENTITY_SERVER_USER_NAME_FIELD_DESC);
- oprot.writeString(struct.identityServerUserName);
- oprot.writeFieldEnd();
- }
- }
- if (struct.identityServerPasswordToken != null) {
- if (struct.isSetIdentityServerPasswordToken()) {
- oprot.writeFieldBegin(IDENTITY_SERVER_PASSWORD_TOKEN_FIELD_DESC);
- oprot.writeString(struct.identityServerPasswordToken);
- oprot.writeFieldEnd();
- }
- }
if (struct.declinedReason != null) {
if (struct.isSetDeclinedReason()) {
oprot.writeFieldBegin(DECLINED_REASON_FIELD_DESC);
@@ -2088,20 +1430,6 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
oprot.writeFieldEnd();
}
}
- if (struct.oauthClientId != null) {
- if (struct.isSetOauthClientId()) {
- oprot.writeFieldBegin(OAUTH_CLIENT_ID_FIELD_DESC);
- oprot.writeString(struct.oauthClientId);
- oprot.writeFieldEnd();
- }
- }
- if (struct.oauthClientSecret != null) {
- if (struct.isSetOauthClientSecret()) {
- oprot.writeFieldBegin(OAUTH_CLIENT_SECRET_FIELD_DESC);
- oprot.writeString(struct.oauthClientSecret);
- oprot.writeFieldEnd();
- }
- }
if (struct.isSetRequestCreationTime()) {
oprot.writeFieldBegin(REQUEST_CREATION_TIME_FIELD_DESC);
oprot.writeI64(struct.requestCreationTime);
@@ -2155,37 +1483,16 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
if (struct.isSetReviewProposalDescription()) {
optionals.set(6);
}
- if (struct.isSetTenantAdminFirstName()) {
- optionals.set(7);
- }
- if (struct.isSetTenantAdminLastName()) {
- optionals.set(8);
- }
- if (struct.isSetTenantAdminEmail()) {
- optionals.set(9);
- }
- if (struct.isSetIdentityServerUserName()) {
- optionals.set(10);
- }
- if (struct.isSetIdentityServerPasswordToken()) {
- optionals.set(11);
- }
if (struct.isSetDeclinedReason()) {
- optionals.set(12);
- }
- if (struct.isSetOauthClientId()) {
- optionals.set(13);
- }
- if (struct.isSetOauthClientSecret()) {
- optionals.set(14);
+ optionals.set(7);
}
if (struct.isSetRequestCreationTime()) {
- optionals.set(15);
+ optionals.set(8);
}
if (struct.isSetRequesterUsername()) {
- optionals.set(16);
+ optionals.set(9);
}
- oprot.writeBitSet(optionals, 17);
+ oprot.writeBitSet(optionals, 10);
if (struct.isSetTenantName()) {
oprot.writeString(struct.tenantName);
}
@@ -2207,30 +1514,9 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
if (struct.isSetReviewProposalDescription()) {
oprot.writeString(struct.reviewProposalDescription);
}
- if (struct.isSetTenantAdminFirstName()) {
- oprot.writeString(struct.tenantAdminFirstName);
- }
- if (struct.isSetTenantAdminLastName()) {
- oprot.writeString(struct.tenantAdminLastName);
- }
- if (struct.isSetTenantAdminEmail()) {
- oprot.writeString(struct.tenantAdminEmail);
- }
- if (struct.isSetIdentityServerUserName()) {
- oprot.writeString(struct.identityServerUserName);
- }
- if (struct.isSetIdentityServerPasswordToken()) {
- oprot.writeString(struct.identityServerPasswordToken);
- }
if (struct.isSetDeclinedReason()) {
oprot.writeString(struct.declinedReason);
}
- if (struct.isSetOauthClientId()) {
- oprot.writeString(struct.oauthClientId);
- }
- if (struct.isSetOauthClientSecret()) {
- oprot.writeString(struct.oauthClientSecret);
- }
if (struct.isSetRequestCreationTime()) {
oprot.writeI64(struct.requestCreationTime);
}
@@ -2246,7 +1532,7 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
struct.setTenantIdIsSet(true);
struct.tenantApprovalStatus = org.apache.airavata.model.tenant.TenantApprovalStatus.findByValue(iprot.readI32());
struct.setTenantApprovalStatusIsSet(true);
- BitSet incoming = iprot.readBitSet(17);
+ BitSet incoming = iprot.readBitSet(10);
if (incoming.get(0)) {
struct.tenantName = iprot.readString();
struct.setTenantNameIsSet(true);
@@ -2276,42 +1562,14 @@ public class Tenant implements org.apache.thrift.TBase<Tenant, Tenant._Fields>,
struct.setReviewProposalDescriptionIsSet(true);
}
if (incoming.get(7)) {
- struct.tenantAdminFirstName = iprot.readString();
- struct.setTenantAdminFirstNameIsSet(true);
- }
- if (incoming.get(8)) {
- struct.tenantAdminLastName = iprot.readString();
- struct.setTenantAdminLastNameIsSet(true);
- }
- if (incoming.get(9)) {
- struct.tenantAdminEmail = iprot.readString();
- struct.setTenantAdminEmailIsSet(true);
- }
- if (incoming.get(10)) {
- struct.identityServerUserName = iprot.readString();
- struct.setIdentityServerUserNameIsSet(true);
- }
- if (incoming.get(11)) {
- struct.identityServerPasswordToken = iprot.readString();
- struct.setIdentityServerPasswordTokenIsSet(true);
- }
- if (incoming.get(12)) {
struct.declinedReason = iprot.readString();
struct.setDeclinedReasonIsSet(true);
}
- if (incoming.get(13)) {
- struct.oauthClientId = iprot.readString();
- struct.setOauthClientIdIsSet(true);
- }
- if (incoming.get(14)) {
- struct.oauthClientSecret = iprot.readString();
- struct.setOauthClientSecretIsSet(true);
- }
- if (incoming.get(15)) {
+ if (incoming.get(8)) {
struct.requestCreationTime = iprot.readI64();
struct.setRequestCreationTimeIsSet(true);
}
- if (incoming.get(16)) {
+ if (incoming.get(9)) {
struct.requesterUsername = iprot.readString();
struct.setRequesterUsernameIsSet(true);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java
index 3f83cf1..3bfc653 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/GatewayApprovalStatus.java
@@ -24,6 +24,10 @@
package org.apache.airavata.model.workspace;
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
public enum GatewayApprovalStatus implements org.apache.thrift.TEnum {
REQUESTED(0),
APPROVED(1),
http://git-wip-us.apache.org/repos/asf/airavata/blob/e7e77716/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
index 66a4481..0a34ac6 100644
--- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
@@ -3436,7 +3436,7 @@ service Airavata {
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
-bool createGroup(1: required security_model.AuthzToken authzToken, 2: required group_manager_model.GroupModel groupModel)
+string createGroup(1: required security_model.AuthzToken authzToken, 2: required group_manager_model.GroupModel groupModel)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
@@ -3448,7 +3448,7 @@ bool createGroup(1: required security_model.AuthzToken authzToken, 2: required g
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- bool deleteGroup(1: required security_model.AuthzToken authzToken, 2: required string groupId, 3: required string ownerId, 4: required string gatewayId)
+ bool deleteGroup(1: required security_model.AuthzToken authzToken, 2: required string groupId, 3: required string ownerId)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
@@ -3460,7 +3460,7 @@ bool createGroup(1: required security_model.AuthzToken authzToken, 2: required g
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- list<group_manager_model.GroupModel> getAllGroupsUserBelongs(1: required security_model.AuthzToken authzToken, 2: required string userName, 3: required string gatewayId)
+ list<group_manager_model.GroupModel> getAllGroupsUserBelongs(1: required security_model.AuthzToken authzToken, 2: required string userName)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
[47/50] [abbrv] airavata git commit: UAB and NMSU Gateway Ansible
Script updates
Posted by ma...@apache.org.
UAB and NMSU Gateway Ansible Script updates
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1f35ede1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1f35ede1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1f35ede1
Branch: refs/heads/master
Commit: 1f35ede16b01b52908b397d76d751a1262711692
Parents: e7e7771
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Jul 27 05:34:56 2017 +0530
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Jul 27 05:34:56 2017 +0530
----------------------------------------------------------------------
.../scigap/production/pga_config/newmexicostate/vars.yml | 10 +++++-----
.../inventories/scigap/production/pga_config/uab/vars.yml | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/1f35ede1/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
index 7254a1f..adba265 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
@@ -24,12 +24,12 @@ git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/new-mexico-state"
-vhost_servername: "nmsu.scigap.org"
-vhost_ssl: False
+vhost_servername: "sciencegateway.nmsu.edu"
+vhost_ssl: True
# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/sciencegateway.nmsu.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/sciencegateway.nmsu.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/sciencegateway.nmsu.edu/privkey.pem"
## Keycloak related variables
tenant_domain: "{{ gateway_id }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/1f35ede1/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
index 7670791..54cc932 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
@@ -24,12 +24,12 @@ git_branch: "develop"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/alabama-birmingham"
-vhost_servername: "uab.scigap.org"
-vhost_ssl: False
+vhost_servername: "torana.rc.uab.edu"
+vhost_ssl: true
# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/torana.rc.uab.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/torana.rc.uab.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/torana.rc.uab.edu/privkey.pem"
## Keycloak related variables
tenant_domain: "{{ gateway_id }}"
[38/50] [abbrv] airavata git commit: merge
Posted by ma...@apache.org.
merge
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/edd1dbbc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/edd1dbbc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/edd1dbbc
Branch: refs/heads/master
Commit: edd1dbbc3f6b1e37b4a4e1bdc9d3322ee949c172
Parents: fe6e9a2 a0a66dc
Author: scnakandala <su...@gmail.com>
Authored: Tue Jul 18 13:43:42 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Jul 18 13:43:42 2017 -0400
----------------------------------------------------------------------
.../core/impl/TenantManagementKeycloakImpl.java | 31 +-
.../inventories/scigap/dreg-production/hosts | 10 +-
.../production/files/client_truststore.jks | 395 +++++++++++++------
.../scigap/production/files/keycloak.jks | 143 +++++++
.../production/files/pga_config_0.17.php.j2 | 256 ++++++++++++
.../scigap/production/group_vars/all/vars.yml | 26 +-
.../scigap/production/group_vars/all/vault.yml | 50 ++-
.../ansible/inventories/scigap/production/hosts | 14 +-
.../production/pga_config/accord/vars.yml | 66 ++++
.../production/pga_config/accord/vault.yml | 18 +
.../production/pga_config/brandeis/vars.yml | 12 +-
.../production/pga_config/brandeis/vault.yml | 34 +-
.../production/pga_config/cinetvtech/vars.yml | 55 ---
.../production/pga_config/cinetvtech/vault.yml | 18 -
.../production/pga_config/gatech/vars.yml | 61 +++
.../production/pga_config/gatech/vault.yml | 18 +
.../production/pga_config/georgiastate/vars.yml | 18 +-
.../pga_config/georgiastate/vault.yml | 34 +-
.../production/pga_config/iugateway/vars.yml | 16 +-
.../production/pga_config/iugateway/vault.yml | 34 +-
.../scigap/production/pga_config/lsu/vars.yml | 12 +-
.../scigap/production/pga_config/lsu/vault.yml | 34 +-
.../pga_config/nanoconfinement/vars.yml | 18 +-
.../pga_config/nanoconfinement/vault.yml | 33 +-
.../production/pga_config/nanoshape/vars.yml | 65 +++
.../production/pga_config/nanoshape/vault.yml | 18 +
.../pga_config/newmexicostate/vars.yml | 61 +++
.../pga_config/newmexicostate/vault.yml | 18 +
.../scigap/production/pga_config/nsg/vars.yml | 15 +-
.../scigap/production/pga_config/nsg/vault.yml | 34 +-
.../production/pga_config/oiitandy/vars.yml | 16 +-
.../production/pga_config/oiitandy/vault.yml | 34 +-
.../scigap/production/pga_config/oscer/vars.yml | 16 +-
.../production/pga_config/oscer/vault.yml | 33 +-
.../production/pga_config/phasta/vars.yml | 16 +-
.../production/pga_config/phasta/vault.yml | 34 +-
.../production/pga_config/scigap/vars.yml | 25 +-
.../production/pga_config/scigap/vault.yml | 34 +-
.../production/pga_config/seagrid/vars.yml | 21 +-
.../production/pga_config/seagrid/vault.yml | 34 +-
.../production/pga_config/simvascular/vars.yml | 12 +-
.../production/pga_config/simvascular/vault.yml | 34 +-
.../production/pga_config/southdakota/vars.yml | 16 +-
.../production/pga_config/southdakota/vault.yml | 33 +-
.../pga_config/southernillinois/vars.yml | 22 +-
.../pga_config/southernillinois/vault.yml | 34 +-
.../production/pga_config/testdrive/vars.yml | 20 +-
.../production/pga_config/testdrive/vault.yml | 34 +-
.../scigap/production/pga_config/uab/vars.yml | 61 +++
.../scigap/production/pga_config/uab/vault.yml | 18 +
.../production/pga_config/ultrascan/vars.yml | 18 +-
.../scigap/production/pga_config/utah/vars.yml | 18 +-
.../scigap/production/pga_config/utah/vault.yml | 34 +-
dev-tools/ansible/pga-scigap-prod.yml | 6 +-
.../templates/airavata-server.properties.j2 | 5 +
.../templates/airavata-server.properties.j2 | 5 +
dev-tools/ansible/roles/pga/defaults/main.yml | 1 +
.../roles/pga/tasks/install_deps_CentOS_7.yml | 1 +
dev-tools/ansible/roles/pga/tasks/main.yml | 2 +-
.../main/resources/airavata-server.properties | 7 +-
modules/db-event-manager/pom.xml | 2 +-
.../db/event/manager/DBEventManagerRunner.java | 67 +++-
modules/distribution/pom.xml | 5 +
.../catalog/resources/WorkerResource.java | 52 ++-
.../RegistryServiceDBEventHandler.java | 7 +-
.../sharingCatalog_keycloak_migration.sql | 2 +-
.../org/apache/airavata/server/ServerMain.java | 8 +-
.../db/repositories/AbstractRepository.java | 12 +-
.../repositories/GroupMembershipRepository.java | 39 +-
.../db/repositories/SharingRepository.java | 50 +--
.../db/repositories/UserGroupRepository.java | 31 +-
.../db/repositories/UserRepository.java | 18 +-
.../messaging/SharingServiceDBEventHandler.java | 7 +-
.../server/SharingRegistryServerHandler.java | 3 +-
pom.xml | 1 +
.../tenant_profile_model.thrift | 20 +-
76 files changed, 1924 insertions(+), 661 deletions(-)
----------------------------------------------------------------------
[49/50] [abbrv] airavata git commit: Switching branch before merge to
master
Posted by ma...@apache.org.
Switching branch before merge to master
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/36edde69
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/36edde69
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/36edde69
Branch: refs/heads/master
Commit: 36edde69802c4f439afa5917dd0086f2ca0cff41
Parents: d49f252
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Jul 27 16:52:22 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Jul 27 17:13:17 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml | 2 +-
.../ansible/inventories/scigap/production/group_vars/all/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/accord/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/brandeis/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/gatech/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/georgiastate/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/iugateway/vars.yml | 2 +-
.../ansible/inventories/scigap/production/pga_config/lsu/vars.yml | 2 +-
.../scigap/production/pga_config/nanoconfinement/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/nanoshape/vars.yml | 2 +-
.../scigap/production/pga_config/newmexicostate/vars.yml | 2 +-
.../ansible/inventories/scigap/production/pga_config/nsg/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/oiitandy/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/oscer/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/phasta/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/scigap/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/seagrid/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/simvascular/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/southdakota/vars.yml | 2 +-
.../scigap/production/pga_config/southernillinois/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/testdrive/vars.yml | 2 +-
.../ansible/inventories/scigap/production/pga_config/uab/vars.yml | 2 +-
.../ansible/inventories/scigap/production/pga_config/utah/vars.yml | 2 +-
23 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml
index 14188e4..32e556e 100644
--- a/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml
@@ -29,7 +29,7 @@ airavata_port: "9930"
# auth_verify_peer: "false" Needed for WSO2 IS
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/{{ gateway_id }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
index dc0155b..9d3b75e 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
@@ -33,7 +33,7 @@ airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git"
airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
-git_branch: develop
+git_branch: master
# Database related variables
db_server: "{{ groups['database'][0] }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
index cdae482..0544aaf 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/accord"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
index 50663dc..1d2b909 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/brandeis"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
index ef31523..ea6b399 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/georgia-tech"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
index 754c1f7..1917fe0 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/georgia-state"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
index 127bf76..c63e223 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/iugateway"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
index ddc44e0..d7bd5fb 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/lsu"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
index 2755ce3..eadf2fa 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/nanoconfinement"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
index 9bdc959..cf35720 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/nanoshape"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
index adba265..70c0620 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/new-mexico-state"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
index 297c1fc..b4d5d0d 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/nsg"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
index 577e5fb..8f1c80b 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/oii-tandy"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
index bae599e..01592c5 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/oscer"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
index 48a1cca..e38b845 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/phasta"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
index 987dccf..14309bf 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/scigap"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
index 19ec435..8df8061 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/{{ gateway_id }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
index a15daa8..16fd82a 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/simvascular"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
index 225843f..342f180 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/southdakota"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
index d2d9423..198313d 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/southernillinois"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
index de44cd7..56a2ce5 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/testdrive"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
index 54cc932..4355173 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/alabama-birmingham"
http://git-wip-us.apache.org/repos/asf/airavata/blob/36edde69/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
index a93f8c9..eb2bad8 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
@@ -20,7 +20,7 @@
---
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
+git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/utah-university"
[22/50] [abbrv] airavata git commit: Start DB Event Manager before
other servers
Posted by ma...@apache.org.
Start DB Event Manager before other servers
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/33a601fe
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/33a601fe
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/33a601fe
Branch: refs/heads/master
Commit: 33a601fe84d297b11171a1157a2561a451ad9d84
Parents: e72ddf0
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Jul 11 16:46:32 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Jul 11 16:46:32 2017 -0500
----------------------------------------------------------------------
.../api/service/messaging/RegistryServiceDBEventHandler.java | 7 ++++++-
.../src/main/java/org/apache/airavata/server/ServerMain.java | 8 ++++----
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/33a601fe/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventHandler.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventHandler.java b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventHandler.java
index 0fb387a..5652722 100644
--- a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventHandler.java
+++ b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/messaging/RegistryServiceDBEventHandler.java
@@ -91,7 +91,12 @@ public class RegistryServiceDBEventHandler implements MessageHandler {
}
case UPDATE: {
logger.info("Replicating updateGateway in Registry.");
- registryClient.updateGateway(gateway.getGatewayId(), gateway);
+ if (!registryClient.isGatewayExist(gateway.getGatewayId())) {
+ logger.info("Gateway doesn't exist so adding instead of updating.");
+ registryClient.addGateway(gateway);
+ } else {
+ registryClient.updateGateway(gateway.getGatewayId(), gateway);
+ }
logger.info("updateGateway Replication Success!");
break;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/33a601fe/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index 36d317b..a391291 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -113,23 +113,23 @@ public class ServerMain {
List<String> serverList = new ArrayList<>(Arrays.asList(serverNames.split(",")));
if (serverList.indexOf(ALL_IN_ONE) > -1) {
serverList.clear();
- serverList.add(REGISTRY_SERVER); // registry server should start before everything
+ serverList.add(DB_EVENT_MANAGER); // DB Event Manager should start before everything
+ serverList.add(REGISTRY_SERVER); // registry server should start before everything else
serverList.add(CREDENTIAL_STORE); // credential store should start before api server
serverList.add(SHARING_SERVER);
serverList.add(API_SERVER);
serverList.add(ORCHESTRATOR);
serverList.add(GFAC_SERVER);
serverList.add(PROFILE_SERVICE);
- serverList.add(DB_EVENT_MANAGER);
} else if (serverList.indexOf(API_ORCH) > -1) {
serverList.clear();
- serverList.add(REGISTRY_SERVER); // registry server should start before everything
+ serverList.add(DB_EVENT_MANAGER); // DB Event Manager should start before everything
+ serverList.add(REGISTRY_SERVER); // registry server should start before everything else
serverList.add(CREDENTIAL_STORE); // credential store should start before api server
serverList.add(SHARING_SERVER);
serverList.add(API_SERVER);
serverList.add(ORCHESTRATOR);
serverList.add(PROFILE_SERVICE);
- serverList.add(DB_EVENT_MANAGER);
} else if (serverList.indexOf(EXECUTION) > -1) {
serverList.clear();
serverList.add(GFAC_SERVER);
[25/50] [abbrv] airavata git commit: Updating Accord admin username
Posted by ma...@apache.org.
Updating Accord admin username
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2aab0ea4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2aab0ea4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2aab0ea4
Branch: refs/heads/master
Commit: 2aab0ea4f70f6dabdc151f00d7e9790b0585b389
Parents: aff5156
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Jul 11 20:53:11 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Jul 11 20:53:11 2017 -0500
----------------------------------------------------------------------
.../inventories/scigap/production/pga_config/accord/vars.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2aab0ea4/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
index 4e916d8..eea8032 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
@@ -34,7 +34,7 @@ ssl_certificate_key_file: "/etc/letsencrypt/live/accord.hpc.virginia.edu/privkey
## Keycloak related variables
tenant_domain: "{{ gateway_id }}"
-admin_username: "tdaadmin"
+admin_username: "admin"
admin_password: "{{ vault_admin_password }}"
oauth_client_key: "{{ vault_oauth_client_key }}"
oauth_client_secret: "{{ vault_oauth_client_secret }}"
[03/50] [abbrv] airavata git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata into develop
Posted by ma...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a0c6b891
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a0c6b891
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a0c6b891
Branch: refs/heads/master
Commit: a0c6b891fd1af6b8ee61f55ab1a7d44743533853
Parents: d3bc3b6 774b4c9
Author: Gourav Shenoy <go...@apache.org>
Authored: Thu Jul 6 14:01:08 2017 -0400
Committer: Gourav Shenoy <go...@apache.org>
Committed: Thu Jul 6 14:01:08 2017 -0400
----------------------------------------------------------------------
.../lib/Airavata/Model/Tenant/Types.php | 2 +
.../lib/Airavata/Model/Workspace/Types.php | 2 +
.../Profile/Tenant/CPI/TenantProfileService.php | 28 ++--
.../core/impl/TenantManagementKeycloakImpl.java | 1 +
.../repositories/AbstractRepository.java | 18 +++
.../profile/commons/utils/QueryConstants.java | 4 +-
.../handlers/TenantProfileServiceHandler.java | 6 +-
.../tenant/cpi/TenantProfileService.java | 138 +++++++++----------
.../repositories/TenantProfileRepository.java | 8 +-
.../security/KeyCloakSecurityManager.java | 18 ++-
.../gfac/core/cluster/RemoteCluster.java | 8 +-
.../airavata/gfac/impl/BESRemoteCluster.java | 5 +-
.../airavata/gfac/impl/HPCRemoteCluster.java | 38 +++--
.../airavata/gfac/impl/LocalRemoteCluster.java | 9 +-
.../airavata/gfac/impl/task/ArchiveTask.java | 14 +-
.../gfac/impl/task/SCPDataStageTask.java | 95 +++++++++----
.../gfac/impl/task/utils/StreamData.java | 22 ++-
.../client/UserProfileServiceClientFactory.java | 43 ++++++
.../profile-tenant/profile-tenant-cpi.thrift | 2 +-
19 files changed, 297 insertions(+), 164 deletions(-)
----------------------------------------------------------------------
[24/50] [abbrv] airavata git commit: Sharing DOMAIN has DOMAIN_ID
that is the same as GATEWAY_ID
Posted by ma...@apache.org.
Sharing DOMAIN has DOMAIN_ID that is the same as GATEWAY_ID
Not sure why the DOMAIN_ID was getting overwritten with the domain name.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/aff5156c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/aff5156c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/aff5156c
Branch: refs/heads/master
Commit: aff5156c2a83214c58819c7db42a3ee7d804f086
Parents: 1463341
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Jul 11 19:00:38 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Jul 11 19:00:38 2017 -0500
----------------------------------------------------------------------
.../sharing/registry/server/SharingRegistryServerHandler.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/aff5156c/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
index 722157e..819dd16 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
@@ -51,7 +51,6 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
@Override
public String createDomain(Domain domain) throws SharingRegistryException, DuplicateEntryException, TException {
try{
- domain.setDomainId(domain.name);
if((new DomainRepository()).get(domain.domainId) != null)
throw new DuplicateEntryException("There exist domain with given domain id");
[16/50] [abbrv] airavata git commit: AIRAVATA-2405 getUsersWithRole
test
Posted by ma...@apache.org.
AIRAVATA-2405 getUsersWithRole test
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/86713eec
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/86713eec
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/86713eec
Branch: refs/heads/master
Commit: 86713eecadd740de8c28a14923f77763b00fc9a5
Parents: 226cd3f
Author: Marcus Christie <ma...@apache.org>
Authored: Sun Jul 9 00:08:52 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Sun Jul 9 00:08:52 2017 -0500
----------------------------------------------------------------------
.../admin/services/core/impl/TenantManagementKeycloakImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/86713eec/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
----------------------------------------------------------------------
diff --git a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
index fc6af61..97039ed 100644
--- a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
+++ b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
@@ -540,7 +540,7 @@ public class TenantManagementKeycloakImpl implements TenantManagementInterface {
null,
null,
null,
- 0, 10000);
+ 0, 100);
logger.debug("getUsersWithRole: all users count=" + allUsers.size());
allUsers.sort((a, b) -> a.getCreatedTimestamp() - b.getCreatedTimestamp() > 0 ? -1 : 1);
// The 100 most recently created users
@@ -568,7 +568,9 @@ public class TenantManagementKeycloakImpl implements TenantManagementInterface {
throw exception;
} finally {
if (client != null) {
+ logger.debug("getUsersWithRole: closing client...");
client.close();
+ logger.debug("getUsersWithRole: client closed");
}
}
}
[04/50] [abbrv] airavata git commit: Some updates to pga configs
Posted by ma...@apache.org.
Some updates to pga configs
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ee6e3da8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ee6e3da8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ee6e3da8
Branch: refs/heads/master
Commit: ee6e3da8871d3a80c123e79b40f338e52fcb220e
Parents: 8e05950
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Jul 6 14:04:41 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Jul 6 14:04:41 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/production/pga_config/oscer/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/ultrascan/vars.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee6e3da8/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
index 7d2f6e8..4db87ad 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
@@ -32,7 +32,7 @@ ssl_certificate_chain_file: "/etc/letsencrypt/live/sciencegateway.oscer.ou.edu/f
ssl_certificate_key_file: "/etc/letsencrypt/live/sciencegateway.oscer.ou.edu/privkey.pem"
## Keycloak related variables
-tenant_domain: "{{ tenant_domain }}"
+tenant_domain: "{{ gateway_id }}"
admin_username: "admin"
admin_password: "{{ vault_admin_password }}"
oauth_client_key: "{{ vault_oauth_client_key }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/ee6e3da8/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
index 3814739..5b0c82f 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
@@ -24,7 +24,7 @@
airavata_server: "gw153.iu.xsede.org"
airavata_port: "8930"
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+pga_repo: "https://git-wip-us.apache.org/repos/asf/airavata-php-gateway.git"
# Keep Ultrascan PGA on 0.17 until gw153 gets updated/migrated
git_branch: "branch-0.17"
user: "pga"
[12/50] [abbrv] airavata git commit: Merge branch
'keycloak-prod-migration' into develop
Posted by ma...@apache.org.
Merge branch 'keycloak-prod-migration' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6c46dfe8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6c46dfe8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6c46dfe8
Branch: refs/heads/master
Commit: 6c46dfe8dc6a339425608a75ef313e38ef1b0f25
Parents: b5a597e cd34c55
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Jul 7 22:56:23 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Jul 7 22:56:23 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/dreg-production/hosts | 10 +-
.../production/files/client_truststore.jks | 395 +++++++++++++------
.../scigap/production/files/keycloak.jks | 143 +++++++
.../production/files/pga_config_0.17.php.j2 | 256 ++++++++++++
.../scigap/production/group_vars/all/vars.yml | 26 +-
.../scigap/production/group_vars/all/vault.yml | 50 ++-
.../ansible/inventories/scigap/production/hosts | 14 +-
.../production/pga_config/brandeis/vars.yml | 12 +-
.../production/pga_config/brandeis/vault.yml | 34 +-
.../production/pga_config/cinetvtech/vars.yml | 55 ---
.../production/pga_config/cinetvtech/vault.yml | 18 -
.../production/pga_config/georgiastate/vars.yml | 12 +-
.../pga_config/georgiastate/vault.yml | 34 +-
.../production/pga_config/iugateway/vars.yml | 16 +-
.../production/pga_config/iugateway/vault.yml | 34 +-
.../scigap/production/pga_config/lsu/vars.yml | 12 +-
.../scigap/production/pga_config/lsu/vault.yml | 34 +-
.../pga_config/nanoconfinement/vars.yml | 12 +-
.../pga_config/nanoconfinement/vault.yml | 33 +-
.../scigap/production/pga_config/nsg/vars.yml | 15 +-
.../scigap/production/pga_config/nsg/vault.yml | 34 +-
.../production/pga_config/oiitandy/vars.yml | 12 +-
.../production/pga_config/oiitandy/vault.yml | 34 +-
.../scigap/production/pga_config/oscer/vars.yml | 16 +-
.../production/pga_config/oscer/vault.yml | 33 +-
.../production/pga_config/phasta/vars.yml | 12 +-
.../production/pga_config/phasta/vault.yml | 34 +-
.../production/pga_config/scigap/vars.yml | 21 +-
.../production/pga_config/scigap/vault.yml | 34 +-
.../production/pga_config/seagrid/vars.yml | 21 +-
.../production/pga_config/seagrid/vault.yml | 34 +-
.../production/pga_config/simvascular/vars.yml | 12 +-
.../production/pga_config/simvascular/vault.yml | 34 +-
.../production/pga_config/southdakota/vars.yml | 12 +-
.../production/pga_config/southdakota/vault.yml | 33 +-
.../pga_config/southernillinois/vars.yml | 12 +-
.../pga_config/southernillinois/vault.yml | 34 +-
.../production/pga_config/testdrive/vars.yml | 20 +-
.../production/pga_config/testdrive/vault.yml | 34 +-
.../production/pga_config/ultrascan/vars.yml | 18 +-
.../scigap/production/pga_config/utah/vars.yml | 10 +-
.../scigap/production/pga_config/utah/vault.yml | 34 +-
dev-tools/ansible/pga-scigap-prod.yml | 1 -
dev-tools/ansible/roles/pga/defaults/main.yml | 1 +
.../roles/pga/tasks/install_deps_CentOS_7.yml | 1 +
dev-tools/ansible/roles/pga/tasks/main.yml | 2 +-
46 files changed, 1198 insertions(+), 560 deletions(-)
----------------------------------------------------------------------
[50/50] [abbrv] airavata git commit: Merge branch 'prep-master-merge'
Posted by ma...@apache.org.
Merge branch 'prep-master-merge'
Merging develop to master
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/21a75058
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/21a75058
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/21a75058
Branch: refs/heads/master
Commit: 21a750580e9e59f8c66cb6bae13de9f3ffde4e1b
Parents: 983225c 36edde6
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Aug 3 11:59:32 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Aug 3 11:59:32 2017 -0400
----------------------------------------------------------------------
README | 3 -
airavata-api/airavata-api-server/pom.xml | 15 +
.../airavata/api/server/AiravataAPIServer.java | 8 +-
.../server/handler/AiravataServerHandler.java | 91 +-
.../security/AiravataSecurityManager.java | 42 -
.../DefaultAiravataSecurityManager.java | 272 -
.../api/server/security/IdentityContext.java | 42 -
.../airavata/api/server/security/Main.java | 178 -
.../server/security/SecurityManagerFactory.java | 59 -
.../server/security/authzcache/AuthzCache.java | 60 -
.../security/authzcache/AuthzCacheEntry.java | 62 -
.../security/authzcache/AuthzCacheIndex.java | 89 -
.../security/authzcache/AuthzCacheManager.java | 79 -
.../authzcache/AuthzCacheManagerFactory.java | 59 -
.../security/authzcache/AuthzCachedStatus.java | 33 -
.../authzcache/DefaultAuthzCacheManager.java | 105 -
.../security/interceptor/SecurityCheck.java | 35 -
.../interceptor/SecurityInterceptor.java | 82 -
.../security/interceptor/SecurityModule.java | 42 -
.../security/oauth/DefaultOAuthClient.java | 90 -
.../server/security/xacml/DefaultPAPClient.java | 124 -
.../server/security/xacml/DefaultXACMLPEP.java | 132 -
.../java/org/apache/airavata/api/Airavata.java | 370 +-
.../airavata/api/airavata_apiConstants.java | 28 +-
.../main/resources/lib/airavata/Airavata.cpp | 104 +-
.../src/main/resources/lib/airavata/Airavata.h | 82 +-
.../lib/airavata/Airavata_server.skeleton.cpp | 6 +-
.../resources/lib/airavata/airavata_api_types.h | 1 +
.../lib/airavata/airavata_data_models_types.h | 2 +
.../lib/airavata/airavata_errors_types.cpp | 205 +-
.../lib/airavata/airavata_errors_types.h | 44 +
.../application_deployment_model_types.cpp | 24 +-
.../application_deployment_model_types.h | 12 +-
.../airavata/compute_resource_model_types.cpp | 134 +-
.../lib/airavata/compute_resource_model_types.h | 56 +-
.../lib/airavata/db_event_model_constants.cpp | 34 +
.../lib/airavata/db_event_model_constants.h | 41 +
.../lib/airavata/db_event_model_types.cpp | 627 +
.../lib/airavata/db_event_model_types.h | 318 +
.../lib/airavata/messaging_events_types.cpp | 8 +-
.../lib/airavata/messaging_events_types.h | 3 +-
.../airavata/replica_catalog_models_types.cpp | 726 +-
.../lib/airavata/replica_catalog_models_types.h | 274 +-
.../airavata/tenant_profile_model_constants.cpp | 34 +
.../airavata/tenant_profile_model_constants.h | 41 +
.../lib/airavata/tenant_profile_model_types.cpp | 675 +
.../lib/airavata/tenant_profile_model_types.h | 329 +
.../lib/airavata/user_profile_model_types.cpp | 239 +-
.../lib/airavata/user_profile_model_types.h | 59 +-
.../lib/airavata/workspace_model_types.cpp | 106 +-
.../lib/airavata/workspace_model_types.h | 15 +-
.../resources/lib/Airavata/API/Airavata.php | 80 +-
.../resources/lib/Airavata/API/Error/Types.php | 82 +
.../Model/AppCatalog/AppDeployment/Types.php | 25 +-
.../Model/AppCatalog/ComputeResource/Types.php | 142 +-
.../lib/Airavata/Model/Application/Io/Types.php | 6 +-
.../lib/Airavata/Model/Data/Replica/Types.php | 572 +-
.../lib/Airavata/Model/Dbevent/Types.php | 573 +
.../Airavata/Model/Messaging/Event/Types.php | 2 +
.../lib/Airavata/Model/Tenant/Types.php | 634 +
.../resources/lib/Airavata/Model/User/Types.php | 279 +-
.../lib/Airavata/Model/Workspace/Types.php | 135 +-
.../Iam/Admin/Services/CPI/Error/Types.php | 95 +
.../Iam/Admin/Services/CPI/IamAdminServices.php | 3196 ++++
.../Service/Iam/Admin/Services/CPI/Types.php | 33 +
.../Service/Profile/Tenant/CPI/Error/Types.php | 95 +
.../Profile/Tenant/CPI/TenantProfileService.php | 2437 ++++
.../Service/Profile/Tenant/CPI/Types.php | 33 +
.../lib/Airavata/Service/Profile/Types.php | 20 +
.../Service/Profile/User/CPI/Error/Types.php | 95 +
.../Airavata/Service/Profile/User/CPI/Types.php | 33 +
.../Profile/User/CPI/UserProfileService.php | 2025 +++
.../lib/apache/airavata/api/Airavata-remote | 18 +-
.../lib/apache/airavata/api/Airavata.py | 70 +-
.../lib/apache/airavata/api/error/ttypes.py | 76 +
.../resources/lib/apache/airavata/api/ttypes.py | 1 +
.../model/appcatalog/appdeployment/ttypes.py | 19 +-
.../model/appcatalog/computeresource/ttypes.py | 86 +-
.../airavata/model/data/replica/ttypes.py | 430 +-
.../apache/airavata/model/dbevent/__init__.py | 1 +
.../apache/airavata/model/dbevent/constants.py | 11 +
.../lib/apache/airavata/model/dbevent/ttypes.py | 494 +
.../airavata/model/messaging/event/ttypes.py | 3 +
.../apache/airavata/model/tenant/__init__.py | 1 +
.../apache/airavata/model/tenant/constants.py | 11 +
.../lib/apache/airavata/model/tenant/ttypes.py | 488 +
.../lib/apache/airavata/model/ttypes.py | 2 +
.../lib/apache/airavata/model/user/ttypes.py | 231 +-
.../apache/airavata/model/workspace/ttypes.py | 130 +-
.../apache/airavata/model/ComponentState.java | 28 +-
.../apache/airavata/model/ComponentStatus.java | 28 +-
.../org/apache/airavata/model/EdgeModel.java | 28 +-
.../org/apache/airavata/model/NodeModel.java | 28 +-
.../org/apache/airavata/model/PortModel.java | 28 +-
.../apache/airavata/model/WorkflowModel.java | 28 +-
.../apache/airavata/model/WorkflowState.java | 28 +-
.../apache/airavata/model/WorkflowStatus.java | 28 +-
.../ApplicationDeploymentDescription.java | 145 +-
.../appdeployment/ApplicationModule.java | 28 +-
.../appcatalog/appdeployment/CommandObject.java | 28 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 28 +-
.../ApplicationInterfaceDescription.java | 28 +-
.../appcatalog/computeresource/BatchQueue.java | 251 +-
.../computeresource/CloudJobSubmission.java | 28 +-
.../ComputeResourceDescription.java | 432 +-
.../appcatalog/computeresource/DMType.java | 28 +-
.../appcatalog/computeresource/FileSystems.java | 28 +-
.../computeresource/GlobusJobSubmission.java | 28 +-
.../computeresource/JobManagerCommand.java | 28 +-
.../computeresource/JobSubmissionInterface.java | 28 +-
.../computeresource/JobSubmissionProtocol.java | 28 +-
.../computeresource/LOCALSubmission.java | 28 +-
.../appcatalog/computeresource/MonitorMode.java | 28 +-
.../computeresource/ProviderName.java | 28 +-
.../computeresource/ResourceJobManager.java | 28 +-
.../computeresource/ResourceJobManagerType.java | 32 +-
.../computeresource/SSHJobSubmission.java | 28 +-
.../computeresource/UnicoreJobSubmission.java | 28 +-
.../ComputeResourcePreference.java | 28 +-
.../gatewayprofile/GatewayResourceProfile.java | 28 +-
.../gatewayprofile/StoragePreference.java | 28 +-
.../StorageResourceDescription.java | 28 +-
.../UserComputeResourcePreference.java | 28 +-
.../UserResourceProfile.java | 28 +-
.../UserStoragePreference.java | 28 +-
.../airavata/model/application/io/DataType.java | 28 +-
.../application/io/InputDataObjectType.java | 91 +-
.../application/io/OutputDataObjectType.java | 28 +-
.../airavata/model/commons/ErrorModel.java | 28 +-
.../model/commons/ValidationResults.java | 28 +-
.../airavata/model/commons/ValidatorResult.java | 28 +-
.../commons/airavata_commonsConstants.java | 28 +-
.../credential/store/CertificateCredential.java | 28 +-
.../model/credential/store/CommunityUser.java | 28 +-
.../credential/store/CredentialOwnerType.java | 28 +-
.../credential/store/CredentialSummary.java | 28 +-
.../credential/store/PasswordCredential.java | 28 +-
.../model/credential/store/SSHCredential.java | 28 +-
.../model/credential/store/SummaryType.java | 28 +-
.../credential_store_data_modelsConstants.java | 28 +-
.../airavata/model/data/movement/DMType.java | 28 +-
.../data/movement/DataMovementInterface.java | 28 +-
.../data/movement/DataMovementProtocol.java | 28 +-
.../data/movement/GridFTPDataMovement.java | 28 +-
.../model/data/movement/LOCALDataMovement.java | 28 +-
.../model/data/movement/SCPDataMovement.java | 28 +-
.../model/data/movement/SecurityProtocol.java | 28 +-
.../data/movement/UnicoreDataMovement.java | 28 +-
.../model/data/replica/DataProductModel.java | 112 +-
.../model/data/replica/DataProductType.java | 28 +-
.../data/replica/DataReplicaLocationModel.java | 72 +-
.../data/replica/ReplicaLocationCategory.java | 28 +-
.../data/replica/ReplicaPersistentType.java | 28 +-
.../apache/airavata/model/dbevent/CrudType.java | 68 +
.../airavata/model/dbevent/DBEventMessage.java | 622 +
.../model/dbevent/DBEventMessageContext.java | 387 +
.../model/dbevent/DBEventPublisher.java | 411 +
.../model/dbevent/DBEventPublisherContext.java | 641 +
.../model/dbevent/DBEventSubscriber.java | 406 +
.../airavata/model/dbevent/DBEventType.java | 62 +
.../airavata/model/dbevent/EntityType.java | 80 +
.../model/error/AiravataClientException.java | 28 +-
.../airavata/model/error/AiravataErrorType.java | 28 +-
.../model/error/AiravataSystemException.java | 28 +-
.../model/error/AuthenticationException.java | 28 +-
.../model/error/AuthorizationException.java | 28 +-
.../model/error/DuplicateEntryException.java | 413 +
.../error/ExperimentNotFoundException.java | 28 +-
.../model/error/InvalidRequestException.java | 28 +-
.../model/error/LaunchValidationException.java | 28 +-
.../model/error/ProjectNotFoundException.java | 28 +-
.../airavata/model/error/TimedOutException.java | 28 +-
.../airavata/model/error/ValidationResults.java | 28 +-
.../airavata/model/error/ValidatorResult.java | 28 +-
.../model/experiment/ExperimentModel.java | 28 +-
.../experiment/ExperimentSearchFields.java | 28 +-
.../model/experiment/ExperimentStatistics.java | 28 +-
.../experiment/ExperimentSummaryModel.java | 28 +-
.../model/experiment/ExperimentType.java | 28 +-
.../model/experiment/ProjectSearchFields.java | 28 +-
.../experiment/UserConfigurationDataModel.java | 28 +-
.../apache/airavata/model/group/GroupModel.java | 28 +-
.../model/group/ResourcePermissionType.java | 28 +-
.../airavata/model/group/ResourceType.java | 28 +-
.../org/apache/airavata/model/job/JobModel.java | 28 +-
.../event/ExperimentStatusChangeEvent.java | 28 +-
.../messaging/event/ExperimentSubmitEvent.java | 28 +-
.../model/messaging/event/JobIdentifier.java | 28 +-
.../messaging/event/JobStatusChangeEvent.java | 28 +-
.../event/JobStatusChangeRequestEvent.java | 28 +-
.../airavata/model/messaging/event/Message.java | 28 +-
.../model/messaging/event/MessageLevel.java | 28 +-
.../model/messaging/event/MessageType.java | 33 +-
.../messaging/event/ProcessIdentifier.java | 28 +-
.../event/ProcessStatusChangeEvent.java | 28 +-
.../event/ProcessStatusChangeRequestEvent.java | 28 +-
.../messaging/event/ProcessSubmitEvent.java | 28 +-
.../messaging/event/ProcessTerminateEvent.java | 28 +-
.../model/messaging/event/TaskIdentifier.java | 28 +-
.../messaging/event/TaskOutputChangeEvent.java | 28 +-
.../messaging/event/TaskStatusChangeEvent.java | 28 +-
.../event/TaskStatusChangeRequestEvent.java | 28 +-
.../parallelism/ApplicationParallelismType.java | 28 +-
.../airavata/model/process/ProcessModel.java | 28 +-
.../ComputationalResourceSchedulingModel.java | 28 +-
.../airavata/model/security/AuthzToken.java | 28 +-
.../airavata/model/status/ExperimentState.java | 28 +-
.../airavata/model/status/ExperimentStatus.java | 28 +-
.../apache/airavata/model/status/JobState.java | 28 +-
.../apache/airavata/model/status/JobStatus.java | 28 +-
.../airavata/model/status/ProcessState.java | 28 +-
.../airavata/model/status/ProcessStatus.java | 28 +-
.../airavata/model/status/QueueStatusModel.java | 28 +-
.../apache/airavata/model/status/TaskState.java | 28 +-
.../airavata/model/status/TaskStatus.java | 28 +-
.../airavata/model/task/DataStageType.java | 28 +-
.../model/task/DataStagingTaskModel.java | 28 +-
.../model/task/EnvironmentSetupTaskModel.java | 28 +-
.../model/task/JobSubmissionTaskModel.java | 28 +-
.../airavata/model/task/MonitorTaskModel.java | 28 +-
.../apache/airavata/model/task/TaskModel.java | 28 +-
.../apache/airavata/model/task/TaskTypes.java | 28 +-
.../apache/airavata/model/tenant/Tenant.java | 1580 ++
.../model/tenant/TenantApprovalStatus.java | 80 +
.../airavata/model/user/NSFDemographics.java | 177 +-
.../org/apache/airavata/model/user/Status.java | 28 +-
.../airavata/model/user/USCitizenship.java | 28 +-
.../apache/airavata/model/user/UserProfile.java | 910 +-
.../apache/airavata/model/user/disability.java | 28 +-
.../apache/airavata/model/user/ethnicity.java | 28 +-
.../org/apache/airavata/model/user/race.java | 28 +-
.../model/user/user_profile_modelConstants.java | 28 +-
.../airavata/model/workspace/Gateway.java | 358 +-
.../model/workspace/GatewayApprovalStatus.java | 33 +-
.../apache/airavata/model/workspace/Group.java | 28 +-
.../airavata/model/workspace/Notification.java | 28 +-
.../model/workspace/NotificationPriority.java | 28 +-
.../airavata/model/workspace/Project.java | 28 +-
.../apache/airavata/model/workspace/User.java | 28 +-
airavata-services/pom.xml | 70 +
.../iam-admin-services-core/pom.xml | 67 +
.../core/impl/TenantManagementKeycloakImpl.java | 604 +
.../interfaces/TenantManagementInterface.java | 149 +
.../services/core/tests/SetupNewGateway.java | 117 +
airavata-services/profile-service/pom.xml | 39 +
.../java-client-samples/pom.xml | 37 +
.../client/samples/TenantProfileSample.java | 61 +
.../client/samples/UserProfileSample.java | 124 +
.../client/util/ProfileServiceClientUtil.java | 47 +
.../resources/profile-client-sample.properties | 29 +
.../profile-service-client-sdks/pom.xml | 34 +
.../profile-service-commons/pom.xml | 117 +
.../repositories/AbstractRepository.java | 124 +
.../commons/tenant/entities/GatewayEntity.java | 286 +
.../user/entities/NSFDemographicsEntity.java | 108 +
.../user/entities/UserProfileEntity.java | 334 +
.../profile/commons/utils/Committer.java | 27 +
.../profile/commons/utils/JPAConstants.java | 34 +
.../service/profile/commons/utils/JPAUtils.java | 79 +
.../commons/utils/ObjectMapperSingleton.java | 39 +
.../profile/commons/utils/QueryConstants.java | 33 +
.../service/profile/commons/utils/Utils.java | 147 +
.../src/main/resources/META-INF/persistence.xml | 35 +
.../profile-service-server/pom.xml | 59 +
.../handlers/IamAdminServicesHandler.java | 261 +
.../handlers/TenantProfileServiceHandler.java | 226 +
.../handlers/UserProfileServiceHandler.java | 208 +
.../profile/server/ProfileServiceServer.java | 181 +
.../profile/utils/ProfileServiceUtils.java | 70 +
.../profile-service-stubs/pom.xml | 37 +
.../client/ProfileServiceClientFactory.java | 78 +
.../admin/services/cpi/IamAdminServices.java | 12835 +++++++++++++++++
.../exception/IamAdminServicesException.java | 407 +
.../cpi/iam_admin_services_cpiConstants.java | 59 +
.../tenant/cpi/TenantProfileService.java | 9718 +++++++++++++
.../TenantProfileServiceException.java | 407 +
.../tenant/cpi/profile_tenant_cpiConstants.java | 59 +
.../profile/user/cpi/UserProfileService.java | 7894 ++++++++++
.../exception/UserProfileServiceException.java | 407 +
.../user/cpi/profile_user_cpiConstants.java | 59 +
.../profile-service/profile-tenant-core/pom.xml | 40 +
.../repositories/TenantProfileRepository.java | 105 +
.../profile-service/profile-user-core/pom.xml | 85 +
.../UserProfileRegistryException.java | 28 +
.../repositories/UserProfileRepository.java | 118 +
.../src/main/resources/user_profile_catalog.sql | 84 +
.../repositories/WorkspaceRepositoryTest.java | 176 +
airavata-services/services-security/pom.xml | 92 +
.../security/AiravataSecurityManager.java | 43 +
.../DefaultAiravataSecurityManager.java | 273 +
.../service/security/IdentityContext.java | 44 +
.../security/KeyCloakSecurityManager.java | 304 +
.../apache/airavata/service/security/Main.java | 179 +
.../security/SecurityManagerFactory.java | 60 +
.../service/security/authzcache/AuthzCache.java | 61 +
.../security/authzcache/AuthzCacheEntry.java | 63 +
.../security/authzcache/AuthzCacheIndex.java | 90 +
.../security/authzcache/AuthzCacheManager.java | 80 +
.../authzcache/AuthzCacheManagerFactory.java | 60 +
.../security/authzcache/AuthzCachedStatus.java | 34 +
.../authzcache/DefaultAuthzCacheManager.java | 106 +
.../security/interceptor/SecurityCheck.java | 37 +
.../interceptor/SecurityInterceptor.java | 83 +
.../security/interceptor/SecurityModule.java | 43 +
.../security/oauth/DefaultOAuthClient.java | 91 +
.../security/xacml/DefaultPAPClient.java | 125 +
.../service/security/xacml/DefaultXACMLPEP.java | 133 +
dev-tools/ansible/README.md | 1 +
dev-tools/ansible/airavata-iam-setup.yml | 8 +
dev-tools/ansible/apiserver.yml | 34 +
dev-tools/ansible/database.yml | 11 +
.../inventories/airavata-iam/group_vars/all.yml | 16 +
.../ansible/inventories/airavata-iam/hosts | 8 +
.../inventories/develop/group_vars/all.yml | 9 +
dev-tools/ansible/inventories/develop/hosts | 2 +-
.../PICKSC-Production/group_vars/pga/vars.yml | 75 +
.../PICKSC-Production/group_vars/pga/vault.yml | 18 +
.../inventories/scigap/PICKSC-Production/hosts | 21 +
.../scigap/develop/files/airavata.jks | 76 +
.../scigap/develop/files/airavata_sym.jks | 30 +
.../scigap/develop/files/client_truststore.jks | 271 +
.../scigap/develop/files/keycloak.jks | 143 +
.../scigap/develop/group_vars/all/vars.yml | 141 +
.../scigap/develop/group_vars/all/vault.yml | 34 +
.../ansible/inventories/scigap/develop/hosts | 23 +
.../scigap/develop/pga_config/scigap/vars.yml | 58 +
.../scigap/develop/pga_config/scigap/vault.yml | 18 +
.../scigap/develop/pga_config/seagrid/vars.yml | 66 +
.../scigap/develop/pga_config/seagrid/vault.yml | 18 +
.../develop/pga_config/testdrive/vars.yml | 65 +
.../develop/pga_config/testdrive/vault.yml | 18 +
.../inventories/scigap/dreg-production/hosts | 10 +-
.../production/files/client_truststore.jks | 395 +-
.../scigap/production/files/keycloak.jks | 143 +
.../production/files/pga_config_0.17.php.j2 | 256 +
.../scigap/production/group_vars/all/vars.yml | 24 +-
.../scigap/production/group_vars/all/vault.yml | 50 +-
.../ansible/inventories/scigap/production/hosts | 14 +-
.../production/pga_config/accord/vars.yml | 66 +
.../production/pga_config/accord/vault.yml | 18 +
.../production/pga_config/brandeis/vars.yml | 10 +-
.../production/pga_config/brandeis/vault.yml | 34 +-
.../production/pga_config/cinetvtech/vars.yml | 55 -
.../production/pga_config/cinetvtech/vault.yml | 18 -
.../production/pga_config/gatech/vars.yml | 61 +
.../production/pga_config/gatech/vault.yml | 18 +
.../production/pga_config/georgiastate/vars.yml | 16 +-
.../pga_config/georgiastate/vault.yml | 34 +-
.../production/pga_config/iugateway/vars.yml | 14 +-
.../production/pga_config/iugateway/vault.yml | 34 +-
.../scigap/production/pga_config/lsu/vars.yml | 10 +-
.../scigap/production/pga_config/lsu/vault.yml | 34 +-
.../pga_config/nanoconfinement/vars.yml | 16 +-
.../pga_config/nanoconfinement/vault.yml | 33 +-
.../production/pga_config/nanoshape/vars.yml | 65 +
.../production/pga_config/nanoshape/vault.yml | 18 +
.../pga_config/newmexicostate/vars.yml | 61 +
.../pga_config/newmexicostate/vault.yml | 18 +
.../scigap/production/pga_config/nsg/vars.yml | 13 +-
.../scigap/production/pga_config/nsg/vault.yml | 34 +-
.../production/pga_config/oiitandy/vars.yml | 14 +-
.../production/pga_config/oiitandy/vault.yml | 34 +-
.../scigap/production/pga_config/oscer/vars.yml | 14 +-
.../production/pga_config/oscer/vault.yml | 33 +-
.../production/pga_config/phasta/vars.yml | 14 +-
.../production/pga_config/phasta/vault.yml | 34 +-
.../production/pga_config/scigap/vars.yml | 23 +-
.../production/pga_config/scigap/vault.yml | 34 +-
.../production/pga_config/seagrid/vars.yml | 19 +-
.../production/pga_config/seagrid/vault.yml | 34 +-
.../production/pga_config/simvascular/vars.yml | 10 +-
.../production/pga_config/simvascular/vault.yml | 34 +-
.../production/pga_config/southdakota/vars.yml | 14 +-
.../production/pga_config/southdakota/vault.yml | 33 +-
.../pga_config/southernillinois/vars.yml | 20 +-
.../pga_config/southernillinois/vault.yml | 34 +-
.../production/pga_config/testdrive/vars.yml | 18 +-
.../production/pga_config/testdrive/vault.yml | 34 +-
.../scigap/production/pga_config/uab/vars.yml | 61 +
.../scigap/production/pga_config/uab/vault.yml | 18 +
.../production/pga_config/ultrascan/vars.yml | 18 +-
.../scigap/production/pga_config/utah/vars.yml | 16 +-
.../scigap/production/pga_config/utah/vault.yml | 34 +-
.../testing-0.17-scigap/group_vars/all/vars.yml | 5 +
.../testing-0.17-scigap/group_vars/pga/vars.yml | 18 +-
.../group_vars/pga/vault.yml | 34 +-
.../testing-0.17/files/client_truststore.jks | 271 +
.../testing-0.17/group_vars/all/vars.yml | 15 +-
.../testing-0.17/group_vars/all/vault.yml | 18 +-
.../testing-0.17/group_vars/pga/vars.yml | 18 +-
.../testing-0.17/group_vars/pga/vault.yml | 34 +-
dev-tools/ansible/keycloak.yml | 9 +
dev-tools/ansible/pga-scigap-dev.yml | 26 +
dev-tools/ansible/pga-scigap-prod.yml | 6 +-
.../ansible/roles/api-orch/defaults/main.yml | 10 +-
dev-tools/ansible/roles/api-orch/tasks/main.yml | 2 +
.../templates/airavata-server.properties.j2 | 40 +-
.../ansible/roles/database/tasks/keycloak.yml | 38 +
dev-tools/ansible/roles/database/tasks/main.yml | 3 +
dev-tools/ansible/roles/database/vars/main.yml | 2 +
dev-tools/ansible/roles/gfac/defaults/main.yml | 2 +-
.../templates/airavata-server.properties.j2 | 13 +-
dev-tools/ansible/roles/java/tasks/main.yml | 6 +
dev-tools/ansible/roles/keycloak/README.md | 14 +
.../ansible/roles/keycloak/defaults/main.yml | 21 +
.../ansible/roles/keycloak/files/README.md | 36 +
dev-tools/ansible/roles/keycloak/tasks/main.yml | 185 +
.../templates/keycloak-hacluster-init.j2 | 49 +
.../templates/keycloak-standalone-init.j2 | 46 +
.../ansible/roles/keycloak/templates/module.j2 | 12 +
.../keycloak/templates/standalone-ha.xml.j2 | 533 +
.../roles/keycloak/templates/standalone.xml.j2 | 493 +
dev-tools/ansible/roles/pga/defaults/main.yml | 11 +
.../roles/pga/tasks/install_deps_CentOS_7.yml | 1 +
dev-tools/ansible/roles/pga/tasks/main.yml | 11 +-
.../roles/pga/templates/pga_config.php.j2 | 46 +-
.../ansible/roles/zookeeper/tasks/main.yml | 3 +
modules/commons/pom.xml | 1 -
.../common/utils/ApplicationSettings.java | 16 +
.../common/utils/DBEventManagerConstants.java | 99 +
.../airavata/common/utils/DBEventService.java | 42 +
.../airavata/common/utils/ServerSettings.java | 32 +-
.../src/main/resources/PBS_Groovy.template | 1 +
.../src/main/resources/SLURM_Groovy.template | 1 +
.../resources/airavata-default-xacml-policy.xml | 18 +-
.../main/resources/airavata-server.properties | 43 +-
.../src/main/resources/client_truststore.jks | Bin 2423 -> 5312 bytes
modules/db-event-manager/pom.xml | 41 +
.../db/event/manager/DBEventManagerRunner.java | 143 +
.../messaging/DBEventManagerException.java | 42 +
.../DBEventManagerMessagingFactory.java | 76 +
.../messaging/impl/DBEventMessageHandler.java | 112 +
.../db/event/manager/utils/Constants.java | 33 +
.../manager/utils/DbEventManagerZkUtils.java | 126 +
.../db-event-manager/src/test/java/Test.java | 25 +
modules/distribution/pom.xml | 84 +-
.../apache/airavata/gfac/cpi/GfacService.java | 2 +-
.../apache/airavata/gfac/core/GFacUtils.java | 75 +-
.../org/apache/airavata/gfac/core/Script.java | 1 +
.../gfac/core/cluster/RemoteCluster.java | 8 +-
.../gfac/core/context/ProcessContext.java | 26 +-
.../airavata/gfac/impl/BESRemoteCluster.java | 5 +-
.../airavata/gfac/impl/HPCRemoteCluster.java | 38 +-
.../airavata/gfac/impl/LocalRemoteCluster.java | 9 +-
.../airavata/gfac/impl/task/ArchiveTask.java | 14 +-
.../gfac/impl/task/SCPDataStageTask.java | 107 +-
.../gfac/impl/task/utils/StreamData.java | 22 +-
.../monitor/email/parser/UGEEmailParser.java | 4 +
modules/messaging/core/pom.xml | 6 +-
.../messaging/core/MessagingFactory.java | 30 +-
.../airavata/messaging/core/Publisher.java | 10 +-
.../messaging/core/impl/MessageConsumer.java | 94 +
.../messaging/core/impl/RabbitMQPublisher.java | 37 +
.../orchestrator/cpi/OrchestratorService.java | 3 +-
modules/registry-refactoring/pom.xml | 153 -
.../registry/core/RegistryException.java | 27 -
.../workspacecatalog/GatewayEntity.java | 220 -
.../workspacecatalog/NSFDemographicsEntity.java | 93 -
.../workspacecatalog/NotificationEntity.java | 109 -
.../workspacecatalog/ProjectEntity.java | 91 -
.../workspacecatalog/UserProfileEntity.java | 246 -
.../core/repositories/AbstractRepository.java | 97 -
.../workspacecatalog/GatewayRepository.java | 35 -
.../NotificationRepository.java | 34 -
.../workspacecatalog/ProjectRepository.java | 34 -
.../workspacecatalog/UserProfileRepository.java | 87 -
.../airavata/registry/core/utils/Committer.java | 26 -
.../registry/core/utils/JPAConstants.java | 30 -
.../airavata/registry/core/utils/JPAUtils.java | 82 -
.../core/utils/ObjectMapperSingleton.java | 38 -
.../registry/core/utils/QueryConstants.java | 41 -
.../airavata/registry/core/utils/Utils.java | 155 -
.../src/main/resources/META-INF/persistence.xml | 32 -
.../src/main/resources/workspace_catalog.sql | 125 -
.../repositories/WorkspaceRepositoryTest.java | 196 -
.../catalog/impl/ApplicationDeploymentImpl.java | 2 +
.../catalog/model/ApplicationDeployment.java | 10 +
.../core/app/catalog/model/BatchQueue.java | 24 +-
.../core/app/catalog/model/ComputeResource.java | 44 +
.../resources/AppDeploymentResource.java | 11 +
.../catalog/resources/BatchQueueResource.java | 20 +
.../resources/ComputeResourceResource.java | 42 +-
.../app/catalog/util/AppCatalogJPAUtils.java | 17 +-
.../util/AppCatalogThriftConversion.java | 13 +
.../catalog/resources/WorkerResource.java | 52 +-
.../catalog/impl/ReplicaCatalogImpl.java | 44 +
.../src/main/resources/appcatalog-derby.sql | 7 +
.../src/main/resources/appcatalog-mysql.sql | 7 +
.../replica/catalog/ReplicaCatalogTest.java | 2 +
.../airavata/registry/cpi/ReplicaCatalog.java | 3 +
.../registry-api-service/pom.xml | 5 +
.../registry/api/service/RegistryAPIServer.java | 31 +
.../service/handler/RegistryServerHandler.java | 50 +-
.../RegistryServiceDBEventHandler.java | 164 +
.../RegistryServiceDBEventMessagingFactory.java | 94 +
.../registry/api/service/util/Constants.java | 10 +
.../api/service/util/DatabaseCreator.java | 36 +-
.../airavata/registry/api/RegistryService.java | 8978 ++++++++----
.../api/exception/RegistryServiceException.java | 2 +-
.../DeltaScripts/appCatalog_schema_delta.sql | 30 +
.../sharingCatalog_schema_delta.sql | 10 +
...aCatalog_lowercase_user_data_dir_example.sql | 18 +
.../credentialStore_keycloak_migration.sql | 2 +
.../expCatalog_keycloak_migration.sql | 11 +
.../profileService_keycloak_migration.sql | 8 +
.../sharingCatalog_keycloak_migration.sql | 8 +
.../0.17-0.18/migration-notes.md | 17 +
.../org/apache/airavata/server/ServerMain.java | 12 +-
.../sharing-registry-server/pom.xml | 5 +
.../db/repositories/AbstractRepository.java | 12 +-
.../db/repositories/EntityRepository.java | 4 +-
.../repositories/GroupMembershipRepository.java | 42 +-
.../db/repositories/SharingRepository.java | 50 +-
.../db/repositories/UserGroupRepository.java | 37 +-
.../db/repositories/UserRepository.java | 18 +-
.../messaging/SharingServiceDBEventHandler.java | 248 +
.../SharingServiceDBEventMessagingFactory.java | 111 +
.../registry/server/SharingRegistryServer.java | 20 +
.../server/SharingRegistryServerHandler.java | 274 +-
.../sharing/registry/utils/Constants.java | 38 +
.../utils/ThriftDataModelConversion.java | 28 +
.../main/resources/sharing-registry-derby.sql | 2 +-
.../main/resources/sharing-registry-mysql.sql | 8 +-
.../SharingRegistryServerHandlerTest.java | 4 +
.../registry/SharingRegistryServiceTest.java | 6 +-
.../sharing-registry-stubs/pom.xml | 5 +
.../SharingRegistryServiceClientFactory.java | 1 +
.../sharing/registry/models/Domain.java | 19 -
.../models/DuplicateEntryException.java | 398 +
.../sharing/registry/models/Entity.java | 51 +-
.../registry/models/EntitySearchField.java | 19 -
.../sharing/registry/models/EntityType.java | 19 -
.../registry/models/GroupCardinality.java | 19 -
.../sharing/registry/models/GroupChildType.java | 23 -
.../registry/models/GroupMembership.java | 19 -
.../sharing/registry/models/GroupType.java | 19 -
.../sharing/registry/models/PermissionType.java | 19 -
.../registry/models/SearchCondition.java | 19 -
.../sharing/registry/models/SearchCriteria.java | 19 -
.../sharing/registry/models/Sharing.java | 19 -
.../models/SharingRegistryException.java | 19 -
.../sharing/registry/models/SharingType.java | 19 -
.../airavata/sharing/registry/models/User.java | 19 -
.../sharing/registry/models/UserGroup.java | 19 -
.../models/sharing_modelsConstants.java | 19 -
.../service/cpi/SharingRegistryService.java | 2651 +++-
.../sharing-service-docs/api-docs/index.html | 23 +-
.../api-docs/sharing_cpi.html | 36 +-
.../api-docs/sharing_models.html | 98 +-
.../sharing-service-docs/api-docs/style.css | 22 +-
.../thrift_models/sharing_cpi.thrift | 10 +-
.../thrift_models/sharing_models.thrift | 10 +
.../thrift_models/thrift-gen.sh | 4 +-
.../main/resources/airavata-server.properties | 30 +-
modules/user-profile-migration/.gitignore | 1 +
modules/user-profile-migration/pom.xml | 71 +-
.../apache/airavata/ISLoginCredentialsDAO.java | 78 -
.../apache/airavata/IdentityServerClient.java | 137 -
.../airavata/KeycloakIdentityServerClient.java | 172 +
.../org/apache/airavata/MigrationManager.java | 312 +-
.../UserProfileAiravataThriftClient.java | 44 -
.../org/apache/airavata/UserProfileDAO.java | 18 +
.../airavata/Wso2ISLoginCredentialsDAO.java | 78 +
.../airavata/Wso2IdentityServerClient.java | 161 +
.../user-profile-migration.properties.template | 35 +
modules/user-profile/pom.xml | 40 -
.../user-profile/user-profile-service/pom.xml | 50 -
.../user/profile/server/UserProfileServer.java | 157 -
.../server/UserProfileServiceHandler.java | 138 -
modules/user-profile/user-profile-stubs/pom.xml | 74 -
.../userprofile/cpi/UserProfileService.java | 7523 ----------
.../client/UserProfileServiceClientFactory.java | 3 +-
.../exception/UserProfileServiceException.java | 426 -
.../cpi/user_profile_cpiConstants.java | 76 -
pom.xml | 4 +-
.../airavata-apis/airavata_api.thrift | 10 +-
.../airavata-apis/airavata_errors.thrift | 9 +
.../airavata-apis/db_event_model.thrift | 81 +
.../airavata-apis/messaging_events.thrift | 3 +-
.../component-cpis/generate-cpi-stubs.sh | 2 +-
.../component-cpis/registry-api.thrift | 20 +-
.../component-cpis/user-profile-cpi.thrift | 2 +-
.../data-models/airavata_data_models.thrift | 6 +-
.../application_deployment_model.thrift | 3 +-
.../workspace_model.thrift | 42 +-
.../replica_catalog_models.thrift | 31 +-
.../compute_resource_model.thrift | 10 +-
.../user_resource_profile_model.thrift | 2 +-
.../group_manager_model.thrift | 48 -
.../user-group-models/user_profile_model.thrift | 185 -
.../group_manager_model.thrift | 48 +
.../tenant_profile_model.thrift | 65 +
.../user_profile_model.thrift | 196 +
.../generate-thrift-stubs.sh | 108 +-
.../service-cpis/generate-service-cpi-stubs.sh | 195 +
.../iam-admin-services-cpi.thrift | 99 +
.../iam_admin_services_cpi_errors.thrift | 32 +
.../profile-service/profile-service-cpi.thrift | 34 +
.../profile-tenant/profile-tenant-cpi.thrift | 80 +
.../profile_tenant_cpi_errors.thrift | 32 +
.../profile-user/profile-user-cpi.thrift | 75 +
.../profile-user/profile_user_cpi_errors.thrift | 32 +
602 files changed, 79828 insertions(+), 22557 deletions(-)
----------------------------------------------------------------------
[27/50] [abbrv] airavata git commit: Using parameter binding to
handle single quote in proj/exp names
Posted by ma...@apache.org.
Using parameter binding to handle single quote in proj/exp names
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c8ee09c3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c8ee09c3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c8ee09c3
Branch: refs/heads/master
Commit: c8ee09c3324686722702b9831194e3fe517b606d
Parents: 03d6918
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Jul 11 11:35:11 2017 -0500
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Jul 12 12:43:36 2017 -0500
----------------------------------------------------------------------
.../catalog/resources/WorkerResource.java | 52 +++++++++++++++-----
1 file changed, 40 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c8ee09c3/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
index ab3034c..6d5ebd6 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
@@ -515,13 +515,19 @@ public class WorkerResource extends AbstractExpCatResource {
List<org.apache.airavata.registry.core.experiment.catalog.resources.ProjectResource> result = new ArrayList<org.apache.airavata.registry.core.experiment.catalog.resources.ProjectResource>();
EntityManager em = null;
try {
+ Map<String, Object> queryParameters = new HashMap<>();
String query = "SELECT DISTINCT p from Project p WHERE ";
// FIXME There is a performance bottleneck for using IN clause. Try using temporary tables ?
if (accessibleIds != null && accessibleIds.size() > 0) {
query += " p.projectId IN (";
- for (String id : accessibleIds)
- query += ("'" + id + "'" + ",");
+ int accessibleIdIndex = 0;
+ for (String id : accessibleIds) {
+ String paramName = "accessibleId" + accessibleIdIndex;
+ query += (":" + paramName + ",");
+ queryParameters.put(paramName, id);
+ accessibleIdIndex++;
+ }
query = query.substring(0, query.length() - 1) + ") AND ";
}else if(ServerSettings.isEnableSharing() && (accessibleIds==null || accessibleIds.size()==0)){
return new ArrayList<>();
@@ -531,14 +537,17 @@ public class WorkerResource extends AbstractExpCatResource {
for (String field : filters.keySet()) {
String filterVal = filters.get(field);
if (field.equals(ProjectConstants.USERNAME)) {
- query += "p." + field + "= '" + filterVal + "' AND ";
+ query += "p." + field + "= :" + field + " AND ";
+ queryParameters.put(field, filterVal);
} else if (field.equals(ProjectConstants.GATEWAY_ID)) {
- query += "p." + field + "= '" + filterVal + "' AND ";
+ query += "p." + field + "= :" + field + " AND ";
+ queryParameters.put(field, filterVal);
} else {
if (filterVal.contains("*")) {
filterVal = filterVal.replaceAll("\\*", "");
}
- query += "p." + field + " LIKE '%" + filterVal + "%' AND ";
+ query += "p." + field + " LIKE :" + field + " AND ";
+ queryParameters.put(field, "%" + filterVal + "%");
}
}
}
@@ -561,6 +570,10 @@ public class WorkerResource extends AbstractExpCatResource {
} else {
q = em.createQuery(query);
}
+ for (String parameterName : queryParameters.keySet()) {
+ q.setParameter(parameterName, queryParameters.get(parameterName));
+ }
+
List resultList = q.getResultList();
for (Object o : resultList) {
@@ -607,14 +620,20 @@ public class WorkerResource extends AbstractExpCatResource {
List<ExperimentSummaryResource> result = new ArrayList();
EntityManager em = null;
try {
+ Map<String, Object> queryParameters = new HashMap<>();
String query = "SELECT e FROM ExperimentSummary e " +
"WHERE ";
// FIXME There is a performance bottleneck for using IN clause. Try using temporary tables ?
if (accessibleIds != null && accessibleIds.size() > 0) {
query += " e.experimentId IN (";
- for (String id : accessibleIds)
- query += ("'" + id + "'" + ",");
+ int accessibleIdIndex = 0;
+ for (String id : accessibleIds) {
+ String paramName = "accessibleId" + accessibleIdIndex;
+ query += (":" + paramName + ",");
+ queryParameters.put(paramName, id);
+ accessibleIdIndex++;
+ }
query = query.substring(0, query.length() - 1) + ") AND ";
}else if(ServerSettings.isEnableSharing() && (accessibleIds==null || accessibleIds.size()==0)){
return new ArrayList<>();
@@ -626,7 +645,9 @@ public class WorkerResource extends AbstractExpCatResource {
}
if (toTime != null && fromTime != null && toTime.after(fromTime)) {
- query += "e.creationTime > '" + fromTime + "' " + "AND e.creationTime <'" + toTime + "' AND ";
+ query += "e.creationTime > :fromTime AND e.creationTime < :toTime AND ";
+ queryParameters.put("fromTime", fromTime);
+ queryParameters.put("toTime", toTime);
}
filters.remove(ExperimentStatusConstants.STATE);
@@ -634,16 +655,20 @@ public class WorkerResource extends AbstractExpCatResource {
for (String field : filters.keySet()) {
String filterVal = filters.get(field);
if (field.equals(ExperimentConstants.USER_NAME)) {
- query += "e." + field + "= '" + filterVal + "' AND ";
+ query += "e." + field + "= :username AND ";
+ queryParameters.put("username", filterVal);
} else if (field.equals(ExperimentConstants.GATEWAY_ID)) {
- query += "e." + field + "= '" + filterVal + "' AND ";
+ query += "e." + field + "= :gateway_id AND ";
+ queryParameters.put("gateway_id", filterVal);
} else if (field.equals(ExperimentConstants.PROJECT_ID)) {
- query += "e." + field + "= '" + filterVal + "' AND ";
+ query += "e." + field + "= :project_id AND ";
+ queryParameters.put("project_id", filterVal);
} else {
if (filterVal.contains("*")) {
filterVal = filterVal.replaceAll("\\*", "");
}
- query += "e." + field + " LIKE '%" + filterVal + "%' AND ";
+ query += "e." + field + " LIKE :" + field + " AND ";
+ queryParameters.put(field, "%" + filterVal + "%");
}
}
}
@@ -666,6 +691,9 @@ public class WorkerResource extends AbstractExpCatResource {
} else {
q = em.createQuery(query);
}
+ for (String parameterName : queryParameters.keySet()) {
+ q.setParameter(parameterName, queryParameters.get(parameterName));
+ }
List resultList = q.getResultList();
for (Object o : resultList) {
[19/50] [abbrv] airavata git commit: adding accord and nanoshape
gateways
Posted by ma...@apache.org.
adding accord and nanoshape gateways
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/101a687a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/101a687a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/101a687a
Branch: refs/heads/master
Commit: 101a687a154690946deed18a74c0f7cb013dd416
Parents: 5baf04d
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Jul 11 10:40:10 2017 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Jul 11 10:40:10 2017 -0500
----------------------------------------------------------------------
.../production/pga_config/accord/vars.yml | 66 ++++++++++++++++++++
.../production/pga_config/accord/vault.yml | 18 ++++++
.../pga_config/nanoconfinement/vars.yml | 6 +-
.../production/pga_config/nanoshape/vars.yml | 65 +++++++++++++++++++
.../production/pga_config/nanoshape/vault.yml | 18 ++++++
dev-tools/ansible/pga-scigap-prod.yml | 34 +++++-----
.../tenant_profile_model.thrift | 20 +++---
7 files changed, 203 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
new file mode 100644
index 0000000..b598828
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
@@ -0,0 +1,66 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "develop"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/testdrive"
+vhost_servername: "accord.hpc.virginia.edu"
+vhost_serveralias: "www.accord.hpc.virginia.edu"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/accord.hpc.virginia.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/accord.hpc.virginia.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/accord.hpc.virginia.edu/privkey.pem"
+
+## Keycloak related variables
+tenant_domain: "{{ gateway_id }}"
+admin_username: "tdaadmin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
+
+auth_options:
+ - name: "Virgina Accord Science Gateway"
+ oauth_grant_type: "password"
+ - name: "CILogon"
+ oauth_grant_type: "authorization_code"
+ oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
+ logo: "/assets/cilogon-logo-24x24-b.png"
+oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
+
+gateway_id: "virginaaccord"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/testdrive"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUF51b2cYYqqadLHL9M/oPY0ZHZlWbdOdaIgjpzIzMnO7M9hKrHVY2pqyLPvqCLzaunxITPWsTqw0E8hwub4ttGLAx/O4kIf+BgyZK7iuwXWhI7u85/o58IfrD4B+jVCYKRNayuLR+lJWsiOeS6HSlunpTKTEhFGeOHn2UzdbLfgWYQ3VUFDtKN1oDPDT78ml5c2RCibJ21jltpevVfEtCUctERpTfniWSuQZggP1qiLNa1+PfiJ3mGsEzJFDntQvQetdinaAbEaT7+sctS8nBNjapkmYMf6tBl3S0bLttYPH51f8lUQAFaAzrestO1JpJNnIeY01/S3MWIlAWASnn"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgg@iu.edu','jaj@virginia.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "virginia-accord-gateway-theme"
+portal_theme_repo: "https://github.com/SciGaP/virginia-accord-gateway-theme.git"
+portal_title: "Virgina Accord Science Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vault.yml
new file mode 100644
index 0000000..d69cc96
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+33646462616662326265303837306231346666306462653238646537616631326233623035356266
+6465633732373434303063393439653564306466376162360a396433386630363466396332366535
+38313030313531326332626635623736363166343233326338636164313032356463626665313964
+6435303232343164620a666134356263396434376662656163356430373061633466656530666535
+66303134393662323962386230393132393631373465313361373134303337323966633530386530
+65633936656261646534663663643662613437333032336132626165316631643262613961353638
+35306335323336326264643237353866326430613761323439366638316566653339366264616438
+61376463666236613765653836356435393163646337643135333137393335646464653762636238
+32656639363062353838353333336532653162363666363332333962643232386436623633656666
+38646364373862363461396537376363383833653361343139343763393265306662623835383934
+64393437323035316339643939386234333663643330366361626330373936383838396261313435
+32623236343730373835346465343233643435343637316132653063303638613235366236303732
+64626132353561663136616662636137396563386165656561366537343163656238326465616439
+37663035313933376565643239326463653037396465323636306562373532346331336233326332
+31636362626539383563633834653237636335396630316363616432363062623337303734353430
+65363232623837343830333136373535626436366531356563383161313861346134326162646239
+3461
http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
index f7e7eec..2755ce3 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
@@ -42,6 +42,10 @@ oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.wel
auth_options:
- name: "Nano Confinement"
oauth_grant_type: "password"
+ - name: "CILogon"
+ oauth_grant_type: "authorization_code"
+ oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
+ logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
gateway_id: "nanoconfinement"
@@ -56,6 +60,6 @@ admin_emails: "['smarru@iu.edu','sgg@iu.edu','vjadhao@iu.edu']"
portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
portal_theme: "nanoconfinement-gateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/nanoconfinement-gateway-theme.git"
+portal_theme_repo: "https://github.com/softmaterialslab/nanoconfinement-gateway-theme.git"
portal_title: "Nano Confinement Science Gateway"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
new file mode 100644
index 0000000..732f9fa
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
@@ -0,0 +1,65 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "develop"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/nanoshape"
+vhost_servername: "nanoshape.sciencegateways.iu.edu"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/nanoshape.sciencegateways.iu.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/nanoshape.sciencegateways.iu.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/nanoshape.sciencegateways.iu.edu/privkey.pem"
+
+## Keycloak related variables
+tenant_domain: "{{ gateway_id }}"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
+
+auth_options:
+ - name: "Nano Shape"
+ oauth_grant_type: "password"
+ - name: "CILogon"
+ oauth_grant_type: "authorization_code"
+ oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
+ logo: "/assets/cilogon-logo-24x24-b.png"
+oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
+
+gateway_id: "nano-shape"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/nanoshape"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCIUqpKWHwawFHnbWvs6pie+fDA9NlqMZNvzil7e8FQz7543+FOzdTl/octACjGnSTwHewpyTe9sAUVcnq6VJ5XYtApR68zMasEzyCZUMWhMqEuxopRZcUGDJVcq5hD4RZcer3aMPWSVmXVCNJeT4EsB52Zp2DfDVgfaOOfY8Ga4mcR2IdOyizV8HWXTH6vWFK+dD1GoPY0ECikwlsF1QA0vzqAcb1NYOTc70hZ9Pb0/78XF790joZ80hRsHGIc7IfncoLgRUkKSkMaoXbfy/tbqf76V0ZxaQOgayaLGF19oBlREO6ZQ3rDCOWgVJC32dCwAsaL9qWd0IZrprUEUQOd"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['smarru@iu.edu','sgg@iu.edu','vjadhao@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "nanoshape-gateway-theme"
+portal_theme_repo: "https://github.com/softmaterialslab/nanoshape-gateway-theme.git"
+portal_title: "Nano Shape Science Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vault.yml
new file mode 100644
index 0000000..e628705
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+37326565363634636561353861386430323939653634353334303965363765663563393333373966
+3863653537663931306530333165363932613962373236360a663961363361383838303132363132
+64376235656137323732363030333138323539653838343866393464646331303565326563393862
+6561313339666664640a323831616134306564306634383266383264353034336630646432356638
+38313037623138366632633836636238663334623933323535383238636334326364663565633761
+61393761353334343761333036373362363161356162333438623036313061613063376333643539
+38303934353932383963643935386633623530343737353436306539316334366539633861616566
+36353665323061333463363230376234643535306566306563353662646263646433646136663364
+31633531613430663035373165313165633066376433303663383261383665336438623339313837
+32366266313765386339653634303136363765366263383032646134613932303634383139313332
+64376531393835643830656536636264643530306436393361356362396562356365643833363535
+31616430353236316262353863643863626532656139343339313033303066363564393461623130
+39366162343865663738336636373339656665353063393262666536316130373231343066386632
+33353130643731346232333837393037326563323763656438333662303763663364663730386136
+30623062623762386331326266623361336565626534623937393262363834663534633561613233
+35363634376535343461643230653635616335346332356538643133333037653233343563373232
+3638
http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index 2299757..b831f8e 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -19,22 +19,24 @@
#
---
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/accord"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoconfinement"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/simvascular"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoshape"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/simvascular"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/thrift-interface-descriptions/data-models/user-tenant-group-models/tenant_profile_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/user-tenant-group-models/tenant_profile_model.thrift b/thrift-interface-descriptions/data-models/user-tenant-group-models/tenant_profile_model.thrift
index ee946df..9649857 100644
--- a/thrift-interface-descriptions/data-models/user-tenant-group-models/tenant_profile_model.thrift
+++ b/thrift-interface-descriptions/data-models/user-tenant-group-models/tenant_profile_model.thrift
@@ -36,6 +36,19 @@ enum TenantApprovalStatus {
DEPLOYED
}
+struct TenantPreferences {
+ 10: optional string tenantAdminFirstName,
+ 11: optional string tenantAdminLastName,
+ 12: optional string tenantAdminEmail,
+}
+
+struct TenantConfig {
+ 16: optional string oauthClientId,
+ 17: optional string oauthClientSecret,
+ 13: optional string identityServerUserName,
+ 14: optional string identityServerPasswordToken,
+}
+
struct Tenant {
1: required string tenantId,
2: required TenantApprovalStatus tenantApprovalStatus,
@@ -46,14 +59,7 @@ struct Tenant {
7: optional string tenantURL,
8: optional string tenantPublicAbstract,
9: optional string reviewProposalDescription,
- 10: optional string tenantAdminFirstName,
- 11: optional string tenantAdminLastName,
- 12: optional string tenantAdminEmail,
- 13: optional string identityServerUserName,
- 14: optional string identityServerPasswordToken,
15: optional string declinedReason,
- 16: optional string oauthClientId,
- 17: optional string oauthClientSecret,
18: optional i64 requestCreationTime,
19: optional string requesterUsername
}
\ No newline at end of file