missing files

server/src/com/cloud/upgrade/dao/DbUpgrade.java

@@ -0,0 +1,30 @@
+/**
+ *  Copyright (C) 2010 Cloud.com, Inc.  All rights reserved.
+ * 
+ * This software is licensed under the GNU General Public License v3 or later.
+ * 
+ * It 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 any later version.
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+package com.cloud.upgrade.dao;
+
+public interface DbUpgrade {
+    String[] getUpgradableVersionRange();
+    
+    String getUpgradedVersion();
+    
+    boolean supportsRollingUpgrade();
+
+    void prepare();
+    void upgrade();
+    void cleanup();
+}

server/src/com/cloud/upgrade/dao/Upgrade217to22.java

@@ -0,0 +1,77 @@
+/**
+ *  Copyright (C) 2010 Cloud.com, Inc.  All rights reserved.
+ * 
+ * This software is licensed under the GNU General Public License v3 or later.
+ * 
+ * It 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 any later version.
+ * This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+package com.cloud.upgrade.dao;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import com.cloud.utils.PropertiesUtil;
+import com.cloud.utils.db.ScriptRunner;
+import com.cloud.utils.db.Transaction;
+import com.cloud.utils.exception.CloudRuntimeException;
+
+public class Upgrade217to22 implements DbUpgrade {
+
+    @Override
+    public void prepare() {
+        File file = PropertiesUtil.findConfigFile("schema-21to22.sql");
+        if (file == null) {
+            throw new CloudRuntimeException("Unable to find the upgrade script, schema-21to22.sql");
+        }
+        
+        try {
+            FileReader reader = new FileReader(file);
+            Connection conn = Transaction.getStandaloneConnection();
+            ScriptRunner runner = new ScriptRunner(conn, false, false);
+            runner.runScript(reader);
+        } catch (FileNotFoundException e) {
+            throw new CloudRuntimeException("Unable to find upgrade script, schema-21to22.sql", e);
+        } catch (IOException e) {
+            throw new CloudRuntimeException("Unable to read upgrade script, schema-21to22.sql", e);
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to execute upgrade script, schema-21to22.sql", e);
+        }
+    }
+    
+    @Override
+    public void upgrade() {
+    }
+
+    @Override
+    public void cleanup() {
+    }
+
+    @Override
+    public String[] getUpgradableVersionRange() {
+        return new String[] { "2.1.7", "2.1.7" };
+    }
+
+    @Override
+    public String getUpgradedVersion() {
+        return "2.2.0";
+    }
+    
+    @Override
+    public boolean supportsRollingUpgrade() {
+        return false;
+    }
+}

server/test/resources/VersionDaoImplTest/clean-db.sql

@@ -0,0 +1,120 @@
+SET foreign_key_checks = 0;
+use cloud;
+
+DROP VIEW IF EXISTS `cloud`.`port_forwarding_rules_view`;
+DROP TABLE IF EXISTS `cloud`.`configuration`;
+DROP TABLE IF EXISTS `cloud`.`ip_forwarding`;
+DROP TABLE IF EXISTS `cloud`.`management_agent`;
+DROP TABLE IF EXISTS `cloud`.`host`;
+DROP TABLE IF EXISTS `cloud`.`mshost`;
+DROP TABLE IF EXISTS `cloud`.`service_offering`;
+DROP TABLE IF EXISTS `cloud`.`user`;
+DROP TABLE IF EXISTS `cloud`.`user_ip_address`;
+DROP TABLE IF EXISTS `cloud`.`user_statistics`;
+DROP TABLE IF EXISTS `cloud`.`vm_template`;
+DROP TABLE IF EXISTS `cloud`.`vm_instance`;
+DROP TABLE IF EXISTS `cloud`.`domain_router`;
+DROP TABLE IF EXISTS `cloud`.`event`;
+DROP TABLE IF EXISTS `cloud`.`host_details`;
+DROP TABLE IF EXISTS `cloud`.`host_pod_ref`;
+DROP TABLE IF EXISTS `cloud`.`host_zone_ref`;
+DROP TABLE IF EXISTS `cloud`.`data_ceneter`;
+DROP TABLE IF EXISTS `cloud`.`volumes`;
+DROP TABLE IF EXISTS `cloud`.`storage`;
+DROP TABLE IF EXISTS `cloud`.`data_center`;
+DROP TABLE IF EXISTS `cloud`.`pricing`;
+DROP TABLE IF EXISTS `cloud`.`sequence`;
+DROP TABLE IF EXISTS `cloud`.`user_vm`;
+DROP TABLE IF EXISTS `cloud`.`template_host_ref`;
+DROP TABLE IF EXISTS `cloud`.`upload`;
+DROP TABLE IF EXISTS `cloud`.`template_zone_ref`;
+DROP TABLE IF EXISTS `cloud`.`dc_vnet_alloc`;
+DROP TABLE IF EXISTS `cloud`.`dc_ip_address_alloc`;
+DROP TABLE IF EXISTS `cloud`.`vlan`;
+DROP TABLE IF EXISTS `cloud`.`host_vlan_map`;
+DROP TABLE IF EXISTS `cloud`.`pod_vlan_map`;
+DROP TABLE IF EXISTS `cloud`.`vm_host`;
+DROP TABLE IF EXISTS `cloud`.`op_ha_work`;
+DROP TABLE IF EXISTS `cloud`.`op_dc_vnet_alloc`;
+DROP TABLE IF EXISTS `cloud`.`op_dc_ip_address_alloc`;
+DROP TABLE IF EXISTS `cloud`.`op_vm_host`;
+DROP TABLE IF EXISTS `cloud`.`op_host_queue`;
+DROP TABLE IF EXISTS `cloud`.`console_proxy`;
+DROP TABLE IF EXISTS `cloud`.`secondary_storage_vm`;
+DROP TABLE IF EXISTS `cloud`.`domain`;
+DROP TABLE IF EXISTS `cloud`.`account`;
+DROP TABLE IF EXISTS `cloud`.`limit`;
+DROP TABLE IF EXISTS `cloud`.`op_host_capacity`;
+DROP TABLE IF EXISTS `cloud`.`alert`;
+DROP TABLE IF EXISTS `cloud`.`op_lock`;
+DROP TABLE IF EXISTS `cloud`.`op_host_upgrade`;
+DROP TABLE IF EXISTS `cloud`.`snapshots`;
+DROP TABLE IF EXISTS `cloud`.`scheduled_volume_backups`;
+DROP TABLE IF EXISTS `cloud`.`vm_disk`;
+DROP TABLE IF EXISTS `cloud`.`disk_offering`;
+DROP TABLE IF EXISTS `cloud`.`security_group`;
+DROP TABLE IF EXISTS `cloud`.`network_rule_config`;
+DROP TABLE IF EXISTS `cloud`.`host_details`;
+DROP TABLE IF EXISTS `cloud`.`launch_permission`;
+DROP TABLE IF EXISTS `cloud`.`resource_limit`;
+DROP TABLE IF EXISTS `cloud`.`async_job`;
+DROP TABLE IF EXISTS `cloud`.`sync_queue`;
+DROP TABLE IF EXISTS `cloud`.`sync_queue_item`;
+DROP TABLE IF EXISTS `cloud`.`security_group_vm_map`;
+DROP TABLE IF EXISTS `cloud`.`load_balancer_vm_map`;
+DROP TABLE IF EXISTS `cloud`.`load_balancer`;
+DROP TABLE IF EXISTS `cloud`.`storage_pool`;
+DROP TABLE IF EXISTS `cloud`.`storage_pool_host_ref`;
+DROP TABLE IF EXISTS `cloud`.`template_spool_ref`;
+DROP TABLE IF EXISTS `cloud`.`guest_os`;
+DROP TABLE IF EXISTS `cloud`.`snapshot_policy`;
+DROP TABLE IF EXISTS `cloud`.`snapshot_policy_ref`;
+DROP TABLE IF EXISTS `cloud`.`snapshot_schedule`;
+DROP TABLE IF EXISTS `cloud`.`op_pod_vlan_alloc`;
+DROP TABLE IF EXISTS `cloud`.`storage_pool_details`;
+DROP TABLE IF EXISTS `cloud`.`cluster`;
+DROP TABLE IF EXISTS `cloud`.`nics`;
+DROP TABLE IF EXISTS `cloud`.`networks`;
+DROP TABLE IF EXISTS `cloud`.`op_networks`;
+DROP TABLE IF EXISTS `cloud`.`network_offerings`;
+DROP TABLE IF EXISTS `cloud`.`hypervisor_properties`;
+DROP TABLE IF EXISTS `cloud`.`account_network_ref`;
+DROP TABLE IF EXISTS `cloud`.`instance_group`;
+DROP TABLE IF EXISTS `cloud`.`instance_group_vm_map`;
+DROP TABLE IF EXISTS `cloud`.`certificate`;
+DROP TABLE IF EXISTS `cloud`.`op_it_work`;
+DROP TABLE IF EXISTS `cloud`.`load_balancing_ip_map`;
+DROP TABLE IF EXISTS `cloud`.`load_balancing_rules`;
+DROP TABLE IF EXISTS `cloud`.`port_forwarding_rules`;
+DROP TABLE IF EXISTS `cloud`.`firewall_rules`;
+DROP TABLE IF EXISTS `cloud`.`ssh_keypairs`;
+DROP TABLE IF EXISTS `cloud`.`usage_event`;
+DROP TABLE IF EXISTS `cloud`.`host_tags`;
+DROP TABLE IF EXISTS `cloud`.`version`;
+DROP TABLE IF EXISTS `cloud`.`account_vlan_map`;
+DROP TABLE IF EXISTS `cloud`.`cluster_details`;
+DROP TABLE IF EXISTS `cloud`.`guest_os_category`;
+DROP TABLE IF EXISTS `cloud`.`guest_os_hypervisor`;
+DROP TABLE IF EXISTS `cloud`.`host_master`;
+DROP TABLE IF EXISTS `cloud`.`op_dc_link_local_ip_address_alloc`;
+DROP TABLE IF EXISTS `cloud`.`op_host`;
+DROP TABLE IF EXISTS `cloud`.`op_nwgrp_work`;
+DROP TABLE IF EXISTS `cloud`.`op_vm_ruleset_log`;
+DROP TABLE IF EXISTS `cloud`.`ovs_host_vlan_alloc`;
+DROP TABLE IF EXISTS `cloud`.`ovs_tunnel`;
+DROP TABLE IF EXISTS `cloud`.`ovs_tunnel_account`;
+DROP TABLE IF EXISTS `cloud`.`ovs_tunnel_alloc`;
+DROP TABLE IF EXISTS `cloud`.`ovs_vlan_mapping_dirty`;
+DROP TABLE IF EXISTS `cloud`.`ovs_vm_flow_log`;
+DROP TABLE IF EXISTS `cloud`.`ovs_work`;
+DROP TABLE IF EXISTS `cloud`.`remote_access_vpn`;
+DROP TABLE IF EXISTS `cloud`.`resource_count`;
+DROP TABLE IF EXISTS `cloud`.`security_ingress_rule`;
+DROP TABLE IF EXISTS `cloud`.`stack_maid`;
+DROP TABLE IF EXISTS `cloud`.`storage_pool_work`;
+DROP TABLE IF EXISTS `cloud`.`user_vm_details`;
+DROP TABLE IF EXISTS `cloud`.`vpn_users`;
+DROP TABLE IF EXISTS `cloud`.`network_groups`;
+DROP TABLE IF EXISTS `cloud`.`network_ingress_rule`;
+DROP TABLE IF EXISTS `cloud`.`op_nwgrp_work`;
+DROP TABLE IF EXISTS `cloud`.`op_vm_ruleset_log`;

setup/db/schema-21to22-cleanup.sql

@@ -0,0 +1,84 @@
+-- First the easy stuff.  Drop useless tables
+DROP TABLE IF EXISTS `cloud`.`ext_lun_details`;
+DROP TABLE IF EXISTS `cloud`.`ext_lun_alloc`;
+DROP TABLE IF EXISTS `cloud`.`disk_template_ref`;
+
+-- Then remove columns
+
+ALTER TABLE `cloud`.`volume` DROP COLUMN `mirror_state`;
+ALTER TABLE `cloud`.`volume` DROP COLUMN `mirror_vol`;
+ALTER TABLE `cloud`.`volume` DROP COLUMN `destroyed`;
+
+DROP TABLE `cloud`.`ip_forwarding`;
+
+ALTER TABLE `cloud`.`host` DROP COLUMN `sequence`;
+
+DROP TABLE `cloud`,`op_vm_host`;
+
+ALTER TABLE `cloud`.vm_instance` DROP COLUMN `iso_id`;
+ALTER TABLE `cloud`.vm_instance` DROP COLUMN `display_name`;
+ALTER TABLE `cloud`.vm_instance` DROP COLUMN `group`;
+ALTER TABLE `cloud`.vm_instance` DROP COLUMN `storage_ip`;
+ALTER TABLE `cloud`.vm_instance` DROP COLUMN `mirrored_vols`;
+
+DROP TABLE `cloud`.`pricing`;
+
+ALTER TABLE `cloud`.`user_vm` DROP COLUMN `domain_router_id`;
+ALTER TABLE `cloud`.`user_vm` DROP COLUMN `service_offering_id`;
+ALTER TABLE `cloud`.`user_vm` DROP COLUMN `vnet`;
+ALTER TABLE `cloud`.`user_vm` DROP COLUMN `dc_vlan`;
+ALTER TABLE `cloud`.`user_vm` DROP COLUMN `account_id`;
+ALTER TABLE `cloud`.`user_vm` DROP COLUMN `domain_id`;
+ALTER TABLE `cloud`.`user_vm` DROP COLUMN `external_ip_address`;
+ALTER TABLE `cloud`.`user_vm` DROP COLUMN `external_mac_address`;
+ALTER TABLE `cloud`.`user_vm` DROP COLUMN `external_vlan_db_id`;
+
+ALTER TABLE `cloud`.`domain_router` DROP COLUMN `gateway`;
+ALTER TABLE `cloud`.`domain_router` DROP COLUMN `ram_size`;
+ALTER TABLE `cloud`.`domain_router` DROP COLUMN `dns1`;
+ALTER TABLE `cloud`.`domain_router` DROP COLUMN `dns2`;
+ALTER TABLE `cloud`.`domain_router` DROP COLUMN `guest_mac_address`;
+ALTER TABLE `cloud`.`domain_router` DROP COLUMN `guest_dc_mac_address`;
+ALTER TABLE `cloud`.`domain_router` DROP COLUMN `vnet`;
+ALTER TABLE `cloud`.`domain_router` DROP COLUMN `dc_vlan`;
+ALTER TABLE `cloud`.`domain_router` DROP COLUMN `vlan_db_id`;
+ALTER TABLE `cloud`.`domain_router` DROP COLUMN `vlan_id`;
+ALTER TABLE `cloud`.`domain_router` DROP COLUMN `domain_id`;
+ALTER TABLE `cloud`.`domain_router` DROP COLUMN `account_id`;
+ALTER TABLE `cloud`.`domain_router` DROP COLUMN `dhcp_ip_address`;
+
+ALTER TABLE `cloud`.`console_proxy` DROP COLUMN `gateway`;
+ALTER TABLE `cloud`.`console_proxy` DROP COLUMN `dns1`;
+ALTER TABLE `cloud`.`console_proxy` DROP COLUMN `dns2`;
+ALTER TABLE `cloud`.`console_proxy` DROP COLUMN `domain`;
+ALTER TABLE `cloud`.`console_proxy` DROP COLUMN `guest_mac_address`;
+ALTER TABLE `cloud`.`console_proxy` DROP COLUMN `guest_ip_address`;
+ALTER TABLE `cloud`.`console_proxy` DROP COLUMN `guest_netmask`;
+ALTER TABLE `cloud`.`console_proxy` DROP COLUMN `vlan_db_id`;
+ALTER TABLE `cloud`.`console_proxy` DROP COLUMN `vlan_id`;
+ALTER TABLE `cloud`.`console_proxy` DROP COLUMN `ram_size`;
+
+ALTER TABLE `cloud`.`secondary_storage_vm` DROP COLUMN `gateway`;
+ALTER TABLE `cloud`.`secondary_storage_vm` DROP COLUMN `dns1`;
+ALTER TABLE `cloud`.`secondary_storage_vm` DROP COLUMN `dns2`;
+ALTER TABLE `cloud`.`secondary_storage_vm` DROP COLUMN `domain`;
+ALTER TABLE `cloud`.`secondary_storage_vm` DROP COLUMN `guest_mac_address`;
+ALTER TABLE `cloud`.`secondary_storage_vm` DROP COLUMN `guest_ip_address`;
+ALTER TABLE `cloud`.`secondary_storage_vm` DROP COLUMN `guest_netmask`;
+ALTER TABLE `cloud`.`secondary_storage_vm` DROP COLUMN `vlan_db_id`;
+ALTER TABLE `cloud`.`secondary_storage_vm` DROP COLUMN `vlan_id`;
+ALTER TABLE `cloud`.`secondary_storage_vm` DROP COLUMN `ram_size`;
+ALTER TABLE `cloud`.`secondary_storage_vm` DROP COLUMN `guid`;
+
+DROP TABLE `cloud`.`vm_disk`;
+
+ALTER TABLE `cloud`.`disk_offering` DROP COLUMN `mirrored`;
+
+ALTER TABLE `cloud`.`service_offering` DROP COLUMN `guest_ip_type`;
+
+DROP TABLE `cloud`.`security_group_vm_map`;
+DROP TABLE `cloud`.`load_balancer_vm_map`;
+DROP TABLE `cloud`.`security_group`;
+
+ALTER TABLE `cloud`.`load_balancer_vm_map` DROP COLUMN `pending`;
+

utils/test/resources/log4j.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ================================= -->
+   <!-- Preserve messages in a local file -->
+   <!-- ================================= -->
+
+   <!-- A regular appender FIXME implement code that will close/reopen logs on SIGHUP by logrotate FIXME make the paths configurable using the build system -->
+<!--   <appender name="FILE" class="org.apache.log4j.rolling.RollingFileAppender">
+      <param name="Append" value="true"/>
+      <param name="Threshold" value="DEBUG"/>
+      <rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
+        <param name="FileNamePattern" value="@MSLOG@.%d{yyyy-MM-dd}.gz"/>
+        <param name="ActiveFileName" value="@MSLOG@"/>
+      </rollingPolicy>
+      <layout class="org.apache.log4j.EnhancedPatternLayout">
+         <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) %m%n"/>
+      </layout>
+   </appender>
+   -->
+  <!-- 
+   <appender name="APISERVER" class="org.apache.log4j.rolling.RollingFileAppender">
+      <param name="Append" value="true"/>
+      <param name="Threshold" value="DEBUG"/>
+      <rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
+        <param name="FileNamePattern" value="@APISERVERLOG@.%d{yyyy-MM-dd}.gz"/>
+        <param name="ActiveFileName" value="@APISERVERLOG@"/>
+      </rollingPolicy>
+      <layout class="org.apache.log4j.EnhancedPatternLayout">
+         <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) %m%n"/>
+      </layout>
+   </appender>
+   -->
+
+   <!-- ============================== -->
+   <!-- Append warnings+ to the syslog if it is listening on UDP port FIXME make sysloghost configurable! -->
+   <!-- ============================== -->
+<!--
+   <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+      <param name="Threshold" value="WARN"/>
+      <param name="SyslogHost" value="localhost"/>
+      <param name="Facility" value="LOCAL6"/>
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%-5p [%c{3}] (%t:%x) %m%n"/>
+      </layout>
+   </appender>
+-->
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="DEBUG"/>
+      <layout class="org.apache.log4j.PatternLayout">
+         <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) %m%n"/>
+      </layout>
+   </appender>
+
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <category name="com.cloud">
+     <priority value="DEBUG"/>
+   </category>
+   
+   <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+   <category name="org.apache">
+      <priority value="INFO"/>
+   </category>
+
+   <category name="org">
+      <priority value="INFO"/>
+   </category>
+   
+   <category name="net">
+     <priority value="INFO"/>
+   </category>
+
+   <category name="apiserver.com.cloud">
+     <priority value="DEBUG"/>
+   </category>
+
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <level value="INFO"/>
+      <appender-ref ref="CONSOLE"/>
+   </root>
+
+</log4j:configuration>