Skip to content
Snippets Groups Projects
Commit b3cd2ad0 authored by Yas Naoi's avatar Yas Naoi
Browse files

Release ver.6.x-1.x-dev

parent da2a0725
No related branches found
No related tags found
No related merge requests found
Showing
with 126 additions and 49 deletions
Clanavi ver.2.0 2011/xx/xx
Clanavi ver.1.1 2011/07/02
==========================
CHANGE HISTORY
==============
2011/07/02 6.x-1.1 (ver.1.1 Release)
- Addition / Improvements
* Added 'All' tab for listing all templates in
server template module.
- Bug Fixes
* Fixing to prevent database concurrency collision
by adding cron semaphore check to the Refresh page
links.
2011/06/29 6.x-1.x-dev (ver.1.1 RC2)
- Bug Fixes
* Fixed a bug of SSH Key injection
2011/06/25 6.x-1.x-dev (ver.1.1 RC1)
- Addition / Improvements
* Improved SSH Key injection to Java Applet console
* Improved 'soft delete' handling for items in database.
2011/06/23 6.x-1.x-dev (ver.1.1 Beta)
- Addition / Improvements
* Supported AWS multi-region
2011/06/13 ver.1.01 released
2011/06/13 6.x-1.01 (ver.1.01 Release)
- Addition / Improvements
* Included IaaS modules
2011/06/10 ver.1.0 released
2011/06/10 6.x-1.0 (ver.1.0 Release)
- Addition / Improvements
* Changed the directory structure of IaaS modules
......@@ -51,4 +73,12 @@ CHANGE HISTORY
- Addition / Improvements
* Added Cluster, Scripting, Alerts, Inputs modules
2010/11/09 ver.0.7 released to reviewing process of drupal.org
\ No newline at end of file
2010/11/09 ver.0.7 released to reviewing process of drupal.org
Copyright
=========
Copyright (c) 2010-2011 DOCOMO Communications Laboratories USA, Inc.
End of CHANGELOG.txt
\ No newline at end of file
......@@ -3,8 +3,7 @@ BASIC INFO
- Provides common functionalites for cloud management.
- Cloud module is a heart of cloud package. This requires at least one
"cloud support module" such as Amazon EC2 module, OpenStack XCP or
and so on.
"cloud support module" such as AWS module, XCP and so on.
- Once you install the 'Cloud' module be sure to grant the 'access dashboard' permission.
Users with above permission can view all the running instances for the enabled sub-clouds.
- Be sure to only grant 'administer cloud' permission to the cloud administrator.
......@@ -18,12 +17,11 @@ e.g. (For an administrator)
- Turn on
'access dashboard' permission only
* Please see also cloud/modules/iaas/modules/aws_cloud/README.txt for AWS compatible cloud.
* After ver.1.1, the database schema has changed. If you already install
Clanavi 1.01 or less (before 06/10/2011), please uninstall and install modules.
* Please see also cloud/modules/iaas/modules/aws_cloud/README.txt for AWS compatible cloud.
SYSTEM REQUIREMENTS
===================
......@@ -39,14 +37,16 @@ DIRECTORY STRUCTURE
===================
cloud
+-modules (depends on Cloud module)(Cloud is a core module for Cloud package)
+-modules (depends on Cloud module) (Cloud is a core module for Cloud package)
+-cloud_activity_audit
+-cloud_alerts
x-cloud_auto_scaling
+-cloud_billing
+-cloud_cluster
x-cloud_dashboard
x-cloud_failover
+-cloud_inputs
x-cloud_metering
+-cloud_pricing
+-cloud_resource_allocator
x-cloud_scaling_manager
......@@ -59,12 +59,10 @@ cloud
hook_* FOR SUBSIDIARY MODULES
=============================
- hook_cloud_set_info()
- hook_server_template()
- hook_get_all_instances()
* See also cloud/cloud.api.php
* Example for Sub Cloud Family
e.g. Amazon EC2, XCP, OpenStack nova and so on...
e.g. Amazon EC2, XCP and so on...
function hook_cloud_set_info() {
return array(
......@@ -84,6 +82,7 @@ function hook_server_template($op, $params = array())
CHANGE HISTORY
==============
2011/07/02 ver.1.1 released 6.x-1.1
2011/06/13 ver.1.01 released 6.x-1.01
2011/06/10 ver.1.0 released 6.x-1.0
2011/06/02 ver.0.92 released 6.x-1.x-dev
......
......@@ -2045,3 +2045,18 @@ function cloud_is_settings_done($cloud_context) {
return $is_cloud_enabled ;
}
/**
* Helper function that reads the cron semaphore.
* If it is set, that means cron is running and is
* updating the sub cloud tables.
*/
function _cloud_is_update_allowed() {
$semaphore = variable_get('cron_semaphore', FALSE);
$allowed = TRUE;
if ($semaphore) {
drupal_set_message(t("Cron is performing the cloud data refresh. Please wait and try again."));
$allowed = FALSE;
}
return $allowed;
}
......@@ -153,8 +153,10 @@ function cloud_notify($op, $module) {
* @return return a sub-cloud data and redirect to cloud dashboard page
*/
function _cloud_fetch_data() {
cloud_update_all_cloud_data() ;
if (_cloud_is_update_allowed()) {
cloud_update_all_cloud_data() ;
}
// Return to the Common Clouds Page
drupal_goto( 'clouds' ) ;
}
......@@ -162,7 +164,7 @@ function _cloud_fetch_data() {
function cloud_update_all_cloud_data() {
set_time_limit(CLOUD_TIME_LIMI) ;
set_time_limit(CLOUD_TIME_LIMIT) ;
$cloud_list = cloud_get_all_clouds();
$cloud_display_list = cloud_get_all_clouds_display_name() ;
......
......@@ -14,6 +14,7 @@
* Provides common functionalites for cloud management.
*/
set_time_limit(5000);
//project name as a prefix to all project specific tables
......@@ -49,5 +50,5 @@ define('CLOUD_INSTANCE_STATUS_OPERATIONAL' , 'operational' ) ;
*/
define('CLOUD_VALID_DIGIT', '/^[0-9]+$/');
define('CLOUD_TIME_LIMI', 1000);
define('CLOUD_TIME_LIMIT', 1000);
......@@ -83,7 +83,7 @@ function cloud_get_all_scripts($type) {
while ($script = db_fetch_object($result)) {
$script_options[$script->id] = $script->name ;
$script_options[$script->script_id] = $script->name ;
}
//asort($script_options);
return $script_options ;
......
......@@ -19,14 +19,16 @@ DIRECTORY STRUCTURE
===================
cloud
+-modules (depends on Cloud module)(Cloud is a core module for Cloud package)
o-cloud_activity_audit (This module)
+-modules (depends on Cloud module) (Cloud is a core module for Cloud package)
o-cloud_activity_audit
+-cloud_alerts
x-cloud_auto_scaling
+-cloud_billing
+-cloud_cluster
x-cloud_dashboard
x-cloud_failover
+-cloud_inputs
x-cloud_metering
+-cloud_pricing
+-cloud_resource_allocator
x-cloud_scaling_manager
......@@ -38,6 +40,7 @@ cloud
CHANGE HISTORY
==============
2011/07/02 ver.1.1 released 6.x-1.1
2011/06/13 ver.1.01 released 6.x-1.01
2011/06/10 ver.1.0 released 6.x-1.0
2011/06/02 ver.0.92 released 6.x-1.x-dev
......
......@@ -26,14 +26,16 @@ DIRECTORY STRUCTURE
===================
cloud
+-modules (depends on Cloud module)(Cloud is a core module for Cloud package)
+-modules (depends on Cloud module) (Cloud is a core module for Cloud package)
+-cloud_activity_audit
o-cloud_alerts (This module)
o-cloud_alerts
x-cloud_auto_scaling
+-cloud_billing
+-cloud_cluster
x-cloud_dashboard
x-cloud_failover
+-cloud_inputs
x-cloud_metering
+-cloud_pricing
+-cloud_resource_allocator
x-cloud_scaling_manager
......@@ -45,6 +47,7 @@ cloud
CHANGE HISTORY
==============
2011/07/02 ver.1.1 released 6.x-1.1
2011/06/13 ver.1.01 released 6.x-1.01
2011/06/10 ver.1.0 released 6.x-1.0
2011/06/02 ver.0.92 released 6.x-1.x-dev
......
......@@ -121,11 +121,11 @@ function cloud_alerts_list($form_submit) {
$destination = drupal_get_destination();
while ($alert_obj = db_fetch_object($result)) {
$form['Name' ][$alert_obj->id] = array(
array('#value' => l( $alert_obj->name , CLOUD_ALERTS_PATH . '/' . $alert_obj->id . '/view' , array('query' => 'id=' . ($alert_obj->id)) ) )
$form['Name' ][$alert_obj->alert_id] = array(
array('#value' => l( $alert_obj->name , CLOUD_ALERTS_PATH . '/' . $alert_obj->alert_id . '/view' , array('query' => 'id=' . ($alert_obj->alert_id)) ) )
);
$form['Trigger'][$alert_obj->id] = array(
$form['Trigger'][$alert_obj->alert_id] = array(
array('#value' => t('@metric.@variable @condition @threshold', array(
'@metric' => $alert_obj->metric ,
'@variable' => $alert_obj->variable ,
......@@ -133,11 +133,11 @@ function cloud_alerts_list($form_submit) {
'@threshold' => $alert_obj->threshold ,
))));
$form['hdnName' ][$alert_obj->id] = array( '#type' => 'hidden' , '#value' => addslashes($alert_obj->name) );
$form['Description' ][$alert_obj->id] = array( array('#value' => check_plain( $alert_obj->description ) ) ) ;
$form['Created' ][$alert_obj->id] = array( array('#value' => format_date(strtotime($alert_obj->created), 'small') ) ) ;
$form['Updated' ][$alert_obj->id] = array( array('#value' => format_date(strtotime($alert_obj->updated), 'small') ) ) ;
$form['duration_in_minutes'][$alert_obj->id] = array( array('#value' => t( $alert_obj->duration_in_minutes ) ) ) ;
$form['hdnName' ][$alert_obj->alert_id] = array( '#type' => 'hidden' , '#value' => addslashes($alert_obj->name) );
$form['Description' ][$alert_obj->alert_id] = array( array('#value' => check_plain( $alert_obj->description ) ) ) ;
$form['Created' ][$alert_obj->alert_id] = array( array('#value' => format_date(strtotime($alert_obj->created), 'small') ) ) ;
$form['Updated' ][$alert_obj->alert_id] = array( array('#value' => format_date(strtotime($alert_obj->updated), 'small') ) ) ;
$form['duration_in_minutes'][$alert_obj->alert_id] = array( array('#value' => t( $alert_obj->duration_in_minutes ) ) ) ;
}
$form['pager' ] = array('#value' => theme('pager', NULL, CLOUD_ALERTS_PAGER_LIMIT, 0));
......@@ -420,7 +420,7 @@ function cloud_alerts_new($form_submit='', $alert_id='') {
$query = _cloud_alerts_get() ;
$query_args = array(
'id' ,
'alert_id' ,
$alert_id,
);
$result = db_query( $query, $query_args );
......
......@@ -40,7 +40,7 @@ function cloud_alerts_schema() {
$schema[CLOUD_ALERTS_TABLE] = array(
'description' => t('Alerts Configuration'),
'fields' => array(
'id' => array('type' => 'serial' , 'length' => 11),
'alert_id' => array('type' => 'serial' , 'length' => 11),
'name' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '', 'description' => ''),
'description' => array('type' => 'text' , 'not null' => FALSE, 'default' => '', 'description' => ''),
'metric' => array('type' => 'varchar', 'length' => 255, 'not null' => FALSE, 'default' => '', 'description' => ''),
......@@ -53,10 +53,16 @@ function cloud_alerts_schema() {
'created' => array('type' => 'datetime' , 'not null' => FALSE, 'description' => ''),
'updated' => array('type' => 'datetime' , 'not null' => FALSE, 'description' => ''),
),
'primary key' => array('id'),
'primary key' => array('alert_id'),
);
///To add more schema just add one more $schema['newtable'] array .
return $schema;
}
function cloud_alerts_update_6001() {
$ret = array();
db_change_field($ret, CLOUD_ALERTS_TABLE, 'id', 'alert_id', array('type' => 'serial' , 'length' => 11));
return $ret;
}
......@@ -38,7 +38,7 @@ function _cloud_alerts_delete($id) {
//// add watchdog log
$query = _cloud_alerts_get() ;
$query_args = array(
'id' ,
'alert_id' ,
$id ,
);
$result = db_query( $query, $query_args );
......@@ -54,7 +54,7 @@ function _cloud_alerts_delete($id) {
);
$delete_query = 'delete from {' . CLOUD_ALERTS_TABLE . '}
where id=\'%s\'
where alert_id=\'%s\'
';
$query_args = array(
$id,
......@@ -142,7 +142,7 @@ function _cloud_alerts_update($form_values, $alert_id='') {
`duration_in_minutes`=\'%s\',
`escalate`=\'%s\' ,
`updated`=\'%s\'
where id=\'%s\'
where alert_id=\'%s\'
';
$query_args[] = $form_values['name_text' ] ;
......@@ -182,7 +182,7 @@ function _cloud_alerts_get_all() {
$alert_options = array();
while ($alert = db_fetch_object($result)) {
$alert_options[$alert->id] = $alert->name ;
$alert_options[$alert->alert_id] = $alert->name ;
}
//asort($alert_options);
......
......@@ -23,14 +23,16 @@ DIRECTORY STRUCTURE
===================
cloud
+-modules (depends on Cloud module)(Cloud is a core module for Cloud package)
+-modules (depends on Cloud module) (Cloud is a core module for Cloud package)
+-cloud_activity_audit
+-cloud_alerts
x-cloud_auto_scaling
o-cloud_billing (This module)
o-cloud_billing
+-cloud_cluster
x-cloud_dashboard
x-cloud_failover
+-cloud_inputs
x-cloud_metering
+-cloud_pricing
+-cloud_resource_allocator
x-cloud_scaling_manager
......@@ -42,6 +44,7 @@ cloud
CHANGE HISTORY
==============
2011/07/02 ver.1.1 released 6.x-1.1
2011/06/13 ver.1.01 released 6.x-1.01
2011/06/10 ver.1.0 released 6.x-1.0
2011/06/02 ver.0.92 released 6.x-1.x-dev
......
......@@ -23,14 +23,16 @@ DIRECTORY STRUCTURE
===================
cloud
+-modules (depends on Cloud module)(Cloud is a core module for Cloud package)
+-modules (depends on Cloud module) (Cloud is a core module for Cloud package)
+-cloud_activity_audit
+-cloud_alerts
x-cloud_auto_scaling
+-cloud_billing
o-cloud_cluster (This module)
o-cloud_cluster
x-cloud_dashboard
x-cloud_failover
+-cloud_inputs
x-cloud_metering
+-cloud_pricing
+-cloud_resource_allocator
x-cloud_scaling_manager
......@@ -42,6 +44,7 @@ cloud
CHANGE HISTORY
==============
2011/07/02 ver.1.1 released 6.x-1.1
2011/06/13 ver.1.01 released 6.x-1.01
2011/06/10 ver.1.0 released 6.x-1.0
2011/06/02 ver.0.92 released 6.x-1.x-dev
......
......@@ -28,6 +28,7 @@ cloud
CHANGE HISTORY
==============
2011/07/02 ver.1.1 released 6.x-1.1
2011/06/13 ver.1.01 released 6.x-1.01
2011/06/10 ver.1.0 released 6.x-1.0
2011/06/02 ver.0.92 released 6.x-1.x-dev
......
......@@ -20,15 +20,17 @@ DIRECTORY STRUCTURE
===================
cloud
+-modules (depends on Cloud module)(Cloud is a core module for Cloud package)
+-modules (depends on Cloud module) (Cloud is a core module for Cloud package)
+-cloud_activity_audit
+-cloud_alerts
o-cloud_auto_scaling
x-cloud_auto_scaling
+-cloud_billing
+-cloud_cluster
x-cloud_dashboard
x-cloud_failover
+-cloud_inputs
o-cloud_pricing (This module)
x-cloud_metering
o-cloud_pricing
+-cloud_resource_allocator
x-cloud_scaling_manager
+-cloud_scripting
......@@ -39,6 +41,7 @@ cloud
CHANGE HISTORY
==============
2011/07/02 ver.1.1 released 6.x-1.1
2011/06/13 ver.1.01 released 6.x-1.01
2011/06/10 ver.1.0 released 6.x-1.0
2011/06/02 ver.0.92 released 6.x-1.x-dev
......
......@@ -41,16 +41,17 @@ How to implement an algorithm for instance allocation
DIRECTORY STRUCTURE
===================
cloud
+-modules (depends on Cloud module)(Cloud is a core module for Cloud package)
+-modules (depends on Cloud module) (Cloud is a core module for Cloud package)
+-cloud_activity_audit
+-cloud_alerts
x-cloud_auto_scaling
+-cloud_billing
+-cloud_cluster
x-cloud_dashboard
x-cloud_failover
+-cloud_inputs
x-cloud_metering
+-cloud_pricing
o-cloud_resource_manager (This module)
+-allocation_algo ( depends on resource_manager module )
......@@ -59,13 +60,16 @@ cloud
+-...
x-cloud_scaling_manager
+-cloud_scripting
o-cloud_server_templates (This module)
+-cloud_server_templates
x... Not released yet.
x... Not released yet.
CHANGE HISTORY
==============
2011/07/02 ver.1.1 released 6.x-1.1
2011/06/13 ver.1.01 released 6.x-1.01
2011/06/10 ver.1.0 released 6.x-1.0
2011/06/02 ver.0.92 released 6.x-1.x-dev
......
......@@ -16,6 +16,7 @@ cloud
CHANGE HISTORY
==============
2011/07/02 ver.1.1 released 6.x-1.1
2011/06/13 ver.1.01 released 6.x-1.01
2011/06/10 ver.1.0 released 6.x-1.0
2011/06/02 ver.0.92 released 6.x-1.x-dev
......
......@@ -2,3 +2,4 @@ name = Round Robin Algorithm
description = Round Robin Algorithm for Instance Allocation (Provisioning)
package = Cloud
dependencies[] = cloud_resource_allocator
core = 6.x
\ No newline at end of file
......@@ -16,6 +16,7 @@ cloud
CHANGE HISTORY
==============
2011/07/02 ver.1.1 released 6.x-1.1
2011/06/13 ver.1.01 released 6.x-1.01
2011/06/10 ver.1.0 released 6.x-1.0
2011/06/02 ver.0.92 released 6.x-1.x-dev
......
......@@ -2,3 +2,4 @@ name = Allocation Algorithm
description = Allocation Algorithm for Instance Allocation (Provisioning)
package = Cloud
dependencies[] = cloud_resource_allocator
core = 6.x
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment