From d8cdb89721bab3ed9f77270a142b0c84eaa08246 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Thu, 5 Jul 2012 13:52:11 -0700 Subject: [PATCH] VPC: added field networkacl_service_provided to physical_network_service_providers table --- .../network/PhysicalNetworkServiceProvider.java | 2 ++ .../dao/PhysicalNetworkServiceProviderVO.java | 13 +++++++++++++ setup/db/create-schema.sql | 1 + 3 files changed, 16 insertions(+) diff --git a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java index 109db0d7ee4..195640678e2 100644 --- a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java +++ b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java @@ -60,4 +60,6 @@ public interface PhysicalNetworkServiceProvider { List getEnabledServices(); String getUuid(); + + boolean isNetworkAclServiceProvided(); } diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java b/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java index 3e5694100c6..0fac443037e 100644 --- a/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java +++ b/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java @@ -87,6 +87,9 @@ public class PhysicalNetworkServiceProviderVO implements PhysicalNetworkServiceP @Column(name = "security_group_service_provided") boolean securitygroupServiceProvided; + @Column(name = "networkacl_service_provided") + boolean networkAclServiceProvided; + @Column(name=GenericDao.REMOVED_COLUMN) Date removed; @@ -261,6 +264,7 @@ public class PhysicalNetworkServiceProviderVO implements PhysicalNetworkServiceP this.setPortForwardingServiceProvided(services.contains(Service.PortForwarding)); this.setUserdataServiceProvided(services.contains(Service.UserData)); this.setSecuritygroupServiceProvided(services.contains(Service.SecurityGroup)); + this.setNetworkAclServiceProvided(services.contains(Service.NetworkACL)); } @Override @@ -301,4 +305,13 @@ public class PhysicalNetworkServiceProviderVO implements PhysicalNetworkServiceP } return services; } + + @Override + public boolean isNetworkAclServiceProvided() { + return networkAclServiceProvided; + } + + public void setNetworkAclServiceProvided(boolean networkAclServiceProvided) { + this.networkAclServiceProvided = networkAclServiceProvided; + } } diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index c2eafd661f7..b33459ad2f4 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -2003,6 +2003,7 @@ CREATE TABLE `cloud`.`physical_network_service_providers` ( `port_forwarding_service_provided` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT 'Is Port Forwarding service provided', `user_data_service_provided` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT 'Is UserData service provided', `security_group_service_provided` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT 'Is SG service provided', + `networkacl_service_provided` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT 'Is Network ACL service provided', `removed` datetime COMMENT 'date removed if not null', PRIMARY KEY (`id`), CONSTRAINT `fk_pnetwork_service_providers__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE,