CDPP / AMDA_IHM

Commit 31fb656e8170ba942766cade0090ff301fbabc78

Authored by Elena.Budnik
1 parent 75df9821
Exists in master and in 110 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

correct wsdl + tests draft

Showing 2 changed files with 55 additions and 78 deletions   Show diff stats
Inline Side-by-side
php/testWebServer.php renamed to php/WebServices/Tests/testWebServer.php
  Diff comments   View file @31fb656
1 1 <?php
2 2  
3   -require_once("WebServices/Client/WSClientSOAP.php");
4   -require_once("WebServices/Client/WSClientREST.php");
  3 +require_once("../Client/WSClientSOAP.php");
  4 +//require_once("../Client/WSClientREST.php");
5 5  
6 6 function runSuiteTests($client)
7 7 {
... ... @@ -11,44 +11,44 @@ function runSuiteTests($client)
11 11 echo "[ERROR] - Error during call of isAlive function".PHP_EOL;
12 12 else
13 13 echo "[OK] - isAlive".PHP_EOL;
14   -
  14 +
15 15 //Test getTimeTablesList function without userID & password
16   - $res = $client->getTimeTablesList();
17   - if (!isset($res) || !$res->success)
18   - echo "[ERROR] - Error during call of getTimeTablesList function - Test 1".PHP_EOL;
19   - else
20   - echo "[OK] - getTimeTablesList - Test 1 - ".$res->TimeTablesList.PHP_EOL;
21   -
  16 +// $res = $client->getTimeTablesList();
  17 +// if (!isset($res) || !$res->success)
  18 +// echo "[ERROR] - Error during call of getTimeTablesList function - Test 1".PHP_EOL;
  19 +// else
  20 +// echo "[OK] - getTimeTablesList - Test 1 - ".$res->TimeTablesList.PHP_EOL;
  21 +
22 22 //Test getTimeTablesList function with userID & password
23   - $res = $client->getTimeTablesList("testKernel", "amda");
  23 + $res = $client->getTimeTablesList("budnik", "Sacre-Cour");
24 24 if (!isset($res) || !$res->success)
25 25 echo "[ERROR] - Error during call of getTimeTablesList function - Test 2".PHP_EOL;
26 26 else
27 27 echo "[OK] - getTimeTablesList - Test 2 - ".$res->TimeTablesList.PHP_EOL;
28   -
  28 +
29 29 //Test getTimeTable function without userID & password
30   - $res = $client->getTimeTable("sharedtt_0");
31   - if (!isset($res) || !$res->success)
32   - echo "[ERROR] - Error during call of getTimeTable function - Test 1".PHP_EOL;
33   - else
34   - echo "[OK] - getTimeTable - Test 1 - ".$res->ttFileURL.PHP_EOL;
35   -
  30 +// $res = $client->getTimeTable("sharedtt_0");
  31 +// if (!isset($res) || !$res->success)
  32 +// echo "[ERROR] - Error during call of getTimeTable function - Test 1".PHP_EOL;
  33 +// else
  34 +// echo "[OK] - getTimeTable - Test 1 - ".$res->ttFileURL.PHP_EOL;
  35 +
36 36 //Test getTimeTable function with userID & password
37   - $res = $client->getTimeTable("tt_0", "testKernel", "amda");
  37 + $res = $client->getTimeTable("tt_0", "budnik", "Sacre-Cour");
38 38 if (!isset($res) || !$res->success)
39 39 echo "[ERROR] - Error during call of getTimeTable function - Test 2".PHP_EOL;
40 40 else
41 41 echo "[OK] - getTimeTable - Test 2 - ".$res->ttFileURL.PHP_EOL;
42   -
  42 +
43 43 //Test getParameterList function for impex user
44   - $res = $client->getParameterList("impex");
45   - if (!isset($res) || !$res->success)
46   - echo "[ERROR] - Error during call of getParameterList function - Test 1".PHP_EOL;
47   - else
48   - echo "[OK] - getParameterList - Test 1 - ".$res->ParameterList->LocalDataBaseParameters.PHP_EOL;
49   -
  44 +// $res = $client->getParameterList("impex");
  45 +// if (!isset($res) || !$res->success)
  46 +// echo "[ERROR] - Error during call of getParameterList function - Test 1".PHP_EOL;
  47 +// else
  48 +// echo "[OK] - getParameterList - Test 1 - ".$res->ParameterList->LocalDataBaseParameters.PHP_EOL;
  49 +
50 50 //Test getParameterList function with userID & password
51   - $res = $client->getParameterList("testKernel", "amda");
  51 + $res = $client->getParameterList("budnik", "Sacre-Cour");
52 52 if (!isset($res) || !$res->success)
53 53 echo "[ERROR] - Error during call of getParameterList function - Test 2".PHP_EOL;
54 54 else
... ... @@ -57,7 +57,7 @@ function runSuiteTests($client)
57 57 echo " - UserDefinedParameters : ".$res->ParameterList->UserDefinedParameters.PHP_EOL;
58 58 echo " - LocalDataBaseParameters : ".$res->ParameterList->LocalDataBaseParameters.PHP_EOL;
59 59 }
60   -
  60 +
