CLOUDSTACK-6278 Baremetal Advanced Networking support
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/781ad96b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/781ad96b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/781ad96b Branch: refs/heads/master Commit: 781ad96b04c9030fc1c0a0401145414e7f3978aa Parents: 3ddc9e7 Author: Frank.Zhang <frank.zh...@citrix.com> Authored: Mon Jul 7 11:43:05 2014 -0700 Committer: Frank.Zhang <frank.zh...@citrix.com> Committed: Mon Jul 7 11:43:05 2014 -0700 ---------------------------------------------------------------------- .gitignore | 1 + api/src/com/cloud/event/EventTypes.java | 1 + api/src/org/apache/cloudstack/api/ApiConstants.java | 1 + setup/db/db/schema-430to440.sql | 8 ++++++++ 4 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/781ad96b/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index a0307a7..f541d41 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ tools/apidoc/log/ log/ plugins/network-elements/juniper-contrail/logs/ scripts/vm/hypervisor/xenserver/vhd-util +*.orig http://git-wip-us.apache.org/repos/asf/cloudstack/blob/781ad96b/api/src/com/cloud/event/EventTypes.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/event/EventTypes.java b/api/src/com/cloud/event/EventTypes.java index 5b9ea5c..bc8a8c2 100755 --- a/api/src/com/cloud/event/EventTypes.java +++ b/api/src/com/cloud/event/EventTypes.java @@ -448,6 +448,7 @@ public class EventTypes { public static final String EVENT_BAREMETAL_DHCP_SERVER_DELETE = "PHYSICAL.DHCP.DELETE"; public static final String EVENT_BAREMETAL_PXE_SERVER_ADD = "PHYSICAL.PXE.ADD"; public static final String EVENT_BAREMETAL_PXE_SERVER_DELETE = "PHYSICAL.PXE.DELETE"; + public static final String EVENT_BAREMETAL_RCT_ADD = "BAREMETAL.RCT.ADD"; public static final String EVENT_AFFINITY_GROUP_CREATE = "AG.CREATE"; public static final String EVENT_AFFINITY_GROUP_DELETE = "AG.DELETE"; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/781ad96b/api/src/org/apache/cloudstack/api/ApiConstants.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/org/apache/cloudstack/api/ApiConstants.java index adda5f4..3a5a42b 100755 --- a/api/src/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/org/apache/cloudstack/api/ApiConstants.java @@ -525,6 +525,7 @@ public class ApiConstants { public static final String COUNTERPARAM_LIST = "counterparam"; public static final String AUTOSCALE_USER_ID = "autoscaleuserid"; public static final String BAREMETAL_DISCOVER_NAME = "baremetaldiscovername"; + public static final String BAREMETAL_RCT_URL = "baremetalrcturl"; public static final String UCS_DN = "ucsdn"; public static final String GSLB_PROVIDER = "gslbprovider"; public static final String EXCLUSIVE_GSLB_PROVIDER = "isexclusivegslbprovider"; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/781ad96b/setup/db/db/schema-430to440.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql index 9043fb2..d89e32f 100644 --- a/setup/db/db/schema-430to440.sql +++ b/setup/db/db/schema-430to440.sql @@ -685,6 +685,14 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'CentOS 6.5 (64-bit)', 228); INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 6.5 (64-bit)', 228); +CREATE TABLE `cloud`.`baremetal_rct` ( + `id` bigint unsigned UNIQUE AUTO_INCREMENT, + `uuid` varchar(40) UNIQUE NOT NULL, + `url` varchar(2048) NOT NULL, + `rct` text NOT NULL, + PRIMARY KEY (`id`) +) ENGINE = InnoDB DEFAULT CHARSET=utf8; + CREATE TABLE `cloud`.`op_router_monitoring_services` ( `vm_id` bigint unsigned UNIQUE NOT NULL COMMENT 'Primary Key', `router_name` varchar(255) NOT NULL COMMENT 'Name of the Virtual Router',
