Merge branch 'develop' into loic

This commit is contained in:
manzerbredes 2016-03-30 14:14:10 +02:00
commit 237b627bf6
8 changed files with 147 additions and 58 deletions

View file

@ -5,7 +5,7 @@
* @version 1.0 Initialisation of this file
* @since 1.0 Core application's file
*
* @author Evan Pisani 'yogg at epsina . com'
* @author Evan Pisani 'yogg at epsina . com' et bhupi
*
* @todo Complete the functions with errors detection and finish the descriptions
*/
@ -16,25 +16,28 @@ include("Network.php");
include("Compute.php");
class automating implements Core{
/** @var App $app protected, contains the main app object */
protected $app;
/** @var OpenStack\Identity $libClass protected, contains the library Identity object */
protected $libClass;
protected $appCompute;
protected $appImage;
protected $appNetwork;
protected $appIdentity;
/**
* Image constructor
* Our library's app constructor for all server app objects
*
* @param App $app the main app object
* @param App $app the main app object, e.g. compute, image, network, etc.
*
* @return Image
* @return
*/
public function __construct($app){
if(!isset($app)){
$this->app->setOutput("Error", "Incorrect parameter app");
$this->app->setOutput("Error", "Parameter app missing.");
}
$this->app = $app;
$this->libClass = $app->getLibClass("Automating");
$this->appCompute = $appCompute;
$this->appImage = $appImage;
$this->appNetwork = $appNetwork;
$this->appIdentity = $appIdentity;
}
/**
@ -48,6 +51,27 @@ class automating implements Core{
$this->{$action.""}();
}
public function script()
{
$opt = Array();
$opt['name'] = getPostParam('name');
appImage->setPostParam('opt' $opt);
appImage->createImage();
appNetwork->create_network();
appnetwork->list_network_ids();
appNetwork->create_subnet();
appCompute->listFlavors(); //to show all flavors with detail.
appCompute->listImages(); //to show all images with detail and to verify that the image was created successfully by the call above.
appCompute->setPostParam("name","Test");
appCompute->setPostParam("imageId","CREATED_ABOVE");
appCompute->setPostParam("flavorId","1");
appCompute->createServer();
}
/**
* Create a new image on a new server
*
@ -124,4 +148,4 @@ class automating implements Core{
}
}
?>
?>