61 61 //Test getObsDataTree function
62 62 $res = $client->getObsDataTree();
63 63 if (!isset($res) || !$res->success)
... ...
public/wsdl/Methods_AMDA.wsdl
  Diff comments   View file @31fb656
... ... @@ -55,9 +55,7 @@
55 55 </xs:element>
56 56 <xs:element name="WorkSpace" type="tns:WorkSpace" minOccurs="1" maxOccurs="1">
57 57 <xs:annotation>
58   - <xs:documentation>Url's of AmdaUserTree file which must be generated
59   - after connections. Contents: AMDA local parameters, Remote
60   - Parameters, Shared Predefined Parameters. </xs:documentation>
  58 + <xs:documentation>Url's of AMDA local parameters </xs:documentation>
61 59 </xs:annotation>
62 60 </xs:element>
63 61 </xs:sequence>
... ... @@ -67,15 +65,12 @@
67 65 <xs:sequence>
68 66 <xs:element name="userID" type="xs:string" minOccurs="0" maxOccurs="1">
69 67 <xs:annotation>
70   - <xs:documentation>ID of AMDA user storing in the 3DView. Must TBD. If no
71   - user ID, result is shared Timetables from IMPEX user.
72   - </xs:documentation>
  68 + <xs:documentation>ID of AMDA user. If no user ID, user is IMPEX</xs:documentation>
73 69 </xs:annotation>
74 70 </xs:element>
75 71 <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
76 72 <xs:annotation>
77   - <xs:documentation>Crypt Password of AMDA user storing in the 3DView.
78   - Must TBD encryption types</xs:documentation>
  73 + <xs:documentation>Crypt Password of AMDA user </xs:documentation>
79 74 </xs:annotation>
80 75 </xs:element>
81 76 </xs:sequence>
... ... @@ -85,8 +80,7 @@
85 80 <xs:sequence>
86 81 <xs:element name="success" minOccurs="0" maxOccurs="1" type="xs:boolean">
87 82 <xs:annotation>
88   - <xs:documentation>Url of TimeTables storage file with TimeTables
89   - ID's.</xs:documentation>
  83 + <xs:documentation>If method is OK success = true, else success = false</xs:documentation>
90 84 </xs:annotation>
91 85 </xs:element>
92 86 <xs:element name="TimeTablesList" minOccurs="0" maxOccurs="1" type="xs:anyURI">
... ... @@ -102,13 +96,12 @@
102 96 <xs:sequence>
103 97 <xs:element name="userID" type="xs:string" minOccurs="1" maxOccurs="1">
104 98 <xs:annotation>
105   - <xs:documentation>ID of AMDA user</xs:documentation>
  99 + <xs:documentation>ID of AMDA user. If no user ID, user is IMPEX</xs:documentation>
106 100 </xs:annotation>
107 101 </xs:element>
108 102 <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
109 103 <xs:annotation>
110   - <xs:documentation>Crypt Password of AMDA user storing in the 3DView.
111   - Must TBD encryption types</xs:documentation>
  104 + <xs:documentation>Crypt Password of AMDA user</xs:documentation>
112 105 </xs:annotation>
113 106 </xs:element>
114 107 </xs:sequence>
... ... @@ -118,16 +111,14 @@
118 111 <xs:sequence>
119 112 <xs:element name="success" minOccurs="0" maxOccurs="1" type="xs:boolean">
120 113 <xs:annotation>
121   - <xs:documentation>Url of TimeTables storage file with TimeTables
122   - ID's.</xs:documentation>
  114 + <xs:documentation>If method is OK success = true, else success = false</xs:documentation>
