You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/06 20:11:02 UTC
[7/11] git commit: VPC: added field networkacl_service_provided to
physical_network_service_providers table
VPC: added field networkacl_service_provided to physical_network_service_providers table
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/234ae447
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/234ae447
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/234ae447
Branch: refs/heads/vpc
Commit: 234ae447ee8c81b6499cb8e2eea33b6c9e59c1bf
Parents: 07eb6e3
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Jul 5 13:52:11 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jul 6 11:08:39 2012 -0700
----------------------------------------------------------------------
.../network/PhysicalNetworkServiceProvider.java | 2 ++
.../dao/PhysicalNetworkServiceProviderVO.java | 13 +++++++++++++
setup/db/create-schema.sql | 1 +
3 files changed, 16 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/234ae447/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
index 58904ee..1b91311 100644
--- a/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
+++ b/api/src/com/cloud/network/PhysicalNetworkServiceProvider.java
@@ -64,4 +64,6 @@ public interface PhysicalNetworkServiceProvider {
List<Service> getEnabledServices();
String getUuid();
+
+ boolean isNetworkAclServiceProvided();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/234ae447/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java b/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java
index a5fc0cc..12b08af 100644
--- a/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java
+++ b/server/src/com/cloud/network/dao/PhysicalNetworkServiceProviderVO.java
@@ -91,6 +91,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;
@@ -265,6 +268,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
@@ -305,4 +309,13 @@ public class PhysicalNetworkServiceProviderVO implements PhysicalNetworkServiceP
}
return services;
}
+
+ @Override
+ public boolean isNetworkAclServiceProvided() {
+ return networkAclServiceProvided;
+ }
+
+ public void setNetworkAclServiceProvided(boolean networkAclServiceProvided) {
+ this.networkAclServiceProvided = networkAclServiceProvided;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/234ae447/setup/db/create-schema.sql
----------------------------------------------------------------------
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index dfa50e5..96dc7b9 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,