Various updates.

config/local.php.dist

@@ -41,11 +41,17 @@ return array(
 
 	// For now, XCP servers/pool masters must be defined in this file.
 	'xcp' => array(
-		//'pool 1' => array(
-		//	'url'      => 'https://xcp1.example.net',
-		//	'username' => 'username',
-		//	'password' => 'password'
-		//),
+
+		/*
+		 * You MUST configure the following entries to connect XO-Server to your
+		 * XCP pool.
+		 */
+		// array(
+		// 	'url'      => 'https://xcp1.example.net',
+		// 	'username' => 'username',
+		// 	'password' => 'password'
+		// ),
+
 	),
 );
 

lib/Application.php

@@ -456,8 +456,9 @@ final class Application extends Base
 		$mgr_vms     = $this->_di->get('vms');
 		$mgr_metrics = $this->_di->get('vms_metrics');
 
-		$memory = 0;
-		$vcpus  = 0;
+		$memory  = 0;
+		$n_vcpus = 0;
+		$n_vifs  = 0;
 
 		$running_vms = $mgr_vms->get(array(
 			'power_state'       => 'Running',
@@ -468,7 +469,8 @@ final class Application extends Base
 			$metrics = $mgr_metrics->first($vm->metrics);
 
 			$memory += $metrics->memory_actual;
-			$vcpus  += $metrics->VCPUs_number;
+			$n_vcpus  += $metrics->VCPUs_number;
+			$n_vifs   += count($vm->VIFs);
 		}
 
 		// @todo Replace with inequality filter when Rekodi implements it.
@@ -502,7 +504,8 @@ final class Application extends Base
 			)),
 			'running_vms' => count($running_vms),
 			'memory'      => $memory,
-			'vcpus'       => $vcpus,
+			'vcpus'       => $n_vcpus,
+			'vifs'        => $n_vifs,
 			'srs'         => $n_srs,
 		);
 
@@ -577,6 +580,10 @@ final class Application extends Base
 			echo "Event: $class ($ref)\n";
 		}
 
+		isset($objects['message'])
+			and $this->_di->get('messages')->batchImport($objects['message']);
+		isset($objects['pool'])
+			and $this->_di->get('pools')->batchImport($objects['pool']);
 		isset($objects['sr'])
 			and $this->_di->get('srs')->batchImport($objects['sr']);
 		isset($objects['vif'])
@@ -613,6 +620,8 @@ final class Application extends Base
 
 		// map(XCP class: manager)
 		$classes = array(
+			'message'          => 'messages',
+			'pool'             => 'pools',
 			'SR'               => 'srs',
 			'VIF'              => 'vifs',
 			'VM'               => 'vms',

lib/Bean/Message.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * This file is a part of Xen Orchestra Server.
+ *
+ * Xen Orchestra Server 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.
+ *
+ * Xen Orchestra Server 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 Xen Orchestra Server. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * @author Julien Fontanet <julien.fontanet@vates.fr>
+ * @license http://www.gnu.org/licenses/gpl-3.0-standalone.html GPLv3
+ *
+ * @package Xen Orchestra Server
+ */
+
+namespace Bean;
+
+/**
+ *
+ */
+final class Message extends BeanAbstract
+{
+	protected static $_fields;
+}
+Message::init(array(
+	'id',
+	'uuid',
+
+	'timestamp',
+	'name',
+	'message',
+	'priority',
+
+	'cls', // Not class like in Event !!!
+	'obj_uuid',
+));

lib/Bean/Pool.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * This file is a part of Xen Orchestra Server.
+ *
+ * Xen Orchestra Server 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.
+ *
+ * Xen Orchestra Server 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 Xen Orchestra Server. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * @author Julien Fontanet <julien.fontanet@vates.fr>
+ * @license http://www.gnu.org/licenses/gpl-3.0-standalone.html GPLv3
+ *
+ * @package Xen Orchestra Server
+ */
+
+namespace Bean;
+
+/**
+ *
+ */
+final class Pool extends BeanAbstract
+{
+	protected static $_fields;
+}
+Pool::init(array(
+	'id',
+	'uuid',
+
+	'blobs' => true,
+	'crash_dump_SR',
+	'default_SR',
+	'gui_config' => true,
+	'ha_allow_overcommit',
+	'ha_configuration' => true,
+	'ha_enabled',
+	'ha_host_failures_to_tolerate',
+	'ha_overcommitted',
+	'ha_plan_exists_for',
+	'ha_statefiles' => true,
+	'master',
+	'metadata_VDIs' => true,
+	'name_description',
+	'name_label',
+	'other_config' => true,
+	'redo_log_enabled',
+	'redo_log_vdi',
+	'restrictions' => true,
+	'suspend_image_SR',
+	'tags' => true,
+	'uuid',
+	'vswitch_controller',
+	'wlb_enabled',
+	'wlb_url',
+	'wlb_username',
+	'wlb_verify_cert',
+));

lib/Bean/SR.php

@@ -33,6 +33,7 @@ final class SR extends BeanAbstract
 }
 SR::init(array(
 	'id',
+	'uuid',
 
 	'physical_size',
 ));

lib/Bean/VIF.php

@@ -33,4 +33,5 @@ final class VIF extends BeanAbstract
 }
 VIF::init(array(
 	'id',
+	'uuid',
 ));

lib/Bean/VM.php

@@ -34,6 +34,7 @@ final class VM extends BeanAbstract
 VM::init(array(
 	// Identifiers.
 	'id',
+	'uuid',
 	'name_label',
 	'resident_on', // The host this VM is currently resident on.
 	'domarch', // Domain architecture if available, null otherwise.

lib/Bean/VMGuestMetrics.php

@@ -33,6 +33,7 @@ final class VMGuestMetrics extends BeanAbstract
 }
 VMGuestMetrics::init(array(
 	'id',
+	'uuid',
 
 	'memory' => true,
 	'networks' => true,

lib/Bean/VMMetrics.php

@@ -33,6 +33,7 @@ final class VMMetrics extends BeanAbstract
 }
 VMMetrics::init(array(
 	'id',
+	'uuid',
 
 	'memory_actual',
 	'VCPUs_number',

lib/DI.php

@@ -91,6 +91,16 @@ final class DI extends Base
 	{
 		$database = new \Rekodi\Manager\Memory;
 
+		$database->createTable('messages', function ($table) {
+			$table
+				->string('id')->unique()
+			;
+		});
+		$database->createTable('pools', function ($table) {
+			$table
+				->string('id')->unique()
+			;
+		});
 		$database->createTable('srs', function ($table) {
 			$table
 				->string('id')->unique()
@@ -165,6 +175,15 @@ final class DI extends Base
 	//--------------------------------------
 	// Managers
 
+	private function _init_messages()
+	{
+		return new \Manager\Messages($this->get('database.cache'));
+	}
+	private function _init_pools()
+	{
+		return new \Manager\Pools($this->get('database.cache'));
+	}
+
 	private function _init_srs()
 	{
 		return new \Manager\SRs($this->get('database.cache'));

lib/Manager/Messages.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * This file is a part of Xen Orchestra Server.
+ *
+ * Xen Orchestra Server 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.
+ *
+ * Xen Orchestra Server 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 Xen Orchestra Server. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * @author Julien Fontanet <julien.fontanet@vates.fr>
+ * @license http://www.gnu.org/licenses/gpl-3.0-standalone.html GPLv3
+ *
+ * @package Xen Orchestra Server
+ */
+
+namespace Manager;
+
+/**
+ *
+ */
+final class Messages extends XCPAbstract
+{
+	/**
+	 *
+	 */
+	function __construct(\Rekodi\Manager $manager)
+	{
+		parent::__construct($manager, 'messages', '\Bean\Message');
+	}
+}

lib/Manager/Pools.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * This file is a part of Xen Orchestra Server.
+ *
+ * Xen Orchestra Server 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.
+ *
+ * Xen Orchestra Server 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 Xen Orchestra Server. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * @author Julien Fontanet <julien.fontanet@vates.fr>
+ * @license http://www.gnu.org/licenses/gpl-3.0-standalone.html GPLv3
+ *
+ * @package Xen Orchestra Server
+ */
+
+namespace Manager;
+
+/**
+ *
+ */
+final class Pools extends XCPAbstract
+{
+	/**
+	 *
+	 */
+	function __construct(\Rekodi\Manager $manager)
+	{
+		parent::__construct($manager, 'pools', '\Bean\Pool');
+	}
+}

lib/Manager/VIFs.php

@@ -34,6 +34,6 @@ final class VIFs extends XCPAbstract
 	 */
 	function __construct(\Rekodi\Manager $manager)
 	{
-		parent::__construct($manager, 'vifs', '\Bean\VIFs');
+		parent::__construct($manager, 'vifs', '\Bean\VIF');
 	}
 }