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 ++++++++++++++++++++++++----- server/core/App.php | 5 +++++ 2 files changed, 29 insertions(+), 5 deletions(-) mode change 100644 => 100755 server/core/App.php (limited to 'server') 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]; } diff --git a/server/core/App.php b/server/core/App.php old mode 100644 new mode 100755 index babb3d9..5495a1f --- a/server/core/App.php +++ b/server/core/App.php @@ -50,6 +50,11 @@ class App{ $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; } } -- cgit v1.2.3 From e53410a587e8d67a4e5ee8108955e736109f6dd2 Mon Sep 17 00:00:00 2001 From: stupidon Date: Sun, 28 Feb 2016 10:18:34 +0100 Subject: added compute to index --- server/index.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'server') diff --git a/server/index.php b/server/index.php index 166e82e..41b4e73 100644 --- a/server/index.php +++ b/server/index.php @@ -34,5 +34,12 @@ $imageObject->action($action); $App->show(); break; + + case "compute": + include_once("core/Compute.php"); + $computeObject = new compute($App); + $computeObject->action($action); + $App->show(); + break; } -- 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') 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') 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 869538121bdc07adba1637252bf1d7338f1a27de Mon Sep 17 00:00:00 2001 From: stupidon Date: Sun, 28 Feb 2016 10:48:28 +0100 Subject: updated Compute.php --- server/core/Compute.php | 146 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) (limited to 'server') diff --git a/server/core/Compute.php b/server/core/Compute.php index 8d1c8b6..3df3ada 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -1 +1,147 @@ +app = $app; + $this->libClass = $app->getLibClass("Compute"); + } + /** + * List servers. + * @return array + */ + public function listServers() + { + $servers = $this->libClass->listServers(); + return $servers; + } + /** + * List flavors. + * @return array + */ + public function listFlavors() + { + $flavors = $this->libClass->listFlavors(); + return $flavors; + } + /** + * List images. + * @return array + */ + public function listImages() + { + $images = $this->libClass->listImages(); + return $images; + } + /** + * Create server. + * @return array + + public function createServer(array $options) + { + + $server = $this->libClass->createServer(); + } + /** + * Get server details. + * @return array + */ + public function getServer(array $options = []) + { + $server = $this->libClass->getServer($options); + return $server; + } + /** + * Get flavor details. + * @return array + */ + public function getFlavor(array $options = []) + { + $flavor = $this->libClass->getFlavor($options); + return $flavor; + } + /** + * Get image details. + * @return array + */ + public function getImage(array $options = []) + { + $image = $this->libClass->getImage($options); + return $image; + } + //working on tests + public function update() + { + $image = $this->app->getServer(array $options = []); + + } + public function delete() + { + //TODO + } + public function changePassword($newPassword) + { + //TODO + } + public function reboot($type = Enum::REBOOT_SOFT) + { + //TODO + } + public function rebuild(array $options) + { + //TODO + } + public function resize($flavorId) + { + //TODO + } + public function confirmResize() + { + //TODO + } + public function revertResize() + { + //TODO + } + public function createImage(array $options) + { + //TODO + } + public function listAddresses(array $options = []) + { + //TODO + } + public function getMetadata() + { + //TODO + } + public function resetMetadata(array $metadata) + { + //TODO + } + public function mergeMetadata(array $metadata) + { + //TODO + } + public function getMetadataItem($key) + { + //TODO + } + public function deleteMetadataItem($key) + { + //TODO + } + +} -- cgit v1.2.3 From c6abd77fc241894a4052d4212c25b0e2291683a1 Mon Sep 17 00:00:00 2001 From: stupidon Date: Sun, 28 Feb 2016 10:56:56 +0100 Subject: syntax correction --- server/core/Compute.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server') diff --git a/server/core/Compute.php b/server/core/Compute.php index 3df3ada..e95380e 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -47,7 +47,7 @@ class compute /** * Create server. * @return array - + */ public function createServer(array $options) { -- 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') 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 3fe5596998b88e20aa3965a5b44d0a8ec9f0a4cb Mon Sep 17 00:00:00 2001 From: EoleDev Date: Sun, 28 Feb 2016 19:10:51 +0100 Subject: Correct Error in App, Add Compute in App, add Network in Index --- server/core/App.php | 9 +++++++-- server/index.php | 9 ++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'server') diff --git a/server/core/App.php b/server/core/App.php index 5495a1f..282a1db 100755 --- a/server/core/App.php +++ b/server/core/App.php @@ -33,7 +33,7 @@ class App{ public function setToken($token){ $this->tokenPost = $token; - $this->tokenClass->loadBackup($his->tokenPost); + $this->tokenClass->loadBackup($this->tokenPost); } @@ -55,6 +55,11 @@ class App{ $opt = $this->tokenClass->getOptions($service); return $this->openstack->networkingV2($opt); break; + case "Compute": + if($this->tokenPost == NULL) $this->tokenClass->genComputeToken(); + $opt = $this->tokenClass->getOptions($service); + return $this->openstack->computeV2($opt); + break; } } @@ -102,4 +107,4 @@ class App{ echo json_encode($this->output); } -} \ No newline at end of file +} diff --git a/server/index.php b/server/index.php index 41b4e73..f888671 100644 --- a/server/index.php +++ b/server/index.php @@ -27,7 +27,14 @@ $identityObject->action($action); $App->show(); break; - + + case "network": + include_once("core/Network.php"); + $networkObject = new network($App); + $networkObject->action($action); + $App->show(); + break; + case "image": include_once("core/Image.php"); $imageObject = new image($App); -- 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') 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 From 153c1f4602e7a8247c7dc3e59e64d5eb65260ef2 Mon Sep 17 00:00:00 2001 From: stupidon Date: Sun, 28 Feb 2016 19:50:33 +0100 Subject: updated Compute to use formatted return --- server/core/Compute.php | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'server') diff --git a/server/core/Compute.php b/server/core/Compute.php index e95380e..5a45362 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -24,7 +24,8 @@ class compute public function listServers() { $servers = $this->libClass->listServers(); - return $servers; + $this->app->setOutput("Servers", $servers); + return; } /** * List flavors. @@ -33,7 +34,8 @@ class compute public function listFlavors() { $flavors = $this->libClass->listFlavors(); - return $flavors; + $this->app->setOutput("Flavors", $flavors); + return; } /** * List images. @@ -42,7 +44,8 @@ class compute public function listImages() { $images = $this->libClass->listImages(); - return $images; + $this->app->setOutput("Images", $images); + return; } /** * Create server. @@ -60,7 +63,8 @@ class compute public function getServer(array $options = []) { $server = $this->libClass->getServer($options); - return $server; + $this->app->setOutput("MyServer", $server); + return; } /** * Get flavor details. @@ -69,7 +73,8 @@ class compute public function getFlavor(array $options = []) { $flavor = $this->libClass->getFlavor($options); - return $flavor; + $this->app->setOutput("MyFlavor", $flavor); + return; } /** * Get image details. @@ -78,9 +83,11 @@ class compute public function getImage(array $options = []) { $image = $this->libClass->getImage($options); - return $image; + $this->app->setOutput("MyImage", $image); + return; } - //working on tests + /* working on tests + public function update() { $image = $this->app->getServer(array $options = []); @@ -142,6 +149,6 @@ class compute { //TODO } - +*/ } -- cgit v1.2.3 From 847e4c04aea8c56ac4e4b8d12fcb405e78159026 Mon Sep 17 00:00:00 2001 From: stupidon Date: Sun, 28 Feb 2016 20:21:05 +0100 Subject: updated getserver, getimage and getflavor --- server/core/Compute.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'server') diff --git a/server/core/Compute.php b/server/core/Compute.php index 5a45362..1312083 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -51,7 +51,7 @@ class compute * Create server. * @return array */ - public function createServer(array $options) + public function createServer() { $server = $this->libClass->createServer(); @@ -60,9 +60,11 @@ class compute * Get server details. * @return array */ - public function getServer(array $options = []) + public function getServer() { - $server = $this->libClass->getServer($options); + $serverId = $this->app->getPostParam("serverId"); + $opt = array('id' => $serverId); + $server = $this->libClass->getServer($opt); $this->app->setOutput("MyServer", $server); return; } @@ -70,9 +72,11 @@ class compute * Get flavor details. * @return array */ - public function getFlavor(array $options = []) + public function getFlavor() { - $flavor = $this->libClass->getFlavor($options); + $flavorId = $this->app->getPostParam("flavorId"); + $opt = array('id' => $flavorId); + $flavor = $this->libClass->getFlavor($opt); $this->app->setOutput("MyFlavor", $flavor); return; } @@ -82,7 +86,9 @@ class compute */ public function getImage(array $options = []) { - $image = $this->libClass->getImage($options); + $imageId = $this->app->getPostParam("imageId"); + $opt = array('id' => $imageId); + $image = $this->libClass->getImage($opt); $this->app->setOutput("MyImage", $image); return; } -- cgit v1.2.3 From 79a65198e45076c5db58be3e749d533d3f4acc03 Mon Sep 17 00:00:00 2001 From: stupidon Date: Sun, 28 Feb 2016 20:29:18 +0100 Subject: minor corrections --- server/core/Compute.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server') diff --git a/server/core/Compute.php b/server/core/Compute.php index 1312083..84af889 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -84,7 +84,7 @@ class compute * Get image details. * @return array */ - public function getImage(array $options = []) + public function getImage() { $imageId = $this->app->getPostParam("imageId"); $opt = array('id' => $imageId); -- cgit v1.2.3 From 2583ae04deed167ba3bcb12c52d1188d2538536a Mon Sep 17 00:00:00 2001 From: EoleDev Date: Sun, 28 Feb 2016 20:44:17 +0100 Subject: Error correction function call --- server/core/LibOverride/genTokenOptions.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'server') diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php index b71defa..f239d84 100644 --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php @@ -263,10 +263,10 @@ class genTokenOptions $this->backup["roles"] = $backup["roles"]; $this->backup["project"] = $backup["project"]; $this->backup["user"] = $backup["user"]; - loadComputeBackup($backup["Compute"]); - loadIdentityBackup($backup["Identity"]); - loadImageBackup($backup["Image"]); - loadNetworkBackup($backup["Network"]); + $this->loadComputeBackup($backup["Compute"]); + $this->loadIdentityBackup($backup["Identity"]); + $this->loadImageBackup($backup["Image"]); + $this->loadNetworkBackup($backup["Network"]); } -- cgit v1.2.3 From c67651168a08cdd5209fafedea86c48c3fe6d6f0 Mon Sep 17 00:00:00 2001 From: stupidon Date: Sun, 28 Feb 2016 20:49:52 +0100 Subject: updated action --- server/core/Compute.php | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'server') diff --git a/server/core/Compute.php b/server/core/Compute.php index 84af889..fdc6b20 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -17,10 +17,22 @@ class compute $this->app = $app; $this->libClass = $app->getLibClass("Compute"); } - /** - * List servers. - * @return array - */ + /** + * Execute an action + * + * @param String $action name of another function of this class + * + * @return void + */ + public function action($action){ + + $this->{$action.""}(); + + } + /** + * List servers. + * @return array + */ public function listServers() { $servers = $this->libClass->listServers(); @@ -50,12 +62,13 @@ class compute /** * Create server. * @return array - */ + * public function createServer() { $server = $this->libClass->createServer(); } + */ /** * Get server details. * @return array -- cgit v1.2.3 From 8ea4b64f9305fd493bce2967063190586531e3aa Mon Sep 17 00:00:00 2001 From: stupidon Date: Sun, 28 Feb 2016 21:23:28 +0100 Subject: updated get functions --- server/core/Compute.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'server') diff --git a/server/core/Compute.php b/server/core/Compute.php index fdc6b20..94e219c 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -78,6 +78,7 @@ class compute $serverId = $this->app->getPostParam("serverId"); $opt = array('id' => $serverId); $server = $this->libClass->getServer($opt); + $server->retrieve(); $this->app->setOutput("MyServer", $server); return; } @@ -90,6 +91,7 @@ class compute $flavorId = $this->app->getPostParam("flavorId"); $opt = array('id' => $flavorId); $flavor = $this->libClass->getFlavor($opt); + $flavor->retrieve(); $this->app->setOutput("MyFlavor", $flavor); return; } @@ -102,6 +104,7 @@ class compute $imageId = $this->app->getPostParam("imageId"); $opt = array('id' => $imageId); $image = $this->libClass->getImage($opt); + $image->retrieve(); $this->app->setOutput("MyImage", $image); return; } -- cgit v1.2.3 From 0ab3116656c41300c571832b4f543125f93da399 Mon Sep 17 00:00:00 2001 From: EoleDev Date: Sun, 28 Feb 2016 22:54:51 +0100 Subject: Error Correction on Token Save --- server/core/App.php | 1 + server/core/LibOverride/genTokenOptions.php | 2 ++ 2 files changed, 3 insertions(+) mode change 100644 => 100755 server/core/LibOverride/genTokenOptions.php (limited to 'server') diff --git a/server/core/App.php b/server/core/App.php index 282a1db..edb75f6 100755 --- a/server/core/App.php +++ b/server/core/App.php @@ -105,6 +105,7 @@ class App{ public function show(){ echo json_encode($this->output); + //error_log(var_dump(json_encode($this->output), true), 0); } } diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php old mode 100644 new mode 100755 index f239d84..50826ed --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php @@ -260,6 +260,7 @@ class genTokenOptions public function loadBackup($back){ $backup = unserialize($back); + $this->backup["roles"] = $backup["roles"]; $this->backup["project"] = $backup["project"]; $this->backup["user"] = $backup["user"]; @@ -324,6 +325,7 @@ class genTokenOptions private function unserializeToken($tokenSerialized){ $Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]); + $Saved = unserialize($Saved); $api = new Api(); $token = new Models\Token($this->httpClient, $api); $token->methods = unserialize($tokenSerialized["methods"]); -- cgit v1.2.3