API tools faq
paste
Advertisement
Guest User

acs-4.3-vs-master

a guest
Dec 1st, 2014
226
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 12.16 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql
  2. index 53b4a1a..24f6d4c 100644
  3. --- a/setup/db/db/schema-40to410.sql
  4. +++ b/setup/db/db/schema-40to410.sql
  5. @@ -345,7 +345,6 @@ CREATE TABLE `cloud`.`autoscale_policies` (
  6. `account_id` bigint unsigned NOT NULL,
  7. `duration` int unsigned NOT NULL,
  8. `quiet_time` int unsigned NOT NULL,
  9. - `last_quiet_time` datetime DEFAULT NULL,
  10. `action` varchar(15),
  11. `created` datetime NOT NULL COMMENT 'date created',
  12. `removed` datetime COMMENT 'date removed if not null',
  13. @@ -402,22 +401,10 @@ CREATE TABLE `cloud`.`autoscale_vmgroup_policy_map` (
  14. INDEX `i_autoscale_vmgroup_policy_map__vmgroup_id`(`vmgroup_id`)
  15. ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
  16.  
  17. -CREATE TABLE `cloud`.`autoscale_vmgroup_vm_map` (
  18. - `id` bigint unsigned NOT NULL auto_increment,
  19. - `vmgroup_id` bigint unsigned NOT NULL,
  20. - `instance_id` bigint unsigned NOT NULL,
  21. - PRIMARY KEY (`id`),
  22. - CONSTRAINT `fk_autoscale_vmgroup_vm_map__vmgroup_id` FOREIGN KEY `fk_autoscale_vmgroup_vm_map__vmgroup_id` (`vmgroup_id`) REFERENCES `autoscale_vmgroups` (`id`) ON DELETE CASCADE,
  23. - CONSTRAINT `fk_autoscale_vmgroup_vm_map__instance_id` FOREIGN KEY `fk_autoscale_vmgroup_vm_map__instance_id` (`instance_id`) REFERENCES `vm_instance` (`id`),
  24. - INDEX `i_autoscale_vmgroup_vm_map__vmgroup_id`(`vmgroup_id`)
  25. -) ENGINE=InnoDB DEFAULT CHARSET=utf8;
  26. -
  27. INSERT INTO `cloud`.`counter` (id, uuid, source, name, value,created) VALUES (1, UUID(), 'snmp','Linux User CPU - percentage', '1.3.6.1.4.1.2021.11.9.0', now());
  28. INSERT INTO `cloud`.`counter` (id, uuid, source, name, value,created) VALUES (2, UUID(), 'snmp','Linux System CPU - percentage', '1.3.6.1.4.1.2021.11.10.0', now());
  29. INSERT INTO `cloud`.`counter` (id, uuid, source, name, value,created) VALUES (3, UUID(), 'snmp','Linux CPU Idle - percentage', '1.3.6.1.4.1.2021.11.11.0', now());
  30. INSERT INTO `cloud`.`counter` (id, uuid, source, name, value,created) VALUES (100, UUID(), 'netscaler','Response Time - microseconds', 'RESPTIME', now());
  31. -INSERT INTO `cloud`.`counter` (id, uuid, source, name, value,created) VALUES (4, UUID(), 'cpu','Linux User CPU - percentage - native', '1.3.6.1.4.1.2021.11.9.1', now());
  32. -INSERT INTO `cloud`.`counter` (id, uuid, source, name, value,created) VALUES (5, UUID(), 'memory','Linux User RAM - percentage - native', '1.3.6.1.4.1.2021.11.10.1', now());
  33.  
  34. CREATE TABLE `cloud`.`user_ipv6_address` (
  35. `id` bigint unsigned NOT NULL UNIQUE auto_increment,
  36. diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
  37. index ebbcfef..b0be6c7 100644
  38. --- a/setup/db/db/schema-410to420.sql
  39. +++ b/setup/db/db/schema-410to420.sql
  40. @@ -2021,7 +2021,7 @@ CREATE TABLE `cloud`.`network_acl_item` (
  41. `icmp_code` int(10) COMMENT 'The ICMP code (if protocol=ICMP). A value of -1 means all codes for the given ICMP type.',
  42. `icmp_type` int(10) COMMENT 'The ICMP type (if protocol=ICMP). A value of -1 means all types.',
  43. `traffic_type` char(32) COMMENT 'the traffic type of the rule, can be Ingress or Egress',
  44. - `cidr` varchar(255) COMMENT 'comma seperated cidr list',
  45. + `cidr` varchar(2048) COMMENT 'comma seperated cidr list',
  46. `number` int(10) NOT NULL COMMENT 'priority number of the acl item',
  47. `action` varchar(10) NOT NULL COMMENT 'rule action, allow or deny',
  48. PRIMARY KEY (`id`),
  49. @@ -2103,18 +2103,6 @@ CREATE TABLE `cloud`.`vm_disk_statistics` (
  50. insert into `cloud`.`vm_disk_statistics`(data_center_id,account_id,vm_id,volume_id)
  51. select volumes.data_center_id, volumes.account_id, vm_instance.id, volumes.id from volumes,vm_instance where vm_instance.vm_type="User" and vm_instance.state<>"Expunging" and volumes.instance_id=vm_instance.id order by vm_instance.id;
  52.  
  53. -DROP TABLE IF EXISTS `cloud`.`ovs_providers`;
  54. -CREATE TABLE `cloud`.`ovs_providers` (
  55. - `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
  56. - `nsp_id` bigint unsigned NOT NULL COMMENT 'Network Service Provider ID',
  57. - `uuid` varchar(40),
  58. - `enabled` int(1) NOT NULL COMMENT 'Enabled or disabled',
  59. - `removed` datetime COMMENT 'date removed if not null',
  60. - PRIMARY KEY (`id`),
  61. - CONSTRAINT `fk_ovs_providers__nsp_id` FOREIGN KEY (`nsp_id`) REFERENCES `physical_network_service_providers` (`id`) ON DELETE CASCADE,
  62. - CONSTRAINT `uc_ovs_providers__uuid` UNIQUE (`uuid`)
  63. -) ENGINE=InnoDB DEFAULT CHARSET=utf8;
  64. -
  65. DROP TABLE IF EXISTS `cloud_usage`.`vm_disk_statistics`;
  66. CREATE TABLE `cloud_usage`.`vm_disk_statistics` (
  67. `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
  68. diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
  69. index 3f2ad02..6a8ec49 100644
  70. --- a/setup/db/db/schema-421to430.sql
  71. +++ b/setup/db/db/schema-421to430.sql
  72. @@ -130,7 +130,7 @@ ALTER TABLE `cloud`.`volumes` ADD COLUMN `hv_ss_reserve` int(32) unsigned DEFAUL
  73. UPDATE `cloud`.`disk_offering` SET `state`='Inactive' WHERE `removed` IS NOT NULL;
  74. UPDATE `cloud`.`disk_offering` SET `removed`=NULL;
  75.  
  76. -UPDATE `cloud`.`vm_template` SET `guest_os_id`= "142" WHERE `id` = "5";
  77. +UPDATE `cloud`.`vm_template` SET `guest_os_id`="142" WHERE `id`="5";
  78. UPDATE `cloud`.`vm_template` SET `state`='Inactive' WHERE `removed` IS NOT NULL;
  79. UPDATE `cloud`.`vm_template` SET `state`='Active' WHERE `removed` IS NULL;
  80. UPDATE `cloud`.`vm_template` SET `removed`=NULL;
  81. @@ -303,7 +303,7 @@ CREATE VIEW `cloud`.`template_view` AS
  82. left join
  83. `cloud`.`vm_template` source_template ON source_template.id = vm_template.source_template_id
  84. left join
  85. - `cloud`.`template_store_ref` ON template_store_ref.template_id = vm_template.id and template_store_ref.store_role = 'Image' and template_store_ref.destroyed=0
  86. + `cloud`.`template_store_ref` ON template_store_ref.template_id = vm_template.id and template_store_ref.store_role = 'Image'
  87. left join
  88. `cloud`.`image_store` ON image_store.removed is NULL AND template_store_ref.store_id is not NULL AND image_store.id = template_store_ref.store_id
  89. left join
  90. @@ -832,18 +832,11 @@ CREATE TABLE `cloud`.`network_acl_item_details` (
  91.  
  92. ALTER TABLE `cloud`.`alert` ADD COLUMN `name` varchar(255) DEFAULT NULL COMMENT 'name of the alert';
  93.  
  94. +UPDATE `cloud`.`hypervisor_capabilities` set max_guests_limit='150' WHERE hypervisor_version='6.1.0';
  95. +UPDATE `cloud`.`hypervisor_capabilities` set max_guests_limit='500' WHERE hypervisor_version='6.2.0';
  96. UPDATE `cloud`.`hypervisor_capabilities` SET `max_data_volumes_limit`=13 WHERE `hypervisor_type`='Vmware';
  97. INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, storage_motion_supported) VALUES (UUID(), 'Hyperv', '6.2', 1024, 0, 64, 0);
  98.  
  99. -ALTER TABLE `cloud`.`external_load_balancer_devices` ADD COLUMN `is_exclusive_gslb_provider` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if load balancer appliance is acting exclusively as gslb service provider in the zone and can not be used for LB';
  100. -
  101. -DELETE FROM `cloud`.`configuration` WHERE `name` IN ("xen.update.url", "update.check.interval", "baremetal_dhcp_devices", "host.updates.enable");
  102. -
  103. -INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Advanced", 'DEFAULT', 'VMSnapshotManager', "vmsnapshot.create.wait", "1800", "In second, timeout for create vm snapshot", NULL, NULL,NULL,0);
  104. -INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Advanced", 'DEFAULT', 'VMSnapshotManager', "vmsnapshot.max", "10", "Maximum vm snapshots for a vm", NULL, NULL,NULL,0);
  105. -
  106. -UPDATE `cloud`.`configuration` SET `component` = 'VMSnapshotManager' WHERE `name` IN ("vmsnapshot.create.wait", "vmsnapshot.max");
  107. -
  108. CREATE TABLE `cloud`.`s2s_vpn_gateway_details` (
  109. `id` bigint unsigned NOT NULL auto_increment,
  110. `s2s_vpn_gateway_id` bigint unsigned NOT NULL COMMENT 'VPC gateway id',
  111. @@ -854,9 +847,6 @@ CREATE TABLE `cloud`.`s2s_vpn_gateway_details` (
  112. CONSTRAINT `fk_s2s_vpn_gateway_details__s2s_vpn_gateway_id` FOREIGN KEY `fk_s2s_vpn_gateway_details__s2s_vpn_gateway_id`(`s2s_vpn_gateway_id`) REFERENCES `s2s_vpn_gateway`(`id`) ON DELETE CASCADE
  113. ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
  114.  
  115. -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Hidden', 'DEFAULT', 'management-server', 'hyperv.guest.network.device', null, 'Specify the virtual switch on host for guest network', NULL, NULL, NULL, 0);
  116. -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Hidden', 'DEFAULT', 'management-server', 'hyperv.private.network.device', null, 'Specify the virtual switch on host for private network', NULL, NULL, NULL, 0);
  117. -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Hidden', 'DEFAULT', 'management-server', 'hyperv.public.network.device', null, 'Specify the public virtual switch on host for public network', NULL, NULL, NULL, 0);
  118.  
  119. DELETE FROM `cloud`.`configuration` WHERE `name` IN ("xen.update.url", "update.check.interval", "baremetal_dhcp_devices", "host.updates.enable");
  120.  
  121. @@ -873,6 +863,12 @@ INSERT IGNORE INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, c
  122.  
  123. UPDATE `cloud`.`configuration` SET `component` = 'VMSnapshotManager' WHERE `name` IN ("vmsnapshot.create.wait", "vmsnapshot.max");
  124.  
  125. +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Hidden', 'DEFAULT', 'management-server', 'hyperv.guest.network.device', null, 'Specify the virtual switch on host for guest network', NULL, NULL, NULL, 0);
  126. +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Hidden', 'DEFAULT', 'management-server', 'hyperv.private.network.device', null, 'Specify the virtual switch on host for private network', NULL, NULL, NULL, 0);
  127. +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Hidden', 'DEFAULT', 'management-server', 'hyperv.public.network.device', null, 'Specify the public virtual switch on host for public network', NULL, NULL, NULL, 0);
  128. +
  129. +ALTER TABLE `cloud`.`external_load_balancer_devices` ADD COLUMN `is_exclusive_gslb_provider` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if load balancer appliance is acting exclusively as gslb service provider in the zone and can not be used for LB';
  130. +
  131. CREATE TABLE `cloud`.`s2s_customer_gateway_details` (
  132. `id` bigint unsigned NOT NULL auto_increment,
  133. `s2s_customer_gateway_id` bigint unsigned NOT NULL COMMENT 'VPC gateway id',
  134. @@ -883,7 +879,6 @@ CREATE TABLE `cloud`.`s2s_customer_gateway_details` (
  135. CONSTRAINT `fk_s2s_customer_gateway_details__s2s_customer_gateway_id` FOREIGN KEY `fk_s2s_customer_gateway_details__s2s_customer_gateway_id`(`s2s_customer_gateway_id`) REFERENCES `s2s_customer_gateway`(`id`) ON DELETE CASCADE
  136. ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
  137.  
  138. -
  139. CREATE TABLE `cloud`.`s2s_vpn_connection_details` (
  140. `id` bigint unsigned NOT NULL auto_increment,
  141. `s2s_vpn_connection_id` bigint unsigned NOT NULL COMMENT 'VPC gateway id',
  142. @@ -1101,6 +1096,14 @@ CREATE VIEW `cloud`.`user_vm_view` AS
  143. `cloud`.`user_vm_details` `custom_ram_size` ON (((`custom_ram_size`.`vm_id` = `cloud`.`vm_instance`.`id`) and (`custom_ram_size`.`name` = 'memory')));
  144.  
  145.  
  146. +INSERT IGNORE INTO `cloud`.`configuration`(category, instance, component, name, value, description, default_value) VALUES ('NetworkManager', 'DEFAULT', 'management-server', 'network.router.EnableServiceMonitoring', 'true', 'service monitoring in router enable/disable option, default true', 'true') ON DUPLICATE KEY UPDATE category='NetworkManager';
  147. +
  148. +ALTER TABLE `cloud`.`service_offering_details` CHANGE `display` `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user';
  149. +UPDATE `cloud`.`service_offering_details` set `display`=1 where id> 0;
  150. +
  151. +ALTER TABLE `cloud`.`disk_offering_details` CHANGE `display_detail` `display_detail` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the detail can be displayed to the end user';
  152. +UPDATE `cloud`.`disk_offering_details` set `display_detail`=1 where id> 0;
  153. +
  154. INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (168, UUID(), 6, 'Windows Server 2012 R2 (64-bit)');
  155. INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows Server 2012 R2 (64-bit)', 168);
  156. INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Windows Server 2012 R2 (64-bit)', 168);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!