Merge branch 'loic' into loic-image-edition

1 files changed, 5 insertions, 3 deletions

diff --git a/server/core/App.php b/server/core/App.php
index 48bb9ab..114d945 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -1,5 +1,4 @@
 <?php

-include_once("core/Plugin_Api.php");

 include_once("core/LibOverride/genTokenOptions.php");

 include_once("core/ErrorManagement.php");

 

@@ -11,7 +10,6 @@ use OpenCloud\Common\Error\UserInputError;
 class App{

 	

 	protected $openstack;

-	protected $pluginsApi;

 	protected $postParams;

 	protected $tokenClass;

 	protected $tokenPost;

@@ -23,7 +21,6 @@ class App{
 		$this->tokenPost = NULL;

 		$this->tokenClass = new genTokenOptions($args);

 		$this->openstack = new OpenStack\OpenStack(['authUrl' => $args["authUrl"]]);

-		$this->pluginsApi = plugin_api::getInstance();

 		$this->errorClass = new errorManagement($this);

 		$this->output = array();

 		$this->postParams = $_POST;

@@ -64,6 +61,11 @@ class App{
 				$opt = $this->tokenClass->getOptions($service);

 				return $this->openstack->computeV2($opt);

 				break;

+			case "NetworkLayer3":

+				if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken();

+				$opt = $this->tokenClass->getOptions('Network');

+				return $this->openstack->networkingV2ExtLayer3($opt);

+				break;

 		}

 		

 	}