cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject [6/6] git commit: updated refs/heads/master to 19a1116
Date Tue, 28 May 2013 18:11:23 GMT
Merge branch '4-2-advanced-zone-security-group'


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/19a1116d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/19a1116d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/19a1116d

Branch: refs/heads/master
Commit: 19a1116df2b3942fc48dcc4ed6b531f252e1bb8c
Parents: cfd8056 b0a9ade
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Tue May 28 11:03:56 2013 -0700
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Tue May 28 11:03:56 2013 -0700

----------------------------------------------------------------------
 .../configuration/ConfigurationManagerImpl.java    |   10 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   29 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |    6 +
 .../secondary/SecondaryStorageManagerImpl.java     |   32 +-
 setup/db/db/schema-410to420.sql                    |    3 +-
 setup/dev/advancedsg.cfg                           |  185 ++++
 .../component/test_advancedsg_networks.py          |  753 +++++++++++++++
 test/integration/component/test_egress_rules.py    |   20 +-
 test/integration/component/test_security_groups.py |   22 +-
 tools/devcloud/devcloud-advancedsg.cfg             |  119 +++
 tools/marvin/marvin/configGenerator.py             |  123 +++
 tools/marvin/marvin/deployDataCenter.py            |   32 +-
 tools/marvin/marvin/sandbox/advancedsg/__init__.py |   18 +
 .../marvin/sandbox/advancedsg/advancedsg_env.py    |  150 +++
 .../marvin/sandbox/advancedsg/setup.properties     |   61 ++
 tools/marvin/setup.py                              |    2 +-
 ui/scripts/zoneWizard.js                           |    1 -
 17 files changed, 1512 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/19a1116d/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/19a1116d/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/19a1116d/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --cc setup/db/db/schema-410to420.sql
index 348523f,f25588a..cf4e98d
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@@ -1708,12 -1607,6 +1708,13 @@@ alter table `cloud`.`vpc_gateways` add 
  update `cloud`.`vpc_gateways` set network_acl_id = 2;
  
  
 +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'VpcManager',
'blacklisted.routes', NULL, 'Routes that are blacklisted, can not be used for Static Routes
creation for the VPC Private Gateway');
 +
 +UPDATE `cloud`.`snapshots` set swift_id=null where swift_id=0;
 +
 +
 +-- Re-enable foreign key checking, at the end of the upgrade path
 +SET foreign_key_checks = 1;			
 +UPDATE `cloud`.`snapshot_policy` set uuid=id WHERE uuid is NULL;
- 
+ #update shared sg enabled network with not null name in Advance Security Group enabled network
+ UPDATE `cloud`.`networks` set name='Shared SG enabled network', display_text='Shared SG
enabled network' WHERE name IS null AND traffic_type='Guest' AND data_center_id IN (select
id from data_center where networktype='Advanced' and is_security_group_enabled=1) AND acl_type='Domain';
 -

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/19a1116d/ui/scripts/zoneWizard.js
----------------------------------------------------------------------


Mime
View raw message