From 82cae7df993533cd56291e37f569eac64a412892 Mon Sep 17 00:00:00 2001 From: EoleDev Date: Wed, 24 Feb 2016 23:06:02 +0100 Subject: Add Network class Generation in App --- server/Test/AppTestClass.php | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) (limited to 'server/Test') diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php index 311b9bf..2babed4 100755 --- a/server/Test/AppTestClass.php +++ b/server/Test/AppTestClass.php @@ -6,6 +6,7 @@ class AppTest{ protected $openstack; protected $pluginsApi; + protected $postParams; protected $tokenClass; protected $tokenPost; protected $output; @@ -15,8 +16,10 @@ class AppTest{ $this->tokenPost = NULL; $this->tokenClass = new genTokenOptions($args); $this->openstack = new OpenStack\OpenStack([]); - $this->pluginsApi = plugin_api::getInstance(); + $this->pluginsApi = plugin_api::getInstance(); + $this->errorClass = new errorManagement($this); $this->output = array(); + $this->postParams = $_POST; } @@ -40,6 +43,11 @@ class AppTest{ $opt = $this->tokenClass->getOptions($service); return $this->openstack->imagesV2($opt); break; + case "Network": + if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken(); + $opt = $this->tokenClass->getOptions($service); + return $this->openstack->networkingV2($opt); + break; } } @@ -53,10 +61,21 @@ class AppTest{ $this->tokenClass->genNetworkToken(); $this->setOutput("token", $this->tokenClass->getBackup()); - }catch(Exception $e){ - echo $e; - exit(); - } + }catch(BadResponseError $e){ + $this->errorClass->BadResponseHandler($e); + }catch(UserInputError $e){ + $this->errorClass->UserInputHandler($e); + }catch(BaseError $e){ + $this->errorClass->BaseErrorHandler($e); + }catch(NotImplementedError $e){ + $this->errorClass->NotImplementedHandler($e); + } + + } + + public function getPostParam($name){ + + return $this->postParams[$name]; } -- cgit v1.2.3 From 59041ccb45d7cba18a66d0623d9b5875e6ac32b6 Mon Sep 17 00:00:00 2001 From: stupidon Date: Sun, 28 Feb 2016 10:23:17 +0100 Subject: added Compute case for libclass generation --- server/Test/AppTestClass.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'server/Test') diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php index 2babed4..68d0cfc 100755 --- a/server/Test/AppTestClass.php +++ b/server/Test/AppTestClass.php @@ -43,6 +43,11 @@ class AppTest{ $opt = $this->tokenClass->getOptions($service); return $this->openstack->imagesV2($opt); break; + case "Compute": + if($this->tokenPost == NULL) $this->tokenClass->genComputeToken(); + $opt = $this->tokenClass->getOptions($service); + return $this->openstack->computeV2($opt); + break; case "Network": if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken(); $opt = $this->tokenClass->getOptions($service); @@ -89,4 +94,4 @@ class AppTest{ echo json_encode($this->output); } -} \ No newline at end of file +} -- cgit v1.2.3 From 07aea6ce3991db4a87d16663412aecde199adbc0 Mon Sep 17 00:00:00 2001 From: stupidon Date: Sun, 28 Feb 2016 10:35:07 +0100 Subject: added computeTest to Test --- server/Test/computeTest.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 server/Test/computeTest.php (limited to 'server/Test') diff --git a/server/Test/computeTest.php b/server/Test/computeTest.php new file mode 100644 index 0000000..3fae820 --- /dev/null +++ b/server/Test/computeTest.php @@ -0,0 +1,21 @@ +re '../vendor/autoload.php'; +include('/istic-openstack/server/init.php'); +include_once("../core/Compute.php"); +$compute = new compute($App); + +$servers = $compute->listServers(); + +$servers= $compute->listServers(true); +foreach($servers as $server){ + //print_r($server); + echo $server->name." ".$server->id."
"; + +//$opt = Array(); +//$opt['name'] = "Test"; +//$serverid"id"[] = "69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"; +//$serverid = Array("id"=>"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"); +//$serverid["id"] = "{69d5bcc4-2fab-4634-b0d2-f455fee5b7bd}"; +//unset($server); +//$server = $compute->getServer($serverid); +//echo $server->name." ".$server->image; +//$server->update(array('name' => 'test')); -- cgit v1.2.3 From ca0c2377788d65b043ea5ccc2a5d52b40726e06b Mon Sep 17 00:00:00 2001 From: stupidon Date: Sun, 28 Feb 2016 11:13:22 +0100 Subject: test --- server/Test/computeTest.php | 1 - 1 file changed, 1 deletion(-) (limited to 'server/Test') diff --git a/server/Test/computeTest.php b/server/Test/computeTest.php index 3fae820..3ce1f2e 100644 --- a/server/Test/computeTest.php +++ b/server/Test/computeTest.php @@ -12,7 +12,6 @@ foreach($servers as $server){ //$opt = Array(); //$opt['name'] = "Test"; -//$serverid"id"[] = "69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"; //$serverid = Array("id"=>"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd"); //$serverid["id"] = "{69d5bcc4-2fab-4634-b0d2-f455fee5b7bd}"; //unset($server); -- cgit v1.2.3 From 9280eecbcf42253363a30f97d265069d0159de77 Mon Sep 17 00:00:00 2001 From: EoleDev Date: Sun, 28 Feb 2016 19:26:53 +0100 Subject: Support gestion output --- server/Test/AppTestClass.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'server/Test') diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php index 68d0cfc..4d7cab5 100755 --- a/server/Test/AppTestClass.php +++ b/server/Test/AppTestClass.php @@ -16,10 +16,10 @@ class AppTest{ $this->tokenPost = NULL; $this->tokenClass = new genTokenOptions($args); $this->openstack = new OpenStack\OpenStack([]); - $this->pluginsApi = plugin_api::getInstance(); + $this->pluginsApi = plugin_api::getInstance(); $this->errorClass = new errorManagement($this); $this->output = array(); - $this->postParams = $_POST; + $this->postParams = $_POST; } @@ -91,7 +91,7 @@ class AppTest{ } public function show(){ - echo json_encode($this->output); + return json_encode($this->output); } -} +} -- cgit v1.2.3