123 115 </xs:annotation>
124 116 </xs:element>
125 117 <xs:element name="ParameterList" type="tns:ParameterList" minOccurs="1"
126 118 maxOccurs="1">
127 119 <xs:annotation>
128   - <xs:documentation>Url of AmdaUserTree file which must be generated after
129   - the user connections Contents: User groups local parameters, User
130   - remote parameters, user predefined parameters. </xs:documentation>
  120 + <xs:documentation>Url of UserDefinedParameters, Url of AmdaLocalDataBaseParameters,
  121 + Url of RemoteDataBaseParameters ( not implemented ) </xs:documentation>
131 122 </xs:annotation>
132 123 </xs:element>
133 124 </xs:sequence>
... ... @@ -685,21 +676,18 @@ of a set of typically orthogonal axes.
685 676 </xs:element>
686 677 <xs:element name="userID" type="xs:string" minOccurs="0" maxOccurs="1">
687 678 <xs:annotation>
688   - <xs:documentation>ID of AMDA user storing in the 3DView. Must TBD For
689   - public data is optional. </xs:documentation>
  679 + <xs:documentation>ID of AMDA user. If no user ID, user is IMPEX</xs:documentation>
690 680 </xs:annotation>
691 681 </xs:element>
692 682 <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
693 683 <xs:annotation>
694   - <xs:documentation>Crypt Password of AMDA user storing in the 3DView.
695   - Must TBD encryption types Required for predefined parameters.
696   - </xs:documentation>
  684 + <xs:documentation>Crypt Password of AMDA user </xs:documentation>
697 685 </xs:annotation>
698 686 </xs:element>
699 687 <xs:element name="outputFormat" minOccurs="0" maxOccurs="1">
700 688 <xs:annotation>
701   - <xs:documentation> Choice is possible between the two formats: netCDF, CDF,
702   - ASCII and VOTable. If the format is not specified it will be netCDF
  689 + <xs:documentation> Choice is possible between the four formats: netCDF, CDF,
  690 + ASCII and VOTable. If the format is not specified it will be ASCIIF
703 691 by default</xs:documentation>
704 692 </xs:annotation>
705 693 <xs:simpleType>
... ... @@ -737,8 +725,7 @@ of a set of typically orthogonal axes.
737 725 <xs:sequence>
738 726 <xs:element name="success" minOccurs="0" maxOccurs="1" type="xs:boolean">
739 727 <xs:annotation>
740   - <xs:documentation>Url of TimeTables storage file with TimeTables
741   - ID's.</xs:documentation>
  728 + <xs:documentation>If method is OK success = true, else success = false</xs:documentation>
742 729 </xs:annotation>
743 730 </xs:element>
744 731 <xs:element maxOccurs="unbounded" minOccurs="0" name="dataFileURLs" type="xs:anyURI">
... ... @@ -834,21 +821,18 @@ of a set of typically orthogonal axes.
834 821 </xs:element>
835 822 <xs:element name="userID" type="xs:string" minOccurs="0" maxOccurs="1">
836 823 <xs:annotation>
837   - <xs:documentation>ID of AMDA user. For
838   - public data is optional. </xs:documentation>
  824 + <xs:documentation>ID of AMDA user. If no user ID, user is IMPEX</xs:documentation>
839 825 </xs:annotation>
840 826 </xs:element>
841 827 <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
842 828 <xs:annotation>
843   - <xs:documentation>Crypt Password of AMDA user.
844   - Must TBD encryption types Required for predefined parameters.
845   - </xs:documentation>
  829 + <xs:documentation>Crypt Password of AMDA user </xs:documentation>
846 830 </xs:annotation>
847 831 </xs:element>
848 832 <xs:element name="outputFormat" minOccurs="0" maxOccurs="1">
849 833 <xs:annotation>
850   - <xs:documentation> Choice is possible between the 3 formats: netCDF, CDF,
851   - ASCII and VOTable. If the format is not specified it will be netCDF
  834 + <xs:documentation> Choice is possible between the four formats: netCDF, CDF,
  835 + ASCII and VOTable. If the format is not specified it will be ASCII
852 836 by default</xs:documentation>
853 837 </xs:annotation>
854 838 <xs:simpleType>
... ... @@ -893,7 +877,7 @@ of a set of typically orthogonal axes.
893 877 type="xs:anyURI">
894 878 <xs:annotation>
895 879 <xs:documentation>URLs of results data files. If not URLs - not data for
896   - required parameters</xs:documentation>
  880 + required datasets</xs:documentation>
