You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/04/18 04:26:15 UTC
[27/41] git commit: updated refs/heads/marvin_refactor to 94b18c6
Merge branch 'master' into marvin_refactor
Conflicts:
tools/marvin/marvin/cloudstackConnection.py
tools/marvin/marvin/jsonHelper.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5c5a54ed
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5c5a54ed
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5c5a54ed
Branch: refs/heads/marvin_refactor
Commit: 5c5a54edb3e59482ce7dae71ced5360902b680e9
Parents: 284581f 5ee3cc4
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Wed Apr 17 21:11:17 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Apr 17 21:11:17 2013 +0530
----------------------------------------------------------------------
api/src/com/cloud/network/Network.java | 14 +-
api/src/com/cloud/network/NetworkService.java | 2 +-
api/src/com/cloud/network/PhysicalNetwork.java | 5 +-
api/src/com/cloud/offering/NetworkOffering.java | 2 +
api/src/com/cloud/server/ManagementService.java | 2 -
.../org/apache/cloudstack/api/ApiConstants.java | 2 +-
.../admin/config/ListDeploymentPlannersCmd.java | 71 ---
.../admin/network/UpdatePhysicalNetworkCmd.java | 8 +-
.../admin/offering/CreateServiceOfferingCmd.java | 6 -
.../api/command/user/tag/CreateTagsCmd.java | 2 +-
.../api/command/user/tag/DeleteTagsCmd.java | 2 +-
.../api/command/user/tag/ListTagsCmd.java | 2 +-
build/replace.properties | 1 +
client/tomcatconf/applicationContext.xml.in | 1 -
docs/en-US/Release_Notes.xml | 334 +++++++--------
docs/en-US/source-build.xml | 4 +-
packaging/centos63/cloud-usage.rc | 2 +-
packaging/centos63/cloud.spec | 9 +-
packaging/centos63/replace.properties | 2 +-
.../hypervisor/kvm/resource/KVMHAMonitor.java | 51 +++-
.../kvm/resource/LibvirtComputingResource.java | 22 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 3 +-
server/src/com/cloud/api/ApiResponseHelper.java | 3 +-
server/src/com/cloud/configuration/Config.java | 2 +-
.../cloud/configuration/ConfigurationManager.java | 3 +-
.../configuration/ConfigurationManagerImpl.java | 52 ++-
server/src/com/cloud/dc/dao/DataCenterVnetDao.java | 6 +
.../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 50 +++-
.../network/ExternalFirewallDeviceManagerImpl.java | 14 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 289 +++++++++----
.../com/cloud/network/dao/PhysicalNetworkVO.java | 20 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 14 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 16 +-
.../src/com/cloud/offerings/NetworkOfferingVO.java | 12 +-
.../com/cloud/server/ConfigurationServerImpl.java | 2 +-
.../src/com/cloud/server/ManagementServerImpl.java | 19 -
.../src/com/cloud/service/ServiceOfferingVO.java | 23 -
.../src/com/cloud/storage/StorageManagerImpl.java | 4 +-
.../src/com/cloud/upgrade/dao/Upgrade410to420.java | 44 ++-
server/src/com/cloud/vm/UserVmManagerImpl.java | 9 +
.../gslb/GlobalLoadBalancingRulesServiceImpl.java | 11 +
.../configuration/ConfigurationManagerTest.java | 4 +-
.../com/cloud/network/MockNetworkManagerImpl.java | 2 +-
.../cloud/network/UpdatePhysicalNetworkTest.java | 68 +++
.../cloud/vpc/MockConfigurationManagerImpl.java | 2 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 2 +-
setup/db/db/schema-410to420.sql | 4 +-
test/integration/component/test_accounts.py | 10 +-
.../component/test_allocation_states.py | 2 +-
test/integration/component/test_blocker_bugs.py | 8 +-
test/integration/component/test_egress_rules.py | 13 +-
test/integration/component/test_eip_elb.py | 3 +-
.../integration/component/test_network_offering.py | 5 +-
test/integration/component/test_project_configs.py | 6 +-
test/integration/component/test_project_limits.py | 4 +-
.../component/test_project_resources.py | 7 +-
test/integration/component/test_project_usage.py | 10 +-
test/integration/component/test_projects.py | 8 +-
test/integration/component/test_resource_limits.py | 4 +-
test/integration/component/test_routers.py | 5 +-
test/integration/component/test_security_groups.py | 9 +-
test/integration/component/test_snapshots.py | 8 +-
test/integration/component/test_templates.py | 3 +-
test/integration/component/test_usage.py | 10 +-
.../integration/component/test_vm_passwdenabled.py | 1 +
test/integration/component/test_volumes.py | 6 +-
test/integration/smoke/test_non_contigiousvlan.py | 125 ++++++
tools/apidoc/gen_toc.py | 1 +
tools/marvin/marvin/asyncJobMgr.py | 2 +-
tools/marvin/marvin/cloudstackConnection.py | 248 ++++++------
tools/marvin/marvin/cloudstackTestClient.py | 3 +-
tools/marvin/marvin/codegenerator.py | 4 +-
tools/marvin/marvin/deployDataCenter.py | 1 -
tools/marvin/marvin/jsonHelper.py | 11 +-
tools/marvin/setup.py | 1 +
ui/scripts/cloudStack.js | 6 +-
ui/scripts/regions.js | 308 ++++++++++++--
ui/scripts/system.js | 52 ++-
ui/scripts/zoneWizard.js | 16 +-
usage/pom.xml | 5 +
usage/src/com/cloud/usage/UsageServer.java | 16 +-
81 files changed, 1461 insertions(+), 682 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c5a54ed/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c5a54ed/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c5a54ed/server/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c5a54ed/tools/apidoc/gen_toc.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c5a54ed/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c5a54ed/tools/marvin/marvin/jsonHelper.py
----------------------------------------------------------------------
diff --cc tools/marvin/marvin/jsonHelper.py
index 5ceeac4,37363bc..5b492b1
--- a/tools/marvin/marvin/jsonHelper.py
+++ b/tools/marvin/marvin/jsonHelper.py
@@@ -107,13 -112,13 +107,12 @@@ def finalizeResultObj(result, responseN
return result
else:
return result
-
- def getResultObj(jsonResponse, responsecls=None):
- objDict = json.loads(jsonResponse)
- if len(objDict) == 0:
+
+ def getResultObj(returnObj, responsecls=None):
+ if len(returnObj) == 0:
return None
- responseName = filter(lambda a: a!=u'cloudstack-version', objDict.keys())[0]
- response = objDict[responseName]
+ responseName = filter(lambda a: a!=u'cloudstack-version', returnObj.keys())[0]
-
+ response = returnObj[responseName]
if len(response) == 0:
return None
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c5a54ed/tools/marvin/setup.py
----------------------------------------------------------------------
diff --cc tools/marvin/setup.py
index 8040c62,da138ce..eb61e54
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@@ -45,10 -45,9 +45,11 @@@ setup(name="Marvin"
license="LICENSE.txt",
install_requires=[
"mysql-connector-python",
+ "requests",
"paramiko",
- "nose"
+ "nose",
+ "factory_boy",
+ "should-dsl"
],
py_modules=['marvin.marvinPlugin'],
zip_safe=False,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c5a54ed/ui/scripts/zoneWizard.js
----------------------------------------------------------------------