something
' due to some error on their side.""" + + def __init__(self, value, body=None, driver=None): + self.value = value + self.driver = driver + self.body = body + + def __str__(self): + return ("Arguments:
| Method | ' + method + ' |
|---|---|
| ' + param + ' | Contents of: ' + params[param].filename + ' |
| ' + param + ' | ' + params[param] + ' |
ConPaaS MySQL
+No "action" specified.
+This URL is used to access the service manager directly. + You may want to copy-paste the URL as a parameter to the 'managerc.py' command-line utility.
+ ''' + self._render_arguments(method, params) + '') + + def send_action_not_found(self, method, params): + self.send_custom_response(httplib.NOT_FOUND, ''' + +ConPaaS MySQL
+The specified "action" was not found.
+You may want to review the list of supported actions provided by the 'managerc.py' command-line utility.
+ ''' + self._render_arguments(method, params) + '') + +#class MultithreadedHTTPServer(ThreadingMixIn, HTTPServer): +# pass + +class ManagerServer(ThreadingMixIn, HTTPServer): + + def register_method(self, http_method, func_name, callback): + self.callback_dict[http_method][func_name] = callback + + def __init__(self, server_address, iaas_config, RequestHandlerClass=SQLServerRequestHandler): + HTTPServer.__init__(self, server_address, RequestHandlerClass) + self.callback_dict = {'GET': {}, 'POST': {}} + from conpaas.mysql.server.manager import internals + internals.iaas = IaaSClient(iaas_config) + #internals.config = iaas_config + self.whitelist_addresses = [] + #self.callback_dict = {'GET': {}, 'POST': {}, 'UPLOAD': {}} + + internals.managerServer=MySQLServerManager(iaas_config) + for http_method in internals.exposed_functions: + for func_name in internals.exposed_functions[http_method]: + print 'Going to register ', http_method, func_name + self.register_method(http_method, func_name, getattr(internals, func_name)) + +if __name__ == '__main__': + from optparse import OptionParser + from ConfigParser import ConfigParser + parser = OptionParser() + parser.add_option('-p', '--port', type='int', default=50000, dest='port') + parser.add_option('-b', '--bind', type='string', default='0.0.0.0', dest='address') + parser.add_option('-c', '--config', type='string', default='./config.cfg', dest='config') + options, args = parser.parse_args() + config_parser = ConfigParser() + config_parser.read(options.config) + print options.address, options.port + d = ManagerServer((options.address, options.port), config_parser) + d.serve_forever() \ No newline at end of file diff --git a/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/server/manager/sql_manager_configuration.cnf b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/server/manager/sql_manager_configuration.cnf new file mode 100644 index 0000000000000000000000000000000000000000..70315e08132617a883fb6075d0aae6aea49560ce --- /dev/null +++ b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/server/manager/sql_manager_configuration.cnf @@ -0,0 +1,10 @@ +[iaas] +DRIVER=OPENNEBULA_XMLRPC +OPENNEBULA_URL=http://172.16.120.228:2633/RPC2 +#OPENNEBULA_URL=http://10.30.1.9:2633/RPC2 +OPENNEBULA_USER=oneadmin +OPENNEBULA_PASSWORD=oneadmin +OPENNEBULA_IMAGE_ID=76 +OPENNEBULA_NETWORK_ID=24 +OPENNEBULA_SIZE_ID=1 +OPENNEBULA_CONTEXT_SCRIPT=/home/leo/manager/ts.sh \ No newline at end of file diff --git a/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/__init__.py b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/opennebula_test.py b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/opennebula_test.py new file mode 100644 index 0000000000000000000000000000000000000000..865b73eae8c2025c2fe61f3bd1036e3e82f6f80c --- /dev/null +++ b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/opennebula_test.py @@ -0,0 +1,62 @@ +''' +Created on Jul 28, 2011 + +@author: ales +''' +#from conpaas.iaas import IaaSClient +import oca + +def xmlRPCtest(): + client = oca.Client('oneadmin:oneadmin', 'http://172.16.120.228:2633/RPC2') + #new_host_id = oca.Host.allocate(client, 'host_name', 'im_xen', 'vmm_xen', 'tm_nfs') + hostpool = oca.HostPool(client) + hostpool.info() + for i in hostpool: + print "Active host:" + print i.name, i.str_state + vm_pool=oca.VirtualMachinePool(client) + vm_pool.info(-2) + print "All VMs:" + for i in vm_pool: + print i.name, i.str_state + print "Allocating new VM..." + #oca.VirtualMachine. + rez=oca.VirtualMachine.allocate(client, '''NAME = conpaassql01 +CPU = 0.2 +MEMORY = 512 + OS = [ + arch = "i686", + boot = "hd", + root = "hda" ] +DISK = [ + image = "Ubu10-10-rmq-3", + bus = "scsi", + readonly = "no" ] +NIC = [ NETWORK = "Private LAN" ] +GRAPHICS = [ + type="vnc" + ] +''') + print rez + +def xmlRPCtest2(): + client = oca.Client('oneadmin:oneadmin', 'http://172.16.120.228:2633/RPC2') + rez=oca.VirtualMachinePool(client) + rez.info(-2) + vm = rez.get_by_id(424) + + #rez=oca.VirtualMachine.info(client, 424) + print rez + +if __name__ == '__main__': + #xmlRPCtest() + xmlRPCtest2() + #CP = ConfigParser() + #ONDriver = get_driver(Provider.OPENNEBULA) + #driver = OpenNebulaNodeDriver("oneadmin", "oneadmin", False , "172.16.120.228", 4566) + #driver.list_images() + #driver.list_nodes() + #driver.list_locations() + #CP.readfp(open("scripts/opennebula.conf")) + #client = IaaSClient(CP) + #print client.listVMs() diff --git a/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/__init__.py b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/agent.py b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/agent.py new file mode 100644 index 0000000000000000000000000000000000000000..890ee9e46fd6e5bd9e6271150758ea81d74767aa --- /dev/null +++ b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/agent.py @@ -0,0 +1,90 @@ +''' +Created on Aug 26, 2011 + +@author: ales +''' +import unittest +from conpaas.mysql.server.agent.server import AgentServer +from conpaas.mysql.client.agent_client import get_server_state +from conpaas.mysql.client.agent_client import create_server +import threading +from ConfigParser import ConfigParser +from conpaas.mysql.server.agent.internals import MySQLServer +from conpaas.mysql.server.agent import internals +import os + +config_file=None + +class TestServerAgent(unittest.TestCase): + + #host = '0.0.0.0' + #port = 60000 + a = None + + def setUp(self): + from optparse import OptionParser + #parser = OptionParser() + #parser.add_option('-c', '--config', type='string', default='./configuration.cnf', dest='config') + #options, args = parser.parse_args() + + config_file=os.curdir+"/src/conpaas/mysql/test/unit/configuration.cnf" + # This is for testing locally. + #config_file="configuration.cnf" + + config_parser = ConfigParser() + config_parser.read(config_file) + '''Set up configuration for the parser. + ''' + config_parser.set('MySQL_configuration', 'my_cnf_file', '/etc/mysql/my.cnf') + config_parser.set('MySQL_configuration', 'path_mysql_ssr', '/etc/init.d/mysql') + config_parser.set('MySQL_root_connection', 'location', '') + config_parser.set('MySQL_root_connection', 'username', '') + config_parser.set('MySQL_root_connection', 'password', '') + + # This is for integration testing + #self.a = AgentServer((self.host, self.port), config_parser) + #self.t = threading.Thread(target=self.a.serve_forever) + #self.t.start() + self.a=MySQLServer(config_parser, True) + internals.agent = self.a + self.a.start() + + def tearDown(self): + self.a.stop() + self.a = None + #self.t.join() + #self.t = None + + def testSQLServerState(self): + #self.assertTrue(getMySQLServerState(self.host, self.port)) + ret=internals.get_server_state(False) + self.assertTrue(ret.obj != None) + #self.__check_reply(ret) + + def testStartStopSQLServer(self): + #ret = createMySQLServer(self.host,self.port) + #self.assertTrue(ret) + #self.__check_reply(ret) + #ret = stopMySQLServer(self.host,self.port) + #self.assertTrue(ret) + #self.__check_reply(ret) + ret = internals.create_server(False) + self.assertTrue(ret) + self.__check_reply(ret) + ret = internals.stop_server(False) + self.assertTrue(ret) + self.__check_reply(ret) + + def testRestartSQLServer(self): + ret = internals.restart_server(False) + self.__check_reply(ret) + + def __check_reply(self, ret): + self.assertTrue( ret.obj['return'] == 'OK') + +if __name__ == "__main__": + #import sys;sys.argv = ['', 'Test.testName'] + + unittest.main() + #suite = unittest.TestLoader().loadTestsFromTestCase(TestServerAgent) + #unittest.TextTestRunner(verbosity=2).run(suite) \ No newline at end of file diff --git a/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/configuration.cnf b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/configuration.cnf new file mode 100644 index 0000000000000000000000000000000000000000..0b1c5d28d22d64e012590f5bda1ad4a2f64dd1bd --- /dev/null +++ b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/configuration.cnf @@ -0,0 +1,8 @@ +[MySQL_root_connection] +location= +password= +username= + +[MySQL_configuration] +my_cnf_file=/etc/mysql/my.cnf +path_mysql_ssr=/etc/init.d/mysql \ No newline at end of file diff --git a/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/manager.py b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/manager.py new file mode 100644 index 0000000000000000000000000000000000000000..d173a1430970c78c9b6eed48a1fc7cdb5bde6107 --- /dev/null +++ b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/manager.py @@ -0,0 +1,83 @@ +''' +Created on Aug 31, 2011 + +@author: ales +''' +import unittest +#from conpaas.mysql.server.manager.server import ManagerServer +import threading +from ConfigParser import ConfigParser +from conpaas.iaas import IaaSClient +from conpaas.mysql.server.manager import internals +from conpaas.mysql.server.manager.internals import MySQLServerManager +import os + + +class TestServerManager(unittest.TestCase): + + def setUp(self): + # This is prepared for integration unit testing. + #======================================================================= + # from optparse import OptionParser + # from ConfigParser import ConfigParser + # parser = OptionParser() + # parser.add_option('-p', '--port', type='int', default=50000, dest='port') + # parser.add_option('-b', '--bind', type='string', default='0.0.0.0', dest='address') + # parser.add_option('-c', '--config', type='string', default='./sql_manager_configuration.cnf', dest='config') + # options, args = parser.parse_args() + # config_parser = ConfigParser() + # config_parser.read(options.config) + # print options.address, options.port + # self.managerServer = ManagerServer((options.address, options.port), config_parser) + # self.t = threading.Thread(target=self.managerServer.serve_forever) + # self.managerServer.serve_forever() + # self.t.start() + #======================================================================= + config = os.curdir+'/src/conpaas/mysql/test/unit/sql_manager_configuration.cnf' + #config = 'sql_manager_configuration.cnf' + config_parser = ConfigParser() + config_parser.read(config) + '''Set up configuration for the parser. + ''' + + # This is for integration testing + #self.a = AgentServer((self.host, self.port), config_parser) + #self.t = threading.Thread(target=self.a.serve_forever) + #self.t.start() + self.a=IaaSClient(config_parser) + internals.iaas = self.a + internals.managerServer=MySQLServerManager(config_parser, True) + self.managerServer = internals.managerServer + + def tearDown(self): + #self.managerServer.shutdown() + #self.managerServer = None + #self.t.join() + #self.t = None + self.managerServer = None + self.a = None + + def testAddNodes(self): + nodes = internals.list_nodes({}) + len1 = len(nodes.obj['serviceNode']) + internals.add_nodes({}) + nodes = internals.list_nodes({}) + self.assertTrue(len(nodes.obj['serviceNode'])== len1+1) + + def testRemoveNodes(self): + newnode = internals.add_nodes({}) + nodes = internals.list_nodes({}) + len1 = len(nodes.obj['serviceNode']) + internals.remove_nodes({'serviceNodeId':nodes.obj['serviceNode'][0]}) + nodes = internals.list_nodes({}) + self.assertTrue(len(nodes.obj['serviceNode'])== len1-1) + + def testGetNodes(self): + nodes = internals.list_nodes({}) + self.assertTrue(nodes.obj) + #self.assertTrue(nodes.obj['serviceNode']==[]) + + +if __name__ == "__main__": + #import sys;sys.argv = ['', 'Test.testName'] + unittest.main() \ No newline at end of file diff --git a/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/sql_manager_configuration.cnf b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/sql_manager_configuration.cnf new file mode 100644 index 0000000000000000000000000000000000000000..b50bf4d6b532cc9e551a264a60a19d52d8085a5c --- /dev/null +++ b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/mysql/test/unit/sql_manager_configuration.cnf @@ -0,0 +1,10 @@ +[iaas] +DRIVER=OPENNEBULA_DUMMY +OPENNEBULA_URL=http://localhost:2633/RPC2 +OPENNEBULA_USER=oneadmin +OPENNEBULA_PASSWORD=oneadmin +OPENNEBULA_IMAGE_ID=21 +OPENNEBULA_NETWORK_ID=24 +OPENNEBULA_SIZE_ID=1 +OPENNEBULA_CONTEXT_SCRIPT_MANAGER=/home/contrail/manager/conpaassql-install.sh +OPENNEBULA_CONTEXT_SCRIPT_AGENT=/home/contrail/agent/conpaassql-install.sh \ No newline at end of file diff --git a/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/web/__init__.py b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/web/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/web/http.py b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/web/http.py new file mode 100644 index 0000000000000000000000000000000000000000..8de00b450eb4e1fdb5d110d2158f94b03f98cf5e --- /dev/null +++ b/conpaas/branches/Y1DEMO-conpaassql/src/conpaas/web/http.py @@ -0,0 +1,308 @@ +''' +Copyright (C) 2010-2011 Contrail consortium. + +This file is part of ConPaaS, an integrated runtime environment +for elastic cloud applications. + +ConPaaS is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +ConPaaS is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with ConPaaS. If not, see'.
+ '
';
+ return $html;
+ }
+
+ public function getSize() {
+ return count($this->nodes);
+ }
+
+}
+
+?>
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/DB.php b/conpaas/branches/conpaas-dailybuild/frontend/www/DB.php
new file mode 100644
index 0000000000000000000000000000000000000000..c8e970fd54f77b2679473ea04efa63e2003bec19
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/DB.php
@@ -0,0 +1,60 @@
+.
+
+class DB {
+
+ private static $conn = null;
+
+ private static function loadConfiguration() {
+ $conf = parse_ini_file(Conf::CONF_DIR.'/db.ini', true);
+ if ($conf === false) {
+ throw new Exception('Could not read db configuration file db.ini');
+ }
+ return $conf['mysql'];
+ }
+
+ public static function getConn() {
+ if (self::$conn === null) {
+ $conf = self::loadConfiguration();
+ self::$conn = mysql_connect($conf['server'], $conf['user'],
+ $conf['pass']);
+ if (self::$conn === FALSE) {
+ throw new Exception('Could not connect to the DB');
+ }
+ mysql_select_db($conf['db'], self::$conn);
+ mysql_set_charset('utf8', self::$conn);
+ }
+ return self::$conn;
+ }
+
+ public static function fetchAssocAll($res) {
+ $rows = array();
+ while ($row = mysql_fetch_assoc($res)) {
+ $rows[] = $row;
+ }
+ return $rows;
+ }
+}
+
+class DBException extends Exception {
+
+ public function __construct($conn) {
+ parent::__construct(mysql_error($conn), mysql_errno($conn));
+ }
+}
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/EC2Service.php b/conpaas/branches/conpaas-dailybuild/frontend/www/EC2Service.php
new file mode 100644
index 0000000000000000000000000000000000000000..fa5311b0587320f908f1deb430a9dba70d0d59c2
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/EC2Service.php
@@ -0,0 +1,121 @@
+.
+
+require_once('logging.php');
+require_once('Service.php');
+require_once('DB.php');
+require_once('lib/aws-sdk/sdk.class.php');
+
+class EC2 {
+
+ protected $vmid;
+
+ private $ec2;
+
+ private $manager_ami;
+ private $security_group;
+ private $keypair;
+ private $user_data_file;
+ private $instance_type;
+ private $service_type;
+
+ public function __construct($data) {
+ $this->service_type = $data['type'];
+ $this->sid = $data['sid'];
+ $this->vmid = $data['vmid'];
+ $this->ec2 = new AmazonEC2();
+ $this->loadConfiguration();
+ }
+
+ private function loadConfiguration() {
+ $conf = parse_ini_file(Conf::CONF_DIR.'/aws.ini', true);
+ if ($conf === false) {
+ throw new Exception('Could not read AWS configuration file aws.ini');
+ }
+ $this->manager_ami = $conf['ami'];
+ $this->security_group = $conf['security_group'];
+ $this->keypair = $conf['keypair'];
+ $this->user_data_file = $conf['user_data_file'];
+ $this->instance_type = $conf['instance_type'];
+ }
+
+ /**
+ * Instantiate a virtual image of the Manager.
+ * @return string id of the virtual instance
+ * @throws Exception
+ */
+ public function createManagerInstance() {
+ $user_data = file_get_contents($this->user_data_file);
+ if ($user_data === false) {
+ throw new Exception('could not read manager user data: '.
+ $this->user_data_file);
+ }
+ $user_data = str_replace(
+ array('%CONPAAS_SERVICE_TYPE%', '%CONPAAS_SERVICE_ID%'),
+ array(strtoupper($this->service_type), $this->sid),
+ $user_data);
+ $response = $this->ec2->run_instances($this->manager_ami, 1, 1, array(
+ 'InstanceType' => $this->instance_type,
+ 'KeyName' => $this->keypair,
+ 'SecurityGroup' => $this->security_group,
+ 'UserData' => base64_encode($user_data),
+ ));
+ if (!$response->isOK()) {
+ dlog($response);
+ throw new Exception('the EC2 instance was not created');
+ }
+ /* get the instance id */
+ $instance = $response->body->instancesSet->item;
+ return $instance->instanceId;
+ }
+
+ /**
+ * @return false if the state is not 'running'
+ * the address (DNS) of the instance
+ * @throws Exception
+ */
+ public function getManagerAddress() {
+ $response = $this->ec2->describe_instances(array(
+ 'InstanceId' => $this->vmid,
+ ));
+ if (!$response->isOK()) {
+ dlog($response);
+ throw new Exception('describe_instances call failed');
+ }
+ $instance = $response->body->reservationSet->item->instancesSet->item;
+ if (!$instance->instanceState->name == 'running') {
+ return false;
+ }
+ if (!isset($instance->dnsName) || $instance->dnsName == '') {
+ return false;
+ }
+ return $instance->dnsName;
+ }
+
+ public function terminateService() {
+ $response = $this->ec2->terminate_instances($this->vmid);
+ if (!$response->isOK()) {
+ dlog($response);
+ throw new Exception('terminate_instances('.$this->vmid.') '.
+ 'failed for service '.$this->name.'['.$this->sid.']');
+ }
+ }
+
+}
+?>
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/InputButton.php b/conpaas/branches/conpaas-dailybuild/frontend/www/InputButton.php
new file mode 100644
index 0000000000000000000000000000000000000000..e05a795d8f85ae318dbe9877cc52d4227db82bea
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/InputButton.php
@@ -0,0 +1,71 @@
+.
+
+function InputButton($text) {
+ return new InputButton($text);
+}
+
+class InputButton {
+
+ protected $id = '';
+ protected $text;
+ protected $visible = true;
+ protected $disabled = false;
+
+ public function __construct($text) {
+ $this->text = $text;
+ }
+
+ public function setVisible($visible) {
+ $this->visible = $visible;
+ return $this;
+ }
+
+ public function setId($id) {
+ $this->id = $id;
+ return $this;
+ }
+
+ public function setDisabled($disabled) {
+ $this->disabled = $disabled;
+ return $this;
+ }
+
+ private function invisibleClass() {
+ if ($this->visible) {
+ return '';
+ }
+ return 'invisible';
+ }
+
+ private function disabledMarker() {
+ if ($this->disabled) {
+ return ' disabled="disabled" ';
+ }
+ return '';
+ }
+
+ public function __toString() {
+ return
+ 'disabledMarker().'/>';
+ }
+}
+
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/Instance.php b/conpaas/branches/conpaas-dailybuild/frontend/www/Instance.php
new file mode 100644
index 0000000000000000000000000000000000000000..87b30ca639856b8e008f1a5f1f271ecfa76319a0
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/Instance.php
@@ -0,0 +1,76 @@
+.
+
+class Instance {
+
+ private $info;
+
+ public function __construct($info) {
+ $this->info = $info;
+ }
+
+ private function renderCapabs() {
+ $html = '';
+ if ($this->info['isRunningProxy']) {
+ $html .= ''.
+ '
';
+ foreach ($this->nodes as $node) {
+ $instance = new Instance($node);
+ $html .= $instance->renderInCluster();
+ }
+ $html .= ''.$this->roleName.'
'.
+ 'proxy
';
+ }
+ if ($this->info['isRunningWeb']) {
+ $html .= 'web
';
+ }
+ if ($this->info['isRunningBackend']) {
+ $html .= '' . $this->info['service_type'] . '
';
+ }
+ return $html;
+ }
+
+ public function render() {
+ return
+ ''
+ .'
';
+ }
+
+ public function renderInCluster() {
+ return
+ ''
+ .'Instance '.$this->info['id'].''
+ .$this->renderCapabs()
+ .'
'
+ .'running
'
+ .''
+ .''.$this->info['ip'].''
+ .'
'
+ .''
+ .''
+ .'
';
+ }
+
+ public function getSize() {
+ return 1;
+ }
+}
+
+?>
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/LinkUI.php b/conpaas/branches/conpaas-dailybuild/frontend/www/LinkUI.php
new file mode 100644
index 0000000000000000000000000000000000000000..b186b7338fe0d5e19ee44083eb2672dae2182aae
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/LinkUI.php
@@ -0,0 +1,59 @@
+.
+
+function LinkUI($text, $href) {
+ return new LinkUI($text, $href);
+}
+
+class LinkUI {
+
+ private $text;
+ private $href;
+ private $external = false;
+ private $class = 'link';
+
+ public function __construct($text, $href) {
+ $this->text = $text;
+ $this->href = $href;
+ }
+
+ public function setExternal($external) {
+ $this->external = $external;
+ return $this;
+ }
+
+ public function addClass($class) {
+ $this->class .= ' '.$class;
+ return $this;
+ }
+
+ private function renderSymbol() {
+ return
+ ''
+ .'Instance '.$this->info['id'].''
+ .'running for 6 hours'
+ .'
'
+ .''
+ .''.$this->info['ip'].''
+ .'
'
+ .''
+ .'
';
+ }
+
+ public function __toString() {
+ $target = $this->external ? 'target="new"' : '';
+ return
+ ''
+ .''.$this->text.''
+ .$this->renderSymbol()
+ .'
';
+ }
+}
\ No newline at end of file
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/LocalService.php b/conpaas/branches/conpaas-dailybuild/frontend/www/LocalService.php
new file mode 100644
index 0000000000000000000000000000000000000000..0421d3605020c3b2ecb5732c42f7dca91183686c
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/LocalService.php
@@ -0,0 +1,38 @@
+.
+
+require_once('Service.php');
+
+class LocalCloud {
+
+ public function __construct($service_data) {
+ }
+
+ public function getManagerAddress() {
+ return $this->manager;
+ }
+
+ public function checkManagerInstance() {
+ return false;
+ }
+
+ public function needsPolling() {
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/MapredPage.php b/conpaas/branches/conpaas-dailybuild/frontend/www/MapredPage.php
new file mode 100644
index 0000000000000000000000000000000000000000..3ca4725f8ebf377cb27dc492cfb9c86100a74efd
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/MapredPage.php
@@ -0,0 +1,90 @@
+.
+
+class MapredPage {
+
+ static $states = array(
+ 'INIT' => false,
+ 'RUNNING' => false,
+ 'PROLOGUE' => true,
+ 'EPILOGUE' => true,
+ 'STOPPED' => false
+ );
+
+ private $managerAddress;
+ private $conf = null;
+
+ public function __construct($data) {
+ $this->managerAddress = $data['manager'];
+ }
+
+ public function is_transient($state) {
+ return
+ !array_key_exists($state, self::$states) ||
+ (self::$states[$state] == true);
+ }
+
+ public function getUploadURL() {
+ return $this->managerAddress;
+ }
+
+ public function fetchState() {
+ return 'RUNNING';
+ }
+
+ public function renderActions($state) {
+ $startButton = InputButton('start')
+ ->setId('start');
+ $stopButton = InputButton('stop')
+ ->setId('stop');
+ $terminateButton = InputButton('terminate')
+ ->setDisabled(true);
+
+ switch ($state) {
+ case 'INIT':
+ $stopButton->setVisible(false);
+ $terminateButton->setVisible(false);
+ break;
+ case 'RUNNING':
+ $startButton->setVisible(false);
+ $terminateButton->setVisible(false);
+ break;
+ case 'STOPPED':
+ $stopButton->setVisible(false);
+ break;
+ default:
+ }
+
+ return $startButton.' '.$stopButton.' '.$terminateButton;
+ }
+
+ public function renderStateClass($state) {
+ switch ($state) {
+ case 'INIT':
+ case 'RUNNING':
+ return 'active';
+ case 'STOPPED':
+ return 'stopped';
+ default:
+ return '';
+ }
+ }
+
+}
+?>
\ No newline at end of file
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/OpenNebulaService.php b/conpaas/branches/conpaas-dailybuild/frontend/www/OpenNebulaService.php
new file mode 100644
index 0000000000000000000000000000000000000000..7091f021e02c0870550032833b3049ad50bc0768
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/OpenNebulaService.php
@@ -0,0 +1,156 @@
+.
+
+require_once('logging.php');
+require_once('Service.php');
+require_once('DB.php');
+require_once('lib/aws-sdk/sdk.class.php');
+
+class OpenNebula {
+
+ protected $vmid;
+
+ private $user_data_file;
+ private $instance_type;
+ private $service_type;
+
+ public function __construct($data) {
+ $this->service_type = $data['type'];
+ $this->sid = $data['sid'];
+ $this->vmid = $data['vmid'];
+ $this->loadConfiguration();
+ }
+
+ private function loadConfiguration() {
+ $conf = parse_ini_file(Conf::CONF_DIR.'/opennebula.ini', true);
+ if ($conf === false) {
+ throw new Exception('Could not read OpenNebula configuration file opennebula.ini');
+ }
+ $this->user_data_file = $conf['user_data_file'];
+ $this->instance_type = $conf['instance_type'];
+ $this->opennebula_url = $conf['url'];
+ $this->user = $conf['user'];
+ $this->passwd = $conf['passwd'];
+ $this->image = $conf['image'];
+ $this->network = $conf['network'];
+ $this->gateway = $conf['gateway'];
+ $this->nameserver = $conf['nameserver'];
+ }
+
+ public function http_request($method, $resource, $xml=null) {
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL, $this->opennebula_url . $resource);
+ curl_setopt($ch, CURLOPT_HEADER, 'Accept: */*');
+ curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC ) ;
+ curl_setopt($ch, CURLOPT_USERPWD, $this->user.':'.sha1($this->passwd));
+ switch($method) {
+ case 'POST':
+ curl_setopt($ch, CURLOPT_POST, 1);
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $xml);
+ break;
+ case 'DELETE':
+ curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
+ break;
+ default:
+ }
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ $body = curl_exec($ch);
+ return $body;
+ }
+
+ /**
+ * Instantiate a virtual image of the Manager.
+ * @return string id of the virtual instance
+ * @throws Exception
+ */
+ public function createManagerInstance() {
+ $user_data = file_get_contents($this->user_data_file);
+ if ($user_data === false) {
+ throw new Exception('could not read manager user data: '.
+ $this->user_data_file);
+ }
+ $user_data = str_replace(
+ array('%CONPAAS_SERVICE_TYPE%', '%CONPAAS_SERVICE_ID%'),
+ array(strtoupper($this->service_type), $this->sid),
+ $user_data);
+ $hex_user_data = bin2hex($user_data);
+ $response = $this->http_request('POST', '/compute',
+ ''
+ .'loading...'
+ .'
'
+ .'
';
+ }
+}
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/Service.php b/conpaas/branches/conpaas-dailybuild/frontend/www/Service.php
new file mode 100644
index 0000000000000000000000000000000000000000..f848fc893ef9ebef9d26d218979e2c69baecb94e
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/Service.php
@@ -0,0 +1,397 @@
+.
+
+require_once('logging.php');
+require_once('ServiceData.php');
+
+abstract class Service {
+
+ protected $sid,
+ $name,
+ $type,
+ $sw_version,
+ $state,
+ $creation_date,
+ $manager,
+ $uid,
+ $cloud,
+ $cloud_instance;
+
+ private $nodesLists;
+ private $nodesCount = 0;
+
+ private $reachable = false;
+ private $stable = true;
+
+ const STATE_RUNNING = 0;
+ const STATE_STOPPED = 1;
+ const STATE_TERMINATED = 2;
+ const STATE_PREINIT = 3;
+ const STATE_INIT = 4;
+ const STATE_ERROR = 5;
+
+ static $state_txt = array(
+ Service::STATE_RUNNING => 'running',
+ Service::STATE_STOPPED => 'stopped',
+ Service::STATE_TERMINATED => 'terminated',
+ Service::STATE_INIT => 'initializing',
+ Service::STATE_PREINIT => 'preparing',
+ Service::STATE_ERROR => 'error',
+ );
+
+ private static $CURL_OPTS = array(
+ CURLOPT_CONNECTTIMEOUT => 10,
+ CURLOPT_RETURNTRANSFER => true,
+ CURLOPT_TIMEOUT => 60,
+ );
+
+ public static function stateIsStable($remoteState) {
+ return
+ $remoteState != 'PROLOGUE' &&
+ $remoteState != 'EPILOGUE' &&
+ $remoteState != 'ADAPTING'
+ ;
+ }
+
+ private function pingManager() {
+ if (!isset($this->manager)) {
+ return;
+ }
+ try {
+ $json = $this->fetchState();
+ $state = json_decode($json, true);
+ if ($state !== null && isset($state['result'])) {
+ $this->reachable = true;
+ $this->stable = self::stateIsStable($state['result']['state']);
+ }
+ } catch (Exception $e) {
+ // nothing
+ error_log('error trying to connect to manager');
+ }
+ }
+
+ public function __construct($data, $cloud_instance) {
+ foreach ($data as $key => $value) {
+ $this->$key = $value;
+ }
+ $this->cloud_instance = $cloud_instance;
+ $this->pingManager();
+ /* fetch the nodes and arrange them */
+ if ($this->reachable && $this->state == self::STATE_RUNNING) {
+ $this->nodesLists = $this->fetchNodesLists();
+ /* compute the nodes count */
+ if ($this->nodesLists !== false) {
+ $selected = array();
+ foreach ($this->nodesLists as $role => $nodesList) {
+ foreach ($nodesList as $nodeId) {
+ if (!array_key_exists($nodeId, $selected)) {
+ $selected[$nodeId] = true;
+ $this->nodesCount++;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ public function isReachable() {
+ return $this->reachable;
+ }
+
+ public function isStable() {
+ return $this->stable;
+ }
+
+ public function isRunning() {
+ return $this->state == SERVICE::STATE_RUNNING;
+ }
+
+ public function isConfigurable() {
+ return
+ $this->reachable &&
+ $this->state != self::STATE_TERMINATED &&
+ $this->state != self::STATE_PREINIT;
+ }
+
+ public function needsPolling() {
+ return (!$this->reachable &&
+ ($this->state == self::STATE_RUNNING ||
+ $this->state == self::STATE_INIT ||
+ $this->state == self::STATE_PREINIT));
+ }
+
+ protected function managerRequest($method, $params, $http_method='get', $ping=false, $rpc=true) {
+ $opts = self::$CURL_OPTS;
+ if ($rpc) {
+ $opts[CURLOPT_HTTPHEADER] = array('Expect:', 'Content-Type: application/json');
+ }
+ else {
+ $opts[CURLOPT_HTTPHEADER] = array('Expect:');
+ }
+ if ($ping) {
+ $opts[CURLOPT_CONNECTTIMEOUT] = 1;
+ }
+
+ $url = $this->manager;
+ $http_method = strtolower($http_method);
+ if ($http_method == 'post') {
+ $opts[CURLOPT_POST] = 1;
+ if ($rpc) {
+ $opts[CURLOPT_POSTFIELDS] = json_encode(array(
+ 'method' => $method,
+ 'params' => $params,
+ 'id' =>1 ));
+ }
+ else {
+ $opts[CURLOPT_POSTFIELDS] = array_merge($params, array('method' => $method));
+ }
+ } else {
+ /* default is GET */
+ $url .= '?'.http_build_query(
+ array(
+ 'method' => $method,
+ 'params' => json_encode($params),
+ 'id' => 1),
+ null, '&');
+ }
+ $opts[CURLOPT_URL] = $url;
+
+ $conn = curl_init();
+ curl_setopt_array($conn, $opts);
+ $result = curl_exec($conn);
+ if ($result === false) {
+ $e = new Exception(
+ 'Error sending cURL request to '.$url.' '.
+ 'Error code: '.curl_errno($conn).' '.
+ 'Error msg: '.curl_error($conn)
+ );
+ curl_close($conn);
+ throw $e;
+ }
+ curl_close($conn);
+ return $result;
+ }
+
+ public function getNodeInfo($node) {
+ $json_info = $this->managerRequest('get_node_info', array(
+ 'serviceNodeId' => $node,
+ ));
+ $info = json_decode($json_info, true);
+ if ($info == null) {
+ return false;
+ }
+ return $info['result']['serviceNode'];
+ }
+
+ private function fetchNodesLists() {
+ if (!isset($this->manager)) {
+ return false;
+ }
+ $json = $this->managerRequest('list_nodes', array());
+ $response = json_decode($json, true);
+ if ($response == null || $response['error'] != null) {
+ return false;
+ }
+ return $response['result'];
+ }
+
+ public function fetchState() {
+ $ret = $this->managerRequest(
+ 'get_service_info',
+ array(),
+ 'get',
+ true
+ );
+ return $ret;
+ }
+
+ public function fetchCodeVersions() {
+ $json = $this->managerRequest('list_code_versions', array());
+ $versions = json_decode($json, true);
+ if ($versions == null) {
+ return false;
+ }
+ return $versions['result']['codeVersions'];
+ }
+
+ public function fetchHighLevelMonitoringInfo() {
+ $json = $this->managerRequest('get_service_performance', array());
+ $monitoring = json_decode($json, true);
+ if ($monitoring == null) {
+ return false;
+ }
+ return $monitoring['result'];
+ }
+
+ public function getConfiguration() {
+ $json_conf = $this->managerRequest('get_configuration', array());
+ $responseObj = json_decode($json_conf);
+ if ($responseObj == null) {
+ return null;
+ }
+ if (!isset($responseObj->result->phpconf)) {
+ return null;
+ }
+ return $this->conf = $responseObj->result->phpconf;
+ }
+
+ abstract public function sendConfiguration($params);
+
+ public function uploadCodeVersion($params) {
+ return $this->managerRequest('upload_code_version', $params, 'post', false, false);
+ }
+
+ public function fetchStateLog() {
+ $json = $this->managerRequest('get_service_history', array());
+ $log = json_decode($json, true);
+ if ($log != null) {
+ return $log['result']['state_log'];
+ }
+ else return array();
+ }
+
+ public function fetchLog() {
+ $json = $this->managerRequest('getLog', array());
+ $log = json_decode($json, true);
+ return $log['result']['log'];
+ }
+
+ public function addServiceNodes($params) {
+ if (isset($params['backend'])) $params['backend'] = intval($params['backend']);
+ if (isset($params['web'])) $params['web'] = intval($params['web']);
+ if (isset($params['proxy'])) $params['proxy'] = intval($params['proxy']);
+ return $this->managerRequest('add_nodes', $params, 'post');
+ }
+
+ public function removeServiceNodes($params) {
+ if (isset($params['backend'])) $params['backend'] = intval($params['backend']);
+ if (isset($params['web'])) $params['web'] = intval($params['web']);
+ if (isset($params['proxy'])) $params['proxy'] = intval($params['proxy']);
+ return $this->managerRequest('remove_nodes', $params, 'post');
+ }
+
+ public function requestShutdown() {
+ return $this->managerRequest('shutdown', array(), 'post');
+ }
+
+ public function requestStartup() {
+ return $this->managerRequest('startup', array(), 'post');
+ }
+
+ /**
+ * Deletes the service entry from the database
+ */
+ public function terminateService() {
+ $this->cloud_instance->terminateService();
+ ServiceData::deleteService($this->sid);
+ }
+
+ public function getAccessLocation() {
+ $loadbalancer = $this->getNodeInfo($this->nodesLists['proxy'][0]);
+ return 'http://'.$loadbalancer['ip'];
+ }
+
+ public function getNodesLists() {
+ return $this->nodesLists;
+ }
+
+ public function getNodesCount() {
+ return $this->nodesCount;
+ }
+
+ public function getSID() {
+ return $this->sid;
+ }
+
+ public function getName() {
+ return $this->name;
+ }
+
+ public function getType() {
+ return $this->type;
+ }
+
+ public function getManager() {
+ return $this->manager;
+ }
+
+ public function getVersion() {
+ return $this->sw_version;
+ }
+
+ public function getState() {
+ return $this->state;
+ }
+
+ public function getCloud() {
+ return $this->cloud;
+ }
+
+ public function getStatusText() {
+ return self::$state_txt[$this->state];
+ }
+
+ public function getDate() {
+ return $this->creation_date;
+ }
+
+ public function getUID() {
+ return $this->uid;
+ }
+
+ public function getCloudInstance() {
+ return $this->cloud_instance;
+ }
+
+ /**
+ * @return true if updated
+ */
+ public function checkManagerInstance() {
+ $manager_addr = $this->cloud_instance->getManagerAddress();
+ if ($manager_addr !== false) {
+ $manager_url = 'http://'.$manager_addr.':80';
+ if ($manager_url != $this->manager) {
+ ServiceData::updateManagerAddress($this->sid, $manager_url);
+ return true;
+ }
+ }
+ return false;
+ }
+}
+
+
+class PHPService extends Service {
+ public function __construct($data, $cloud_instance) {
+ parent::__construct($data, $cloud_instance);
+ }
+
+ public function sendConfiguration($params) {
+ return $this->managerRequest('update_php_configuration', $params, 'post');
+ }
+}
+
+class JavaService extends Service {
+ public function __construct($data, $cloud_instance) {
+ parent::__construct($data, $cloud_instance);
+ }
+
+ public function sendConfiguration($params) {
+ return $this->managerRequest('update_java_configuration', $params, 'post');
+ }
+}
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/ServiceData.php b/conpaas/branches/conpaas-dailybuild/frontend/www/ServiceData.php
new file mode 100644
index 0000000000000000000000000000000000000000..c4b349cc583e12ccff456ca72dfb06454d0ff831
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/ServiceData.php
@@ -0,0 +1,128 @@
+.
+
+require_once('DB.php');
+require_once('UserData.php');
+require_once('Service.php');
+
+class ServiceData {
+
+ public static function createService($default_name, $type, $cloud, $uid) {
+ if (UserData::updateUserCredit($uid, -1) === false) {
+ /* not enough credit */
+ return false;
+ }
+ $query = sprintf("INSERT INTO services ".
+ "(name, type, cloud, state, creation_date, uid) VALUES ".
+ "('%s', '%s', '%s', %d, now(), %d)",
+ mysql_escape_string($default_name),
+ mysql_escape_string($type),
+ mysql_escape_string($cloud),
+ mysql_escape_string(Service::STATE_PREINIT),
+ mysql_escape_string($uid)
+ );
+ $res = mysql_query($query, DB::getConn());
+ if ($res === false) {
+ throw new DBException(DB::getConn());
+ }
+
+ /* get the service id */
+ $sid = mysql_insert_id(DB::getConn());
+ return $sid;
+ }
+
+ public static function getServicesByUser($uid) {
+ $query = sprintf("SELECT * FROM services WHERE uid='%s' ".
+ " ORDER BY sid DESC",
+ mysql_escape_string($uid));
+ $res = mysql_query($query, DB::getConn());
+ if ($res === false) {
+ throw new DBException(DB::getConn());
+ }
+ return DB::fetchAssocAll($res);
+ }
+
+ public static function getServiceById($sid) {
+ $query = sprintf("SELECT * FROM services WHERE sid='%s' LIMIT 1",
+ mysql_escape_string($sid));
+ $res = mysql_query($query, DB::getConn());
+ if ($res === false) {
+ throw new DBException(DB::getConn());
+ }
+ $entries = DB::fetchAssocAll($res);
+ if (count($entries) != 1) {
+ throw new Exception('Service does not exist');
+ }
+ return $entries[0];
+ }
+
+ public static function updateVmid($sid, $vmid) {
+ $query = sprintf("UPDATE services SET vmid='%s' WHERE sid=%d",
+ mysql_escape_string($vmid), mysql_escape_string($sid));
+ $res = mysql_query($query, DB::getConn());
+ if ($res === false) {
+ throw new DBException(DB::getConn());
+ }
+ }
+
+ public static function updateName($sid, $name) {
+ $query = sprintf("UPDATE services SET name='%s' WHERE sid=%d",
+ mysql_escape_string($name),
+ mysql_escape_string($sid));
+ $res = mysql_query($query, DB::getConn());
+ if ($res === false) {
+ throw new DBException(DB::getConn());
+ }
+ }
+
+
+ public static function updateManagerAddress($sid, $manager) {
+ $query = sprintf("UPDATE services SET manager='%s', state=%d ".
+ " WHERE sid=%d",
+ mysql_escape_string($manager),
+ mysql_escape_string(Service::STATE_INIT),
+ mysql_escape_string($sid));
+ $res = mysql_query($query, DB::getConn());
+ if ($res === false) {
+ throw new DBException(DB::getConn());
+ }
+ }
+
+ public static function updateState($sid, $state) {
+ $query = sprintf("UPDATE services SET state=%d WHERE sid=%d",
+ mysql_escape_string($state),
+ mysql_escape_string($sid));
+ $res = mysql_query($query, DB::getConn());
+ if ($res === false) {
+ throw new DBException(DB::getConn());
+ }
+ }
+
+ public static function deleteService($sid) {
+ $query = sprintf("DELETE FROM services WHERE sid=%d",
+ mysql_escape_string($sid));
+ $res = mysql_query($query, DB::getConn());
+ if ($res === false) {
+ throw new DBException(DB::getConn());
+ }
+ }
+
+}
+
+?>
\ No newline at end of file
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/ServiceFactory.php b/conpaas/branches/conpaas-dailybuild/frontend/www/ServiceFactory.php
new file mode 100644
index 0000000000000000000000000000000000000000..40db859c28692bea58e87783ba85062408877046
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/ServiceFactory.php
@@ -0,0 +1,54 @@
+.
+
+require_once('LocalService.php');
+require_once('EC2Service.php');
+require_once('OpenNebulaService.php');
+require_once('Service.php');
+
+class ServiceFactory {
+
+ public static function createInstance($service_data) {
+ $cloud = $service_data['cloud'];
+ $type = $service_data['type'];
+ $cloud_instance = null;
+
+ switch ($cloud) {
+ case 'local':
+ $cloud_instance = new LocalCloud($service_data);
+ break;
+ case 'ec2':
+ $cloud_instance = new EC2($service_data);
+ break;
+ case 'opennebula':
+ $cloud_instance = new OpenNebula($service_data);
+ break;
+ default:
+ throw new Exception('Unknown cloud');
+ }
+ switch ($type) {
+ case 'php':
+ return new PHPService($service_data, $cloud_instance);
+ case 'java':
+ return new JavaService($service_data, $cloud_instance);
+ default:
+ throw new Exception('Unknown service type');
+ }
+ }
+}
\ No newline at end of file
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/ServiceItem.php b/conpaas/branches/conpaas-dailybuild/frontend/www/ServiceItem.php
new file mode 100644
index 0000000000000000000000000000000000000000..6487f57ee05b5dce9b21328e672777c98be23b53
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/ServiceItem.php
@@ -0,0 +1,157 @@
+.
+
+require_once('Service.php');
+require_once('StatusLed.php');
+require_once('TimeHelper.php');
+
+function ServiceItem($data) {
+ return new ServiceItem($data);
+}
+
+class ServiceItem {
+
+ private $service;
+ private $last = false;
+
+ public function __construct(Service $service) {
+ $this->service = $service;
+ }
+
+ public function setLast($last=true) {
+ $this->last = $last;
+ return $this;
+ }
+
+ private function renderImage() {
+ return
+ ''
+ .''
+ .'.'.png)
'
+ .'
';
+ }
+
+ private function renderActions() {
+ if (!$this->service->isReachable()) {
+ $actions = 'service is unreachable';
+ if ($this->service->getState() == Service::STATE_INIT) {
+ $actions .= ': initializing';
+ }
+ } else {
+ $ts = strtotime($this->service->getDate());
+ $actions = 'created '.TimeHelper::timeRelativeDescr($ts).' ago';
+ }
+
+ return
+ ''
+ .''
+ .$actions
+ .'
';
+ }
+
+ private function renderStatistic($content, $note) {
+ return
+ ''
+ .'
';
+ }
+
+ private function renderStats() {
+ if (!$this->service->isReachable()) {
+ if ($this->service->getState() == Service::STATE_INIT) {
+ $imgsrc = 'images/throbber-on-white.gif';
+ } else {
+ $imgsrc = 'images/warning.png';
+ }
+ return $this->renderStatistic(''.$content.'
'
+ .''.$note.'
'
+ .'
';
+
+ if ($this->service->getType() == 'php') {
+ $resptime =
+ ''.$monitor['throughput'].'ms'.
+ '
';
+
+ return
+ $this->renderStatistic(
+ ''
+ .$monitor['error_rate'].'%'
+ .' 
',
+ 'error rate')
+ .$this->renderStatistic(
+ ''.$monitor['request_rate'].'/s'
+ .' 
',
+ 'requests rate')
+ .$this->renderStatistic($resptime, 'response time')
+ .$this->renderStatistic($resources, 'virtual instances');
+ } else if ($this->service->getType() == 'hadoop') {
+ return
+ $this->renderStatistic($resources, 'virtual instances')
+ .$this->renderStatistic('233GB',
+ 'data processed');
+ }
+ }
+
+ private function renderColorTag() {
+ $color_class = $this->service->getState() == Service::STATE_RUNNING ?
+ 'colortag-active' : 'colortag-stopped';
+ return
+ ''
+ .StatusLed($this->service)
+ .$title
+ .'
';
+ }
+
+ public function __toString() {
+ $lastClass = $this->last ? 'last' : '';
+ return
+ ''
+ .$this->renderTitle()
+ .$this->renderActions()
+ .'
'
+ .$this->renderStats()
+ .''
+ .'No versions available
'; + } + $active = null; + for ($i = 0; $i < count($versions); $i++) { + if (isset($versions[$i]['current'])) { + $active = $i; + } + } + if (count($versions) == 0) { + return 'No versions available
'; + } + $html = '- ';
+ for ($i = 0; $i < count($versions); $i++) {
+ $versions[$i]['downloadURL'] =
+ $this->getVersionDownloadURL($versions[$i]['codeVersionId']);
+ $versionUI = Version($versions[$i])
+ ->setLinkable($this->service->isRunning());
+ if ($active == $i) {
+ if ($this->service->isRunning()) {
+ $versionUI->setActive(true, $this->service->getAccessLocation());
+ }
+ else {
+ $versionUI->setActive(true);
+ }
+ }
+ if ($i == count($versions) - 1) {
+ $versionUI->setLast();
+ }
+ $html .= $versionUI;
+ }
+ $html .= '
'
+ .$this->getNodesCount().' running '.$instances_txt
+ .' · on '.$this->renderCloud()
+ .'
'
+ .'';
+
+ foreach ($nodes as $node) {
+ $html .= $node->render();
+ }
+ $html .= '
';
+ return $html;
+ }
+
+ private function getTypeImage() {
+ return $this->service->getType().'.png';
+ }
+
+ private function renderEditableName() {
+ if (!$this->service->isConfigurable()) {
+ return ''.$this->service->getName().'';
+ }
+ return
+ ''
+ .$this->service->getName()
+ .'';
+ }
+
+ private function renderStateChange() {
+ $stateLog = $this->service->fetchStateLog();
+ // consider state changes in reverse order
+ foreach (array_reverse($stateLog) as $stateChange) {
+ if (Service::stateIsStable($stateChange['state'])) {
+ $ts = TimeHelper::timeRelativeDescr($stateChange['time']);
+ $state = ($stateChange['state'] == 'RUNNING') ?
+ 'started' : strtolower($stateChange['state']);
+ return $state.' '.$ts.' ago';
+ }
+ }
+ // default
+ $ts = TimeHelper::timeRelativeDescr(
+ strtotime($this->service->getDate()));
+ return 'created '.$ts.' ago';
+ }
+
+ private function renderSubname() {
+ return
+ ''
+ .$this->renderStateChange()
+ .' · '
+ .LinkUI('service manager', $this->service->getManager())
+ ->setExternal(true)
+ .' · '
+ .LinkUI('manager log', 'viewlog.php?sid='.$this->service->getSID())
+ ->setExternal(true)
+ .'
';
+ }
+
+ private function renderName() {
+ return
+ ''
+ .$this->renderEditableName()
+ .$this->renderSubname()
+ .'
';
+ }
+
+ public function renderTopMenu() {
+ return
+ ''
+ .'
';
+ }
+
+ public function renderSettings() {
+ if ($this->service instanceof PHPService)
+ return $this->renderPHPSettings();
+ elseif ($this->service instanceof JavaService)
+ return $this->renderJavaSettings();
+ else
+ throw new Exception('Unknown service type');
+ }
+
+ private function renderJavaSettings() {
+ return ''
+ .'.')
'
+ .$this->renderName()
+ .'
'
+ .''
+ .''
+ .'No modifiable settings.
';
+ }
+
+ private function renderPHPSettings() {
+ $html = <<'.
+ ''.
+ $this->renderItems().
+ '
'.
+ '
'.
+ $this->generateRefreshScript();
+ }
+}
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/StatusLed.php b/conpaas/branches/conpaas-dailybuild/frontend/www/StatusLed.php
new file mode 100644
index 0000000000000000000000000000000000000000..59c52a3517fdf22812f39d2a2d25eefb1d25c02f
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/StatusLed.php
@@ -0,0 +1,60 @@
+.
+
+require_once('Service.php');
+
+function StatusLed(Service $service) {
+ return new StatusLed($service);
+}
+
+class StatusLed {
+
+ private $service;
+
+ public function __construct(Service $service) {
+ $this->service = $service;
+ }
+
+ private function getImage() {
+ $state = $this->service->getState();
+ if (!$this->service->isReachable()) {
+ if ($state == Service::STATE_INIT ||
+ $state == Service::STATE_PREINIT) {
+ return 'images/ledlightblue.png';
+ }
+ return 'images/ledorange.png';
+ }
+ /* for reachable case */
+ switch ($state) {
+ case Service::STATE_INIT:
+ return 'images/ledlightblue.png';
+ case Service::STATE_RUNNING:
+ return 'images/ledgreen.png';
+ case Service::STATE_STOPPED:
+ return 'images/ledgray.png';
+ case Service::STATE_ERROR:
+ return 'images/ledred.png';
+ }
+ }
+
+ public function __toString() {
+ return 'all services
'.
+ 'active
';
+ }
+ return
+ $dot
+ .''
+ .'set active'
+ .''
+ .'';
+ }
+
+ private function renderName() {
+ if (!$this->active || !$this->linkAddress) {
+ return $this->name;
+ }
+
+ return LinkUI($this->name, $this->address)
+ ->setExternal(true)
+ ->addClass('address');
+ }
+
+ private function renderFilename() {
+ return
+ ''.$this->filename.'';
+ }
+
+ private function renderDownloadLink() {
+ return
+ ' · download';
+ }
+
+ public function __toString() {
+ return
+ ''
+ .$this->renderActivateLink()
+ .$this->renderDownloadLink()
+ .'
'
+ .''
+ .'
+ renderTopMenu(); ?>
+
+
+
+isConfigurable()): ?>
+ isRunning()): ?>
+
+
+
+
+
+
+
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/conpaas.css b/conpaas/branches/conpaas-dailybuild/frontend/www/conpaas.css
new file mode 100644
index 0000000000000000000000000000000000000000..f3cd590ceac2755ba5cd0d1de646c035f1c8543c
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/conpaas.css
@@ -0,0 +1,920 @@
+@CHARSET "UTF-8";
+
+body {
+ padding: 2px 5px;
+ margin: 0;
+ font-size: 12px;
+ font-weight: bold;
+ color: #0055A5;
+ font-family: Verdana, Tahoma, sans serif;
+ width: 800px;
+}
+
+h1 {
+ font-size: 24px;
+ padding: 3px 3px 3px 30px;
+ font-weight: normal;
+}
+
+a, a:visited {
+ color: #008cf7;
+ text-decoration: none;
+}
+
+a:hover {
+ text-decoration: underline;
+}
+
+.clear {
+ clear: both;
+}
+
+.blue {
+ color: #0055A5;
+}
+
+#logo {
+ width: 140px;
+ height: 50px;
+ background: url('images/conpaas.png') top left no-repeat;
+ float: left;
+}
+
+.user {
+ float: right;
+ padding: 23px 3px 3px 0;
+}
+
+.header {
+ border-bottom: 1px solid #0055A5;
+ padding: 0 5px 5px 5px;
+ background-color: #eee;
+}
+
+.pageheader .info {
+ float: left;
+ margin: 10px;
+}
+
+.pageheader h1 {
+ float: left;
+ font-size: 22px;
+}
+
+.pageheader .info .nameWrapper, .pageheader .info img.stype {
+ float: left;
+}
+
+.info .nameWrapper {
+ margin: 5px;
+}
+
+.pageheader .info .name {
+ padding: 0 3px 0 3px;
+ margin: 1px 0 1px 0;
+ font-size: 16px;
+ color: #333;
+ border: 1px solid white;
+ font-style: normal;
+}
+
+.pageheader .info .subname {
+ color: #999;
+ font-size: 12px;
+ font-weight: normal;
+ padding-left: 3px;
+}
+
+.subname .link {
+ display: inline;
+}
+
+.editable {
+ border: 1px solid white;
+}
+
+.actionsbar .editable {
+ border: 1px solid #ccc;
+ padding: 1px;
+}
+
+.editable:hover {
+ background-color: #fff6d5;
+ border: 1px solid #ffdd55;
+}
+
+.pageheader .menu {
+ padding-top: 25px;
+ float: right;
+}
+
+.menu img.loading {
+ float: right;
+}
+
+.menu .led {
+ padding: 3px;
+}
+
+.loadingWrapper {
+ height: 30px;
+ position: fixed;
+ top: 0;
+ left: 320px;
+ border-left: 2px solid #003380;
+ border-right: 2px solid #003380;
+ border-bottom: 2px solid #003380;
+ background-color: white;
+ padding: 3px 10px 3px 10px;
+}
+
+.loadingWrapper b {
+ vertical-align: top;
+ line-height: 30px;
+}
+
+.status {
+ display: inline;
+ padding: 3px;
+}
+
+a.button {
+ padding: 6px;
+ margin: 1px;
+ color: white;
+ font-size: 12px;
+ text-shadow: #333 1px 1px 0px;
+ border: 1px solid #003380;
+}
+
+body.webkit a.button {
+ background: -webkit-gradient(linear,0% 0,0% 100%,from(#008cf7),to(#003380));
+ border-radius: 5px;
+}
+
+body.firefox a.button {
+ background: -moz-linear-gradient(270deg, #008cf7, #003380) repeat scroll 0 0 transparent;
+ -moz-border-radius: 5px;
+}
+
+a.button:hover {
+ text-decoration: none;
+}
+
+.services {
+ margin-top: 20px;
+}
+
+.brief {
+ padding: 3px;
+ font-weight: normal;
+ color: #999;
+}
+
+.services ul.slist {
+ list-style: none;
+ padding-left: 0;
+ margin-top: 0;
+ border: 1px solid #eee;
+}
+
+.services ul.slist li.service {
+ padding:0;
+}
+
+.services ul.slist li.service:hover {
+ background-color: #eee;
+ border-top: 1px solid #999;
+ border-right: 1px solid #ccc;
+ border-left: 1px solid #ccc;
+}
+
+.services table.slist {
+ width: 100%;
+}
+
+tr.service {
+
+}
+
+
+.service .instances {
+ padding: 5px 0 0px 24px;
+ margin-top: 7px;
+ margin-left: 5px;
+ color: #666;
+ font-family: Helvetica, Verdana;
+ font-size: 16px;
+ line-height: 20px;
+ background: url('images/server.png') top left no-repeat;
+ cursor: pointer;
+}
+
+.service:hover .instances {
+ visibility: visible;
+}
+
+.service .content, .service .icon {
+ float: left;
+}
+
+.service .statistic {
+ float: right;
+}
+
+.service .content {
+ margin-left: 15px;
+}
+
+.service .last {
+ border-bottom: 1px solid #ccc;
+}
+
+.service .statistic {
+ margin-left: 15px;
+ margin-right: 5px;
+}
+
+.service .statistic .statcontent {
+ text-align: center;
+ padding: 6px 3px 0 3px;
+}
+
+.service .statistic .statcontent .text {
+ color: #000;
+ font-size: 24px;
+ text-shadow: white 1px 1px 0px;
+ font-family: Helvetica, Tahoma, sans-serif;
+ font-style: normal;
+ margin: 5px;
+}
+
+.service .statistic .note {
+ color: #999;
+ font-size: 12px;
+ font-weight: normal;
+ padding: 3px;
+}
+
+.service .wrapper {
+ padding: 10px;
+ border-right: 1px solid #ccc;
+ border-top: 1px solid #ddd;
+}
+
+.service:hover .wrapper {
+ background-color: #eee;
+}
+
+.service .content .title {
+ font-size: 14px;
+ padding: 5px 3px 2px 3px;
+ text-shadow: white 1px 1px 0px;
+}
+
+.service .title a {
+ font-size: 16px;
+ font-weight: bold;
+}
+
+.service .colortag {
+ width: 20px;
+ margin-right: 10px;
+ border-right: 1px solid white;
+}
+
+.service:hover .colortag-active {
+ background-color: #008300;
+}
+
+.service .colortag-active {
+ background-color: #00b100;
+}
+
+.service:hover .colortag-stopped {
+ background-color: #999;
+}
+
+.service .colortag-stopped {
+ background-color: #ccc;
+}
+
+.service .icon {
+ width: 70px;
+ height: 50px;
+}
+
+.service .led {
+ padding: 0px 10px 0 0px;
+}
+
+.service .content .link {
+ margin: 10px 0 0 30px;
+}
+
+.service .content .actions {
+ font-size: 12px;
+ color: #999;
+ font-weight: normal;
+ padding: 3px;
+}
+
+.services .slist .service .info {
+ float: right;
+ text-align: right;
+}
+
+.status {
+ font-size: 11px;
+}
+
+.created {
+ color: #999;
+ font-size: 10px;
+ font-weight: normal;
+}
+
+.active {
+ color: #008000;
+}
+
+.stopped {
+ color: #800000;
+}
+
+.services ul.slist li.service .title img {
+ padding: 1px 4px 0 4px;
+ margin: 0;
+}
+
+.link {
+ color: #666;
+ font-weight: normal;
+}
+
+.services a, .services a:visited {
+ color: #008cf7;
+ font-weight: normal;
+ font-size: 12px;
+}
+
+.form {
+ margin: 5px;
+}
+
+.form td {
+ vertical-align: top;
+}
+
+.form #status {
+ font-weight: normal;
+ color: #666;
+ font-size: 10px;
+ font-style: normal;
+ padding: 3px;
+}
+
+.form .description {
+ color: #666;
+ font-size: 12px;
+ font-weight: normal;
+ padding: 5px;
+ text-align: right;
+ line-height: 24px;
+ width: 150px;
+}
+
+.form .info {
+ color: #999;
+ font-weight: normal;
+ font-size: 12px;
+ padding: 10px;
+}
+
+.form .input {
+ padding: 8px 5px;
+ color: #333;
+}
+
+.form .input select, .form .input option {
+ font-size: 13px;
+}
+
+.form .input input[type="text"] {
+ padding: 1px;
+ color: #333;
+ font-weight: bold;
+ font-size: 12px;
+}
+
+input.button {
+ margin: 3px;
+ font-weight: bold;
+}
+
+.timestamp {
+ font-weight: normal;
+ color: #333;
+ padding: 4px 2px 2px 1px;
+ margin: 0;
+}
+
+.form-section {
+ padding: 15px 5px;
+ color: #333;
+ font-weight: normal;
+}
+
+.form-section .form-header {
+ background-color: #e9f1f9;
+ border-top: 1px solid #0055A5;
+ padding: 5px 5px 5px 10px;
+}
+
+.form-header .title {
+ font-size: 14px;
+ color: #0055A5;
+ float: left;
+}
+
+.form-header .access-box {
+ float: right;
+ font-size: 10px;
+ text-align: right;
+}
+
+.form-header .access-box a {
+ font-size: 12px;
+}
+
+.form-header .access {
+ padding: 3px;
+}
+
+.access .access-type {
+ color: #999;
+ display: inline;
+}
+
+.access .access-info {
+ padding: 2px 0 2px 5px;
+ font-weight: bold;
+ text-align:left;
+ display: inline;
+ color: #0055A5;
+}
+
+.access .access-info a {
+ color: inherit;
+}
+
+.tag {
+ font-size: 10px;
+ display: inline;
+ padding: 2px;
+ margin: 3px;
+ border: 2px solid;
+ border-radius: 5px;
+}
+
+.actionsbar .tag {
+ font-size: 11px;
+ padding: 5px;
+}
+
+.purple {
+ color: #800080;
+ border-color: #800080;
+}
+
+.blue {
+ color: blue;
+ border-color: blue;
+}
+
+.orange {
+ color: #ff6600;
+ border-color: #ff6600;
+}
+
+ul.versions {
+ list-style: none;
+ border: 1px solid #999;
+ margin: 3px 0 5px 0;
+ padding: 0;
+}
+
+ul.versions li {
+ padding: 5px 3px 3px 10px;
+ line-height: 25px;
+ border-bottom: 1px solid #999;
+ color: #333;
+ font-weight: bold;
+}
+
+.versions li .loading {
+ margin-bottom: 5px;
+ margin-left: 10px;
+}
+
+ul.versions li.last {
+ border: none;
+}
+
+ul.versions li.inactive:hover {
+ background-color: #eee;
+}
+
+ul.versions li.inactive .version-actions {
+ display: inline;
+ visibility: hidden;
+}
+
+ul.versions li.inactive:hover .version-actions {
+ visibility: visible;
+}
+
+ul.versions li.active{
+ background-color: #ddd;
+}
+
+ul.versions li.active .version-actions {
+ display: inline;
+ visibility: visible;
+}
+
+ul.versions li a.link {
+ font-size: 11px;
+ color: #008cf7;
+}
+
+.versions .address {
+ font-size: 12px;
+ font-weight: bold;
+ color: #333;
+ display: inline;
+}
+
+.versions .address a {
+ color: #333;
+}
+
+.versions .filename {
+ font-size: 10px;
+ font-weight: normal;
+ color: #999;
+ margin-left: 5px;
+}
+
+ul.versions li a.activate, ul.versions li .status {
+}
+
+ul.versions li .timestamp {
+ float: right;
+ padding: 1px;
+ color: #999;
+}
+
+.newversion {
+ margin: 2px 10px 2px 10px;
+}
+
+#deployform {
+ padding: 15px 10px;
+ color: #999;
+}
+
+.deployoptions {
+ width: 40%;
+}
+
+.deployoptions, .deployactions {
+ float: left;
+}
+
+.deployactions {
+ padding: 10px;
+}
+
+.deployoption {
+ margin-left: 10px;
+ padding: 3px;
+ color: #333;
+}
+
+.deploycontent {
+ margin: 5px;
+}
+
+.visibleblock {
+ display: block;
+}
+
+.invisible {
+ display: none;
+}
+
+.checkoption {
+ padding: 5px 10px 5px 5px;
+ float: left;
+}
+
+.unchecked {
+ font-weight: normal;
+ color: #999;
+}
+
+.hint {
+ color: #999;
+ font-size: 9px;
+ padding: 3px;
+}
+
+#createServiceBtn {
+ margin-top: 5px;
+}
+
+.transient {
+ text-align: center;
+}
+
+.transient h3 {
+}
+
+
+/* two sided layout box */
+.dualbox {
+ display: block;
+}
+
+.dualbox .left {
+ float: left;
+}
+
+.dualbox .right {
+ float: right;
+}
+
+.positive {
+ font-size: 10px;
+ font-style: normal;
+ color: green;
+}
+
+#fileForm, .deployactions .additional {
+ float: left;
+}
+
+.deployactions .additional {
+ padding-left: 10px;
+ padding-top: 5px;
+}
+
+.deployactions .positive {
+}
+
+.settings-form {
+ margin-left: 5px;
+}
+
+.front-section img.stype, .front-section .form {
+ float: left;
+}
+
+.front-section img.stype {
+ margin-left: 20px;
+}
+
+.front-section .form {
+ margin-left: 0px;
+}
+
+
+.form a.link {
+ font-weight: bold;
+ font-size: 12px;
+}
+
+/* instances */
+
+#instances {
+ border: 1px solid #ccc;
+}
+
+#instances .instance {
+ border-bottom: 1px solid #999;
+ padding: 10px 10px 5px 30px;
+ background: url('images/server.png') no-repeat 7px 5px;
+}
+
+#instances .instance .title {
+ font-size: 12px;
+ font-weight: bold;
+ color: #333;
+ font-style: normal;
+ line-height: 20px;
+ padding: 3px 20px 3px 3px;
+}
+
+#instances .instance .timestamp {
+ color: #999;
+}
+
+#instances .instance .address {
+ font-style: normal;
+ color: #aaa;
+}
+
+#instances .cluster {
+ padding: 5px 0 0 0px;
+ margin-bottom: 1px;
+ border-left: 10px solid;
+}
+
+#instances .cluster .instance {
+ border-left: none;
+}
+
+#instances .cluster .cluster-header {
+ padding: 5px 3px 5px 5px;
+}
+
+#instances .cluster-web {
+ border-color: blue;
+}
+
+#instances .cluster-backend {
+ border-color: purple;
+}
+
+#instances .cluster-proxy {
+ border-color: orange;
+}
+
+#instances .cluster .tag {
+ margin-left: 3px;
+}
+
+#instances .instance:hover {
+ background-color: #eee;
+}
+
+/* MapReduce */
+
+#jarform {
+ margin-top: 20px;
+}
+
+#mrapp {
+}
+
+.mrform i {
+ font-weight: bold;
+ color: #999;
+}
+
+.mrform i, .mrform select, .mrform input {
+ margin: 3px;
+}
+
+.mrform .action {
+ padding: 0 5px 0 5px;
+ font-weight: bold;
+ color: #333;
+}
+
+.joblist {
+ border: 1px solid #ccc;
+ margin: 5px 0 20px 0;
+}
+
+.joblist .mrjob {
+ padding: 10px;
+ border-bottom: 1px solid #999;
+}
+
+.mrjob .title {
+ font-weight: bold;
+ font-size: 14px;
+ color: #333;
+}
+
+.mrjob .subtitle {
+ font-size: 10px;
+ color: #999;
+}
+
+.mrjob .jobicon {
+ margin: 0 10px 0 0;
+}
+
+.mrjob .progress {
+ margin-top: 5px;
+ margin-left: 20px;
+}
+
+.mrjob .left {
+ float: left;
+}
+
+.mrjob .right {
+ float: right;
+ text-align: right;
+}
+
+.actionsbar {
+ margin: 10px 3px 10px 0;
+}
+
+.actionstitle {
+ padding: 10px 3px 3px 3px;
+ color: #999;
+}
+
+.actionsbar .loading {
+ margin-left: 10px;
+}
+
+/* login */
+
+body.loginbody {
+ background: url('images/onclouds.jpg') top left no-repeat;
+}
+
+.login {
+ width: 800px;
+ margin: auto;
+ padding-top: 270px;
+ padding-left: 100px;
+}
+
+.login .form .input {
+ padding: 3px 3px 0 5px;
+}
+
+.login a, .login #error {
+ font-weight: normal;
+ font-size: 10px;
+ margin: 3px;
+}
+
+.login #error {
+ color: red;
+ margin-left: 1px;
+}
+
+.login .title {
+ padding-left: 85px;
+}
+
+.login input.active {
+ color: #333;
+}
+
+.login .descr, .login .formwrap {
+ float: left;
+}
+
+.login .form {
+ padding: 20px;
+ background-color: white;
+ border: 1px solid #214478;
+ margin: 0;
+}
+
+.login .formwrap {
+ border-top: 1px solid white;
+ border-right: 1px solid white;
+}
+
+.login .descr {
+ width: 400px;
+ height: 200px;
+}
+
+.login .descr img {
+ margin-top: 10px;
+}
+
+.login .form .name {
+ vertical-align: middle;
+ text-align: right;
+ padding-right: 5px;
+}
+
+.login .form .hint {
+ font-weight: normal;
+}
+
+.box {
+ padding: 10px;
+ border: 1px solid;
+ color: #666;
+ font-size: 12px;
+ font-weight: normal;
+}
+
+.infobox {
+ border-color: #ccc;
+ background-color: #eee;
+}
diff --git a/conpaas/branches/conpaas-dailybuild/frontend/www/create.php b/conpaas/branches/conpaas-dailybuild/frontend/www/create.php
new file mode 100644
index 0000000000000000000000000000000000000000..c09e65da16a146431823aa33e3a7b8c7b3ebd7c4
--- /dev/null
+++ b/conpaas/branches/conpaas-dailybuild/frontend/www/create.php
@@ -0,0 +1,176 @@
+.
+
+require_once('__init__.php');
+require_once('logging.php');
+require_once('Page.php');
+
+function loadBackendConfiguration() {
+ $conf = parse_ini_file(Conf::CONF_DIR.'/main.ini', true);
+ if ($conf === false) {
+ throw new Exception('Could not read configuration file main.ini');
+ }
+ if ($conf['main']['enable_ec2']=="yes") {
+ $conf['main']['default_backend']="ec2";
+ } elseif ($conf['main']['enable_opennebula']=="yes") {
+ $conf['main']['default_backend']="opennebula";
+ } else {
+ $conf['main']['default_backend']="";
+ }
+ return $conf['main'];
+}
+
+$backend_conf = loadBackendConfiguration();
+$ec2conf = "";
+$opennebulaconf = "";
+
+if ($backend_conf['enable_ec2'] != "yes") {
+ $ec2conf = " disabled=\"disabled\"";
+} else if ($backend_conf['default_backend'] == "ec2") {
+ $ec2conf = " selected";
+}
+if ($backend_conf['enable_opennebula'] != "yes") {
+ $opennebulaconf = " disabled=\"disabled\"";
+} else if ($backend_conf['default_backend'] == "opennebula") {
+ $opennebulaconf = " selected";
+}
+
+$page = new Page();
+
+?>
+
+
+
+
+
+
+
+
+
+ renderInstances(); ?>
+
+ add or remove instances to your deployment
+
+
+ 0 proxy
+ 0 web
+ 0
+
+
+
+ No instances are running
+
+
+
+
+
+
+
+
+ Code management
+
+ isRunning()) {
+ echo LinkUI('Access the application',
+ $service->getAccessLocation())
+ ->setExternal(true);
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ Submitted successfully
+
+
+
+ Submitted successfully
+
+ example: .zip, .tar of your source tree
(expanding in the current directory)
or .war for Java servlets +
+
+
+ (expanding in the current directory)
or .war for Java servlets +
+
+
+
+
+
+ example: git checkout git@10.3.45.1:repos/
+
+ available code versions
+
+ renderVersions(); ?>
+
+
+
+
+
+ isStable()): ?>
+
+
+
+
+
+ renderSettings(); ?>
+ Settings
+
+
+ You cannot configure the service in the current state - unreachable.
+ Please contact the system administrator.
+
+
+
++
+
+
+
+
+ Create service
+ +| type of service | ++ + | ++ for now only selectable services available + | +
| software version | ++ + | +|
| cloud provider | ++ |