897 881 </xs:annotation>
898 882 </xs:element>
899 883 <xs:element maxOccurs="1" minOccurs="0" name="status">
... ... @@ -940,7 +924,7 @@ of a set of typically orthogonal axes.
940 924 </xs:element>
941 925 <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
942 926 <xs:annotation>
943   - <xs:documentation>Password of AMDA</xs:documentation>
  927 + <xs:documentation>Password of AMDA user</xs:documentation>
944 928 </xs:annotation>
945 929 </xs:element>
946 930 </xs:sequence>
... ... @@ -1026,21 +1010,18 @@ of a set of typically orthogonal axes.
1026 1010 </xs:element>
1027 1011 <xs:element name="userID" type="xs:string" minOccurs="0" maxOccurs="1">
1028 1012 <xs:annotation>
1029   - <xs:documentation>ID of AMDA user storing in the 3DView. Must TBD For
1030   - public data is optional. </xs:documentation>
  1013 + <xs:documentation>ID of AMDA user. If no user ID, user is IMPEX</xs:documentation>
1031 1014 </xs:annotation>
1032 1015 </xs:element>
1033 1016 <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
1034 1017 <xs:annotation>
1035   - <xs:documentation>Crypt Password of AMDA user storing in the 3DView.
1036   - Must TBD encryption types Required for predefined parameters.
1037   - </xs:documentation>
  1018 + <xs:documentation>Crypt Password of AMDA user </xs:documentation>
1038 1019 </xs:annotation>
1039 1020 </xs:element>
1040 1021 <xs:element name="outputFormat" minOccurs="0" maxOccurs="1">
1041 1022 <xs:annotation>
1042   - <xs:documentation> Choice is possible between the two formats: netCDF, CDF,
1043   - ASCII and VOTable. If the format is not specified it will be netCDF
  1023 + <xs:documentation> Choice is possible between the four formats: netCDF, CDF,
  1024 + ASCII and VOTable. If the format is not specified it will be ASCII
1044 1025 by default</xs:documentation>
1045 1026 </xs:annotation>
1046 1027 <xs:simpleType>
... ... @@ -1111,21 +1092,17 @@ of a set of typically orthogonal axes.
1111 1092 <xs:sequence>
1112 1093 <xs:element name="userID" type="xs:string" minOccurs="0" maxOccurs="1">
1113 1094 <xs:annotation>
1114   - <xs:documentation>ID of AMDA user storing in the 3DView. Must
1115   - TBD</xs:documentation>
  1095 + <xs:documentation>ID of AMDA user. If no user ID, user is IMPEX</xs:documentation>
1116 1096 </xs:annotation>
1117 1097 </xs:element>
1118 1098 <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1">
1119 1099 <xs:annotation>
1120   - <xs:documentation>Crypt Password of AMDA user storing in the 3DView.
1121   - Must TBD encryption types Required for predefined parameters.
1122   - </xs:documentation>
  1100 + <xs:documentation>Crypt Password of AMDA user </xs:documentation>
1123 1101 </xs:annotation>
1124 1102 </xs:element>
1125 1103 <xs:element name="ttID" type="xs:string" minOccurs="1" maxOccurs="1">
1126 1104 <xs:annotation>
1127   - <xs:documentation>Id of time tables(TT) defined in
1128   - AmdaUserTree.xml</xs:documentation>
  1105 + <xs:documentation>Id of time table</xs:documentation>
1129 1106 </xs:annotation>
1130 1107 </xs:element>
1131 1108 </xs:sequence>
... ... @@ -1401,7 +1378,7 @@ of a set of typically orthogonal axes.
1401 1378  
1402 1379 <wsdl:service name="Methods_AMDA">
1403 1380 <wsdl:port name="Methods_AMDAPort" binding="tns:Methods_AMDASoapBinding">
1404   - <soap:address location="http://apus.irap.omp.eu/NEWAMDA/php/AMDA_METHODS_WSDL.php"/>
  1381 + <soap:address location="http://amdadev.irap.omp.eu/FEATURES/php/AMDA_METHODS_WSDL.php"/>
1405 1382 </wsdl:port>
1406 1383 </wsdl:service>
1407 1384 </wsdl:definitions>
... ...