Commit Graph

71 Commits

Author SHA1 Message Date
Prasanna Santhanam 94eac37d30 The HTTPConnection object times out too soon when status is being polled. This
depends on python's internal socket implementation. Added an explicit 3m
timeout. Test code MUST NOT induce sleeps longer than 3m, instead check status
periodically to keep the HTTPConnection alive.
reviewed-by: Chirag Jog <chirag@clogeny.com>
2012-02-23 18:35:15 +05:30
Prasanna Santhanam 2a8bdb0c4c Propagating fixes to testClient from 3.0.x. Resolving conflicts
reviewed-by: Prasanna
2012-02-20 19:00:22 +05:30
Prasanna Santhanam 1b8a23f5be Multiple fixes to the testClient to accomodate further changes to 3.0 APIs
reviewed-by: Kishan
* Revert back to old guestCidrAddress
* Add default traffic types
* fixed typo when creating physical network, specifid wrong zone
* correctly specifying the guest VLAN as part of updating physical network
2012-02-20 18:23:46 +05:30
Prasanna Santhanam 0b9a3ddb2e fixing the case when multiple zones are added. enable the right VR element
Reviewed-By: Kishan
(cherry picked from commit 23357f3b17ea87ae51b9be06a1c19ec782a661a6)
2012-02-20 18:21:57 +05:30
Prasanna Santhanam a424429090 Enable security groups in basic zones only
(cherry picked from commit 7ea0ace472f863374c9a0b8559065a90190e6f61)
2012-02-20 18:21:45 +05:30
Prasanna Santhanam 75c780a0c9 fixing the case when multiple zones are added. enable the right VR element
Reviewed-By: Kishan
(cherry picked from commit 23357f3b17ea87ae51b9be06a1c19ec782a661a6)
2012-02-18 20:23:43 +05:30
Prasanna Santhanam 7f72de368d Enable security groups in basic zones only
(cherry picked from commit 7ea0ace472f863374c9a0b8559065a90190e6f61)
2012-02-18 20:23:43 +05:30
Prasanna Santhanam 573cab407e Enable the zone after successful add 2012-02-18 20:23:42 +05:30
Sam Robertson 0411aad813 use temp tomcat directory for automated testing 2012-02-08 16:35:01 -08:00
Sam Robertson 5ce1a0cba3 Updating CATALINA_HOME used for automated testing environment 2012-02-08 15:06:02 -08:00
Sam Robertson dadf25cca4 use /usr/share/tomcat, not /usr/share/cloud 2012-02-07 09:30:03 -08:00
Sam Robertson 113a2f2fe8 Adding automated.sh, removed failed attempt at setting CATALINA_HOME in ant build configuration 2012-02-07 08:52:01 -08:00
Sam Robertson 4acfc2eb1d automated testing changes, in addition to an automated.xml 2012-02-03 16:59:20 -08:00
Prasanna Santhanam d99e71bad4 update a Disabled Physical network 2012-01-20 18:33:49 +05:30
Prasanna Santhanam 0b69a252de uniform quotes 2012-01-15 19:21:58 +05:30
Prasanna Santhanam a2059cf1c1 when the API response has empty list 2012-01-15 19:21:08 +05:30
Prasanna Santhanam d45e065941 Enable VirtualRouter provider by default in the zone 2012-01-15 19:19:35 +05:30
Prasanna Santhanam 05aa61432b Fixing the framework for 3.0 /Acton API
* changes for bug 12964 - physical network creation is separated from createZone
* removed redundant comments
* PEP8 Compliance
2012-01-14 19:29:46 +05:30
Prasanna Santhanam 659810d5a8 no more guestcidr in createZone 2012-01-14 19:29:46 +05:30
Prasanna Santhanam 9c8f989d6b typos and other fixes 2011-12-29 17:28:58 +05:30
Prasanna Santhanam e9b861432a typos and other fixes 2011-12-29 17:28:58 +05:30
Prasanna Santhanam b82d88d1d2 basic zone setup template 2011-12-29 17:28:58 +05:30
Prasanna Santhanam d842119dc4 Fixing the framework for 3.0 /Acton API
* zones now have to be configured with physical networks and providers
* enabling the virtual router and configuring it are sperate API action
* create networks of shared type with SG network offering is done implicitly
2011-12-29 17:28:58 +05:30
Prasanna Santhanam eaf57eb847 providers are in a list iterable 2011-12-29 17:28:58 +05:30
Prasanna Santhanam 431b571908 property files for simulator and basic zone setup 2011-12-29 17:28:58 +05:30
Prasanna Santhanam 18f865fc3e Reviving the simulator
* SSVM to act as a direct connect agent
* Storage Resources handle SSVM commands
* create-schema.sql already has simulator_network_label. removing the label from create-schema-simulator.sql
2011-12-19 15:03:19 +05:30
Prasanna Santhanam dc944cd4dd skip config files from repo 2011-12-15 19:12:21 +05:30
Prasanna Santhanam 206077aec2 kvm and xen are already part of sandbox/advanced 2011-12-05 21:51:38 +05:30
Prasanna Santhanam d5424b0d31 kvm and xen are already part of sandbox/advanced 2011-12-05 21:51:38 +05:30
Prasanna Santhanam 0b1ca708bb - configure the virtual router element for advanced networks only
- enable all service providers created in  a zone
- TODO: basic networking and optionally selecting providers enabled
2011-11-30 17:42:41 +05:30
Prasanna Santhanam 06dda10f31 - when de-serializing back to python from json, python attribute must be built
from dicts only, lists and tuples which don't contain dicts will be directly
set to the attribute
- eg: listnetworkserviceproviderresponse : servicelist = ['vpn', 'dhcp',
  'firewall'] contains no name,value combination to make attributes. So we make
