Skip to content

Commit 483a11c

Browse files
author
Sheng Yang
committed
IPv6: Fix build of master
All the table column should be modified before view was added
1 parent 73d5926 commit 483a11c

1 file changed

Lines changed: 9 additions & 34 deletions

File tree

‎setup/db/db/schema-40to410.sql‎

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,15 @@ CREATE TABLE `cloud`.`user_ipv6_address` (
519519
CONSTRAINT `fk_user_ipv6_address__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE
520520
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
521521

522+
ALTER TABLE `cloud`.`networks` ADD COLUMN `ip6_gateway` varchar(50) COMMENT 'IPv6 gateway for this network';
523+
ALTER TABLE `cloud`.`networks` ADD COLUMN `ip6_cidr` varchar(50) COMMENT 'IPv6 cidr for this network';
524+
525+
ALTER TABLE `cloud`.`nics` ADD COLUMN `ip6_gateway` varchar(50) COMMENT 'gateway for ip6 address';
526+
ALTER TABLE `cloud`.`nics` ADD COLUMN `ip6_cidr` varchar(50) COMMENT 'cidr for ip6 address';
527+
528+
ALTER TABLE `cloud`.`vlan` ADD COLUMN `ip6_gateway` varchar(255);
529+
ALTER TABLE `cloud`.`vlan` ADD COLUMN `ip6_cidr` varchar(255);
530+
ALTER TABLE `cloud`.`vlan` ADD COLUMN `ip6_range` varchar(255);
522531

523532
-- DB views for list api
524533

@@ -1662,37 +1671,3 @@ CREATE VIEW `cloud`.`data_center_view` AS
16621671
left join
16631672
`cloud`.`domain` ON data_center.domain_id = domain.id;
16641673

1665-
CREATE TABLE `cloud`.`user_ipv6_address` (
1666-
`id` bigint unsigned NOT NULL UNIQUE auto_increment,
1667-
`uuid` varchar(40),
1668-
`account_id` bigint unsigned NULL,
1669-
`domain_id` bigint unsigned NULL,
1670-
`ip_address` char(50) NOT NULL,
1671-
`data_center_id` bigint unsigned NOT NULL COMMENT 'zone that it belongs to',
1672-
`vlan_id` bigint unsigned NOT NULL,
1673-
`state` char(32) NOT NULL default 'Free' COMMENT 'state of the ip address',
1674-
`mac_address` varchar(40) NOT NULL COMMENT 'mac address of this ip',
1675-
`source_network_id` bigint unsigned NOT NULL COMMENT 'network id ip belongs to',
1676-
`network_id` bigint unsigned COMMENT 'network this public ip address is associated with',
1677-
`physical_network_id` bigint unsigned NOT NULL COMMENT 'physical network id that this configuration is based on',
1678-
`created` datetime NULL COMMENT 'Date this ip was allocated to someone',
1679-
PRIMARY KEY (`id`),
1680-
UNIQUE (`ip_address`, `source_network_id`),
1681-
CONSTRAINT `fk_user_ipv6_address__source_network_id` FOREIGN KEY (`source_network_id`) REFERENCES `networks`(`id`),
1682-
CONSTRAINT `fk_user_ipv6_address__network_id` FOREIGN KEY (`network_id`) REFERENCES `networks`(`id`),
1683-
CONSTRAINT `fk_user_ipv6_address__account_id` FOREIGN KEY (`account_id`) REFERENCES `account`(`id`),
1684-
CONSTRAINT `fk_user_ipv6_address__vlan_id` FOREIGN KEY (`vlan_id`) REFERENCES `vlan`(`id`) ON DELETE CASCADE,
1685-
CONSTRAINT `fk_user_ipv6_address__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE,
1686-
CONSTRAINT `uc_user_ipv6_address__uuid` UNIQUE (`uuid`),
1687-
CONSTRAINT `fk_user_ipv6_address__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE
1688-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1689-
1690-
ALTER TABLE `cloud`.`networks` ADD COLUMN `ip6_gateway` varchar(50) COMMENT 'IPv6 gateway for this network';
1691-
ALTER TABLE `cloud`.`networks` ADD COLUMN `ip6_cidr` varchar(50) COMMENT 'IPv6 cidr for this network';
1692-
1693-
ALTER TABLE `cloud`.`nics` ADD COLUMN `ip6_gateway` varchar(50) COMMENT 'gateway for ip6 address';
1694-
ALTER TABLE `cloud`.`nics` ADD COLUMN `ip6_cidr` varchar(50) COMMENT 'cidr for ip6 address';
1695-
1696-
ALTER TABLE `cloud`.`vlan` ADD COLUMN `ip6_gateway` varchar(255);
1697-
ALTER TABLE `cloud`.`vlan` ADD COLUMN `ip6_cidr` varchar(255);
1698-
ALTER TABLE `cloud`.`vlan` ADD COLUMN `ip6_range` varchar(255);

0 commit comments

Comments
 (0)