From 17d95a71c4f34b8e3f0ce0d08051ed4c4b44679b Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 28 Jan 2011 17:19:52 -0800 Subject: [PATCH] move out unusage stuff in oss --- client/tomcatconf/commands-ext.properties.in | 13 -- client/tomcatconf/components-premium.xml.in | 50 ----- client/tomcatconf/components.xml.in | 3 +- server/db/create-database-premium.sql | 13 -- server/db/create-schema-premium.sql | 193 ------------------- 5 files changed, 2 insertions(+), 270 deletions(-) delete mode 100644 client/tomcatconf/commands-ext.properties.in delete mode 100755 client/tomcatconf/components-premium.xml.in delete mode 100644 server/db/create-database-premium.sql delete mode 100644 server/db/create-schema-premium.sql diff --git a/client/tomcatconf/commands-ext.properties.in b/client/tomcatconf/commands-ext.properties.in deleted file mode 100644 index 395bbfc823d..00000000000 --- a/client/tomcatconf/commands-ext.properties.in +++ /dev/null @@ -1,13 +0,0 @@ -#### usage commands -generateUsageRecords=com.cloud.api.commands.GenerateUsageRecordsCmd;1 -listUsageRecords=com.cloud.api.commands.GetUsageRecordsCmd;1 - -#### external firewall commands -addExternalFirewall=com.cloud.api.commands.AddExternalFirewallCmd;1 -deleteExternalFirewall=com.cloud.api.commands.DeleteExternalFirewallCmd;1 -listExternalFirewalls=com.cloud.api.commands.ListExternalFirewallsCmd;1 - -#### external loadbalancer commands -addExternalLoadBalancer=com.cloud.api.commands.AddExternalLoadBalancerCmd;1 -deleteExternalLoadBalancer=com.cloud.api.commands.DeleteExternalLoadBalancerCmd;1 -listExternalLoadBalancers=com.cloud.api.commands.ListExternalLoadBalancersCmd;1 diff --git a/client/tomcatconf/components-premium.xml.in b/client/tomcatconf/components-premium.xml.in deleted file mode 100755 index 57bfbd41ef7..00000000000 --- a/client/tomcatconf/components-premium.xml.in +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in index ced81d2dd8a..437e6d74fef 100755 --- a/client/tomcatconf/components.xml.in +++ b/client/tomcatconf/components.xml.in @@ -41,7 +41,8 @@ - + + diff --git a/server/db/create-database-premium.sql b/server/db/create-database-premium.sql deleted file mode 100644 index 5ce3413d96e..00000000000 --- a/server/db/create-database-premium.sql +++ /dev/null @@ -1,13 +0,0 @@ -SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ANSI'; - -DROP DATABASE IF EXISTS `cloud_usage`; - -CREATE DATABASE `cloud_usage`; - -GRANT ALL ON cloud_usage.* to cloud@`localhost`; -GRANT ALL ON cloud_usage.* to cloud@`%`; - -GRANT process ON *.* TO cloud@`localhost`; -GRANT process ON *.* TO cloud@`%`; - -commit; diff --git a/server/db/create-schema-premium.sql b/server/db/create-schema-premium.sql deleted file mode 100644 index 5bfc6eaf47d..00000000000 --- a/server/db/create-schema-premium.sql +++ /dev/null @@ -1,193 +0,0 @@ -SET foreign_key_checks = 0; -DROP TABLE IF EXISTS `cloud_usage`.`event`; -DROP TABLE IF EXISTS `cloud_usage`.`cloud_usage`; -DROP TABLE IF EXISTS `cloud_usage`.`usage_vm_instance`; -DROP TABLE IF EXISTS `cloud_usage`.`usage_ip_address`; -DROP TABLE IF EXISTS `cloud_usage`.`usage_network`; -DROP TABLE IF EXISTS `cloud_usage`.`usage_job`; -DROP TABLE IF EXISTS `cloud_usage`.`account`; -DROP TABLE IF EXISTS `cloud_usage`.`user_statistics`; -DROP TABLE IF EXISTS `cloud_usage`.`usage_volume`; -DROP TABLE IF EXISTS `cloud_usage`.`usage_storage`; -DROP TABLE IF EXISTS `cloud_usage`.`usage_security_group`; -DROP TABLE IF EXISTS `cloud_usage`.`usage_load_balancer_policy`; -DROP TABLE IF EXISTS `cloud_usage`.`usage_port_forwarding`; -DROP TABLE IF EXISTS `cloud_usage`.`usage_event`; - -CREATE TABLE `cloud_usage`.`event` ( - `id` bigint unsigned NOT NULL auto_increment, - `type` varchar(32) NOT NULL, - `description` varchar(1024) NOT NULL, - `user_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `created` datetime NOT NULL, - `level` varchar(16) NOT NULL, - `parameters` varchar(1024) NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud_usage`.`cloud_usage` ( - `id` bigint unsigned NOT NULL auto_increment, - `zone_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `domain_id` bigint unsigned NOT NULL, - `description` varchar(1024) NOT NULL, - `usage_display` varchar(255) NOT NULL, - `usage_type` int(1) unsigned, - `raw_usage` DOUBLE UNSIGNED NOT NULL, - `vm_instance_id` bigint unsigned, - `vm_name` varchar(255), - `offering_id` bigint unsigned, - `template_id` bigint unsigned, - `usage_id` bigint unsigned, - `size` bigint unsigned, - `start_date` DATETIME NOT NULL, - `end_date` DATETIME NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud_usage`.`usage_vm_instance` ( - `usage_type` int(1) unsigned, - `zone_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `vm_instance_id` bigint unsigned NOT NULL, - `vm_name` varchar(255) NOT NULL, - `service_offering_id` bigint unsigned NOT NULL, - `template_id` bigint unsigned NOT NULL, - `start_date` DATETIME NOT NULL, - `end_date` DATETIME NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud_usage`.`usage_network` ( - `account_id` bigint unsigned NOT NULL, - `zone_id` bigint unsigned NOT NULL, - `host_id` bigint unsigned NOT NULL, - `bytes_sent` bigint unsigned NOT NULL default '0', - `bytes_received` bigint unsigned NOT NULL default '0', - `net_bytes_received` bigint unsigned NOT NULL default '0', - `net_bytes_sent` bigint unsigned NOT NULL default '0', - `current_bytes_received` bigint unsigned NOT NULL default '0', - `current_bytes_sent` bigint unsigned NOT NULL default '0', - `event_time_millis` bigint unsigned NOT NULL default '0', - PRIMARY KEY (`account_id`, `zone_id`, `host_id`, `event_time_millis`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud_usage`.`usage_ip_address` ( - `account_id` bigint unsigned NOT NULL, - `domain_id` bigint unsigned NOT NULL, - `zone_id` bigint unsigned NOT NULL, - `public_ip_address` varchar(15) NOT NULL, - `is_source_nat` smallint(1) NOT NULL, - `assigned` DATETIME NOT NULL, - `released` DATETIME NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud_usage`.`usage_job` ( - `id` bigint unsigned NOT NULL auto_increment, - `host` varchar(255), - `pid` int(5), - `job_type` int(1), - `scheduled` int(1), - `start_millis` bigint unsigned NOT NULL default '0' COMMENT 'start time in milliseconds of the aggregation range used by this job', - `end_millis` bigint unsigned NOT NULL default '0' COMMENT 'end time in milliseconds of the aggregation range used by this job', - `exec_time` bigint unsigned NOT NULL default '0' COMMENT 'how long in milliseconds it took for the job to execute', - `start_date` DATETIME COMMENT 'start date of the aggregation range used by this job', - `end_date` DATETIME COMMENT 'end date of the aggregation range used by this job', - `success` int(1), - `heartbeat` DATETIME NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud_usage`.`account` ( - `id` bigint unsigned NOT NULL, - `account_name` varchar(100) COMMENT 'an account name set by the creator of the account, defaults to username for single accounts', - `type` int(1) unsigned NOT NULL, - `domain_id` bigint unsigned, - `state` varchar(10) NOT NULL default 'enabled', - `removed` datetime COMMENT 'date removed', - `cleanup_needed` tinyint(1) NOT NULL default '0', - `network_domain` varchar(100) COMMENT 'Network domain name of the Vms of the account', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud_usage`.`user_statistics` ( - `id` bigint unsigned UNIQUE NOT NULL, - `data_center_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `public_ip_address` varchar(15), - `host_id` bigint unsigned, - `net_bytes_received` bigint unsigned NOT NULL default '0', - `net_bytes_sent` bigint unsigned NOT NULL default '0', - `current_bytes_received` bigint unsigned NOT NULL default '0', - `current_bytes_sent` bigint unsigned NOT NULL default '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud_usage`.`usage_volume` ( - `id` bigint unsigned NOT NULL, - `zone_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `domain_id` bigint unsigned NOT NULL, - `disk_offering_id` bigint unsigned, - `template_id` bigint unsigned, - `size` bigint unsigned, - `created` DATETIME NOT NULL, - `deleted` DATETIME NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud_usage`.`usage_storage` ( - `id` bigint unsigned NOT NULL, - `zone_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `domain_id` bigint unsigned NOT NULL, - `storage_type` int(1) unsigned NOT NULL, - `size` bigint unsigned NOT NULL, - `created` DATETIME NOT NULL, - `deleted` DATETIME NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud_usage`.`usage_security_group` ( - `id` bigint unsigned NOT NULL, - `zone_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `domain_id` bigint unsigned NOT NULL, - `vm_id` bigint unsigned NOT NULL, - `num_rules` bigint unsigned NOT NULL, - `created` DATETIME NOT NULL, - `deleted` DATETIME NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud_usage`.`usage_load_balancer_policy` ( - `id` bigint unsigned NOT NULL, - `zone_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `domain_id` bigint unsigned NOT NULL, - `created` DATETIME NOT NULL, - `deleted` DATETIME NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud_usage`.`usage_event` ( - `id` bigint unsigned NOT NULL auto_increment, - `type` varchar(32) NOT NULL, - `account_id` bigint unsigned NOT NULL, - `created` datetime NOT NULL, - `zone_id` bigint unsigned NOT NULL, - `resource_id` bigint unsigned, - `resource_name` varchar(255), - `offering_id` bigint unsigned, - `template_id` bigint unsigned, - `size` bigint unsigned, - `processed` tinyint NOT NULL default '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE `cloud_usage`.`usage_port_forwarding` ( - `id` bigint unsigned NOT NULL, - `zone_id` bigint unsigned NOT NULL, - `account_id` bigint unsigned NOT NULL, - `domain_id` bigint unsigned NOT NULL, - `created` DATETIME NOT NULL, - `deleted` DATETIME NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - -SET foreign_key_checks = 1;