self.servicelist = ['vpn','dhcp','firewall']
2011-11-30 17:42:40 +05:30
Prasanna Santhanam 3db3b92e2b - some quick environment configuration files
- adding service providers for zone configuration
- getting the python framework working with providers
2011-11-29 23:30:38 +05:30
Sam Robertson d684dd86e1 Added more reporting, Fixed bug with setting globals, Added info to README, minor tweaks 2011-11-20 18:04:55 -06:00
Sam Robertson b4ddcfbe48 Cleaning up stuff, reorganizing parser into a class to make it more manageable 2011-11-08 17:11:44 -08:00
Sam Robertson 3bdb5af2e2 initial checkin translator script to convert xml to python 2011-11-06 20:59:07 -08:00
frank cef30956e9 Merge branch 'newagentmgr'
Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java
2011-10-27 11:09:56 -07:00
Edison Su 92eaf49f29 Add storage migration 2011-10-24 15:59:47 -07:00
frank 4e595d04ab Bug 11522 - New agent manager
1.load hosts that in maintenance mode because maintenance is no longer an agent status now
2.don't disconnect agent when entering maintenance mode, again it's no longer an agent status now
2011-10-19 17:51:20 -07:00
frank 58fefd2891 Bug 11522 - New agent manager
initialize simulator test case
2011-10-18 17:58:15 -07:00
Prasanna Santhanam dc7ac31dce 1. correcting the global property 2. handling the case if unittest2 is present
(cherry picked from commit d1b71859c0d6bb054d64f38b7bc6f11d37bd1725)
2011-08-29 18:44:57 +05:30
Edison Su db8341bb35 testClient: add timestamp for sync job 2011-08-25 18:56:28 -07:00
Edison Su c8dafa8628 add missing files 2011-08-25 18:56:24 -07:00
Edison Su 9777b7d193 testclient: fix fix asyn job query for sync command 2011-08-25 18:56:20 -07:00
Edison Su f8aaf1a126 TestClient: use json instead of painful XML 2011-08-25 18:56:05 -07:00
Prasanna Santhanam 81366d35c1 a. Test Discovery is only found in python 2.7+. unittest2 makes it backwards compatible for python 2.4-2.6
b. Adding traceback from pymysql to debug problems in connecting with database
(cherry picked from commit 81218d718af0ec101f7ba424c62bb6e0b5642744)
2011-08-25 19:52:30 +05:30
Edison Su 9391938908 fix conflict 2011-08-24 18:47:09 -07:00
Edison Su 4393162ecd TestClient: fix npe 2011-08-24 10:48:26 -07:00
Edison Su ac826a721e TESTClient: async job threads can exit after job pool is empty 2011-08-23 11:45:12 -07:00
alena 8a7feb8ec1 Merge branch '2.2.y'
Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java
2011-08-22 20:28:30 -07:00
Edison Su 3ccc790b1d add sample code to config advanced zone 2011-08-19 18:06:11 -07:00