Commit Graph

407 Commits

Author SHA1 Message Date
Alena Prokharchyk 6420ecbd6f Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
2012-07-24 16:13:06 -07:00
Alena Prokharchyk c99b1d104a Fixed broken unittest 2012-07-24 10:30:39 -07:00
Alena Prokharchyk 966c1b0ad8 VPC: when VPC router gets destroyed and recreated, plug public nic for each Vlan where VPC public ips belong to
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
Alena Prokharchyk 2b7ec3f4a8 VPC: one more fix for multiple public nic case for the VPC VR
Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
Alena Prokharchyk 5a64d4fbb1 VPC: CS-15638: Plug nic for the public ip address if the ip address from the diff vlan range than sourceNat ip
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
Alena Prokharchyk d51719ddc3 Fixed unittest 2012-07-17 15:50:56 -07:00
Alena Prokharchyk a1acfd3bfa Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
2012-07-13 13:52:58 -07:00
Alena Prokharchyk ad80f426a0 VPC: CS-15553 and CS-15549 - more checks during automatic ip assoc to VPC network
Conflicts:

	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-13 13:32:14 -07:00
Edison Su 8b7b838c8a CS-15544: recreate router if router filesystem is crashed 2012-07-11 16:14:28 -07:00
Alena Prokharchyk 697aa4589b VPC: unplugNic - release the nic in the DB only after the command is executed succesfully on the backend
Conflicts:

	api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-10 18:07:09 -07:00
Alena Prokharchyk 21519070fc VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManager.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-09 18:23:35 -07:00
Alena Prokharchyk 10dcc117c3 VPC: CS-15486 - prepare public nic as a part of VR deployment 2012-07-09 18:12:54 -07:00
Alena Prokharchyk 353423acec Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
2012-07-06 12:04:10 -07:00
Alena Prokharchyk 7acf8585b1 Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed
2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)

Conflicts:

	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
	api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
	api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
	api/src/com/cloud/api/commands/ListSnapshotsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	api/src/com/cloud/api/response/VolumeResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
	server/src/com/cloud/vm/dao/UserVmDaoImpl.java
2012-07-06 11:43:31 -07:00
Alena Prokharchyk 31f9d718fb Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
Alena Prokharchyk 580261119c VPC: corrected the name for PublicIp interface (mistakenly renamed it as a part of previous checkin)
Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-02 17:44:54 -07:00
Alena Prokharchyk 183633cf70 VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed)
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-02 17:44:54 -07:00
David Nalley e87558256c Patch from Chip Childers
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
Alena Prokharchyk 634cd78baa Merge branch 'master' into vpc
Conflicts:
	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/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript
2012-06-28 17:41:40 -07:00
Alena Prokharchyk 8be74c033f VPC: update ip address object after the ip is associated with the network 2012-06-25 21:00:12 -07:00
Sheng Yang ae32736151 Fix compile-tests 2012-06-21 12:25:06 -07:00
saksham f6d16d0ab5 CS-15018: Event USER.LOGIN should contain the client IP address. Changes made in accordance with the coding convention.
Reviewed-by: Alena Prokharchyk
2012-06-18 10:18:30 -07:00
Alena Prokharchyk 982562b9fb VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip)
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-15 14:31:58 -07:00
Alena Prokharchyk 7e119e4c94 Fixed addDhcpEntry/userdata/password in VPC setup 2012-06-15 14:27:24 -07:00
Alena Prokharchyk 0a7faa9838 Support for adding private network
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-15 14:20:34 -07:00
Alena Prokharchyk 929997f54e AssociateIpAddress to VPC - the ip gets associated to the network only when the first rule for the ip gets created.
When the last rule is removed for vpc ip, networkId is set to null

Conflicts:

	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	api/src/com/cloud/api/commands/EnableStaticNatCmd.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/rules/RulesService.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:18:24 -07:00
Alena Prokharchyk c56998e876 Support for IPAssoc inside VPC 2012-06-15 14:10:33 -07:00
Alena Prokharchyk f28cefc4c3 Added support for network shutdown in VPC guest networks 2012-06-15 14:07:59 -07:00
Alena Prokharchyk d9fd7e02a5 Plug nic support
Conflicts:

	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
2012-06-15 14:07:46 -07:00
Alena Prokharchyk f4060c3c1d 1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support
2) Added services api support for plugging/unplugging the nics to VpcElement

Conflicts:

	api/src/com/cloud/network/NetworkService.java
	core/src/com/cloud/vm/VMInstanceVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:04:09 -07:00
Alena Prokharchyk ab680bc30c Start Virtual Router as a part of VPC start
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
2012-06-15 13:57:00 -07:00
Alena Prokharchyk 7092532ae8 CS-15220: fixed db upgrade for networks using external devices
Reviewed-by: Sheng Yang

Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java

Conflicts:

	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-05 15:10:49 -07:00
Sateesh Chodapuneedi c59d5415ad CS-9919 Support for Nexus Swiches (Cisco Vswitches)
Description:

	Portprofile shaping policies will be fetched
	from nexus vswitch instead of vcenter.
	ACLs and Policies won't be synced to vCenter.
	Get physical network label while adding cluster.
	Cleanup.

Conflicts:

	core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-05-25 17:44:02 -07:00
Alena Prokharchyk d11dceaccc CS-14904
Fixed the bug where vm_instance.ha_enabled wasn't updated during service offering upgrade

Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
2012-05-15 12:36:40 -07:00
Salvatore Orlando 2bf0c7f7ff CS-14605: OVS cleanup
Fix syntax errors in ConfigurationManager and Resource Manager test
2012-04-25 10:53:41 +01:00
Alena Prokharchyk a678988f33 CS-14622: fixed adding vlan range per account - associate it with the Guest network, not public
Conflicts:

	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-04-24 11:44:00 -07:00
David Nalley 59436be4ee fixing line endings in server 2012-04-07 20:13:10 -04:00
Alena Prokharchyk 2d1a6b0b35 bug 14615: deployVm can work 2 diff ways now: 1) Default way - create and start the vm. 2) Create the vm without starting it. Note that vm's volumes stay in Allocated state -not created on the backend till the point where vm starts
status 14615: resolved fixed
2012-04-06 11:30:48 -07:00
Alena Prokharchyk 1dc99a17eb Fixed unittest 2012-04-04 16:13:51 -07:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Kelven Yang 0f34744c9e bug 14301: Decouple synchronized crosss management server call with clustering transport. Reviewed-by: Kelven 2012-03-27 16:01:54 -07:00
Alena Prokharchyk ce8e9a9f51 bug 14500: set default value for is_system field as a part of 3.0 to 3.0.1 upgrade
status 14500: resolved fixed
reviwed-by: Frank Zhang

Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
	setup/db/db/schema-30to301.sql
2012-03-26 10:27:15 -07:00
frank 3773b52b2f add cleanup.sql to DB upgrade test 2012-03-19 14:36:57 -07:00
Alena Prokharchyk c01ed2f754 Added upgrade path from 3.0.x to 3.0.1 2012-03-19 13:38:38 -07:00
frank ea007f833f use fake.sql for db upgrade test 2012-03-19 13:06:43 -07:00
Alena Prokharchyk 4f741c833c bug 14170: issues #1-#3 are fixed 2012-03-07 13:37:16 -08:00
kishan 637b228130 Bug 14081: Added 3.0.0 templtae upgrade support. Added unit test case and DB dump
Status 14081: resolved fixed
Reviewed-By: Abhi
2012-03-05 17:25:38 +05:30
Alena Prokharchyk fa0e25d146 bug 14080: do EQ instead of LIKE search when search for duplicated users during the user update
status 14080: resolved fixed
2012-03-01 15:11:46 -08:00
Kelven Yang 5aade501dc fix merge conflicts 2012-02-28 17:06:23 -08:00
Kelven Yang 52ebf15e7c Console proxy refactoring incremental check-in - new VNC protocol implementation 2012-02-28 17:03:38 -08:00
Alena Prokharchyk 2eaefc4aa8 Fixed unittest and some issues with 2.2.14-3.0 upgrade 2012-02-28 15:17:14 -08:00
Alena Prokharchyk 2e9511e2ae Changed isElastic to isSystem for the publicIpAddress assigned during the vm deployment in EIP enabled network
Reviewed-by: Chiradeep
2012-02-21 15:39:49 -08:00
Alena Prokharchyk 13f4d92d2a bug 13813: fixed network offering search to use traffic type when locate physical network in the zone
status 13813: resolved fixed
Reviewed-by: Frank
2012-02-16 10:40:00 -08:00
Sheng Yang 3a37ab6772 bug 13715: Modify changeCidr parameter of updateNetwork API
We expect user to use following sequence when update virtual router provided
network offering to external firewall devices offering:
1. Shutdown all the user VMs.
2. Modify network to new offering.
3. Click "Allow CIDR change" in the pop-up dialog, which would pass
changeCidr=true to the updateNetwork API.

We would shutdown guest network before we update the network for new
offering(with changeCidr = true), in order to re-implement the network.

status 13715: resolved fixed

Reviewed-by: Alex
2012-02-14 19:34:23 -08:00
Alena Prokharchyk 5e9a15c07d bug 13708: make a search by traffic type when locate physical network in the zone
status 13708: resolved fixed
reviewed-by: Prachi Damle
2012-02-14 12:47:33 -08:00
prachi d0e63bc377 Bug 13099 - table physical-network-traffic-types needs to be updated when xen network device setting is modified in the global settings
Changes:
- DB upgrade changes
-- make the global setting hidden.
-- During upgrade set network labels from global config
2012-02-07 18:41:29 -08:00
Alena Prokharchyk cad392cd68 bug 13335: fixed listProjectInvitations by projectId
status 13335: resolved fixed
2012-02-07 13:16:27 -08:00
Alena Prokharchyk 1490e45a1c Fixed format style in a bunch of files (replaced tabs with spaces as a part of it) 2012-02-03 13:49:11 -08:00
Alena Prokharchyk 78f6fc9e43 bug 12361: Inermediate checkin to 2.2.14-3.0 db upgrade 2012-02-01 16:46:56 -08:00
Alena Prokharchyk 2f17d465dc Fixed 2.2.14-3.0 db upgrade for usage
Added unittest as well
2012-02-01 13:33:53 -08:00
Alena Prokharchyk 9219d4c41d bug 12361: more fixes to DB upgrade for network_offerings table
Added unittest for testing network offerings db upgrade
2012-01-30 11:20:13 -08:00
Alena Prokharchyk 8eed9004cd Fixed broken unittest 2012-01-27 14:44:34 -08:00
Alena Prokharchyk 6325d21c50 Get new elasticIp when releaseIpAddress is called for elasticIP of the vm 2012-01-19 13:58:35 -08:00
Alena Prokharchyk a8758d292e ElasticLB support in Basic zone.
When elb capability is enabled on the network offering, we:

1) on each createLB command:
* associate ip address to the LB rule owner
* create LB rule

2) on each deleteLb command:
* delete the rule
* disassociate ip address

The rule belongs to the owner, so proper usage events are generated
2012-01-19 13:57:37 -08:00
Alena Prokharchyk 83400cd15f bug 12776: if there are multiple objects involved in resource creation, verify that they belong to the same account
status 12776: resolved fixed
2012-01-17 13:40:37 -08:00
Alena Prokharchyk f0c4980dff bug 13110: use Ternary data structure when build search criteria
status 13110: resolved fixed
2012-01-16 14:15:28 -08:00
Sheng Yang 804cfaec46 Fix some testcases 2012-01-11 13:51:43 -08:00
Alena Prokharchyk adaea570e4 bug 12934: added name to physical network
status 12934: resolved fixed
2012-01-09 14:20:37 -08:00
Alena Prokharchyk c581506103 bug 12306: list* command revamp 2012-01-09 10:07:42 -08:00
Sheng Yang 89ca2fe48e bug 12656: Add restriction for network update and new rules
status 12656: resolved fixed
2012-01-05 21:08:41 -08:00
Alena Prokharchyk d4e0fbda83 bug 12686: added search by zoneId to the listNetworkOfferings 2012-01-04 12:31:59 -08:00
Alena Prokharchyk ba1f21c29e Unittest for db upgrade 2011-12-28 10:34:29 -08:00
Alena Prokharchyk 6fd49a265c Fixed unittest 2011-12-27 15:34:54 -08:00
Alena Prokharchyk ceb0a918a1 createTemplate/createSnapshot for project - allow to execute for Projects in Active state only 2011-12-19 16:20:40 -08:00
Prasanna Santhanam dac505194c Changes to PhysicalNetworkTrafficType to accomodate the simulator hypervisor type 2011-12-15 19:12:21 +05:30
prachi bab29c4207 Bug 12361 DB upgrade from 2.2 to Acton
- Changes to schema file schema-2214to30.sql: moved out cleanup to separate file, added some NAAS changes
- Added physicalNetwork setup to Upgrade2214to30.java data migration
- Unit test and sample file
2011-12-10 00:01:15 +05:30
Alena Prokharchyk 7b8287d323 bug 10804: Api and middle layer support for default route feature 2011-12-05 14:53:45 -08:00
Alena Prokharchyk a4773b7080 bug 12291: listVms - show non-project resources only if no projectId specified
status 12291: resolved fixed
2011-12-02 15:17:50 -08:00
Alena Prokharchyk 0effb82f82 bug 12295: fixed associateIpAddress for projects
status 12295: resolved fixed
2011-12-02 12:08:01 -08:00
Alena Prokharchyk 554946fe8b Allow networkDomain update for Shared networks 2011-11-30 10:34:58 -08:00
Alena Prokharchyk c2448b7bd4 list Providers by name and state 2011-11-29 09:59:43 -08:00
Alena Prokharchyk 102f460458 Fixed updateConfiguration - updateHostDetails used to swallow the exceptions 2011-11-28 11:52:45 -08:00
Alena Prokharchyk 00f6738e24 bug 12105: don't generate corresponding firewall rule for the pf/staticNat/lb rule in revoke state
Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/user/MockAccountManagerImpl.java
	server/test/com/cloud/vm/MockUserVmManagerImpl.java
2011-11-21 16:34:55 -08:00
Alena Prokharchyk 337c07c0d1 Default gateway service to sourceNat service in the API 2011-11-17 16:28:10 -08:00
Alena Prokharchyk 0a10e32d69 Fixed test client 2011-11-17 16:25:54 -08:00
Alena Prokharchyk 5571afa471 Virtual router elements: prepare nics only when VirtualRouter is a provider for at least one service in the network 2011-11-17 14:33:22 -08:00
Alena Prokharchyk 0bb325ac12 Call implement() and shutdown() methods for providers only when the provider serves a service for the network 2011-11-17 13:53:53 -08:00
Alena Prokharchyk 790b33bdfc More validation to network and network offering creation/upgrade 2011-11-16 14:53:38 -08:00
Alena Prokharchyk 450b19532a Fixed unit test 2011-11-16 13:20:53 -08:00
Alena Prokharchyk bb2a8cf7ea NaaS: added "subdomainAccess" parameter to domain level network object. The parameter defines whether the network can be accessed from the subdomains. If the parameter is not specified, it would be defaulted to allow.subdomain.network.access Global Config param 2011-11-14 18:13:47 -08:00
Alena Prokharchyk 87f5150e38 Basic zone is fixed and works with new NaaS now 2011-11-14 10:46:05 -08:00
Alena Prokharchyk f9b31e895a Fixed unittest 2011-11-11 14:32:25 -08:00
Alena Prokharchyk 2b04d0f6ff Fixed test client 2011-11-11 14:32:25 -08:00
Alex Huang ddbcd01f56 fixed up unit test 2011-11-11 14:15:13 -08:00
Alena Prokharchyk 039e09ce93 * Introduced aclType parameter for createNetwork command (can hold 2 values now: Account and Domain). This parameter defines the access control type to the network object. If it's account -
only owner of the network can access it; if it's domain - all accounts in the domain and domain children can have an access.
* aclType replaces 2 old fields: isShared and isDomainSpecific.
* All 2.2.x account specific networks will have aclType=Account; 2.2.x Domain specific networks - aclType=domain; 2.2.x Zone level networks - aclType=Domain with domainId = Root domain id
2011-11-10 18:34:56 -08:00
Alex Huang f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
alena 76a3bb7581 Fixed unittest 2011-11-07 16:28:31 -08:00
alena 3a845d2d75 Keep Service/Provider map per network as well as per networkOffering (to handle the case when there are multiple providers defined for the same service in the network offering, and only one is picked when the network is created) 2011-11-07 16:16:03 -08:00
alena 17a7b7cda4 listNetworkOfferings: added an ability to filter based on the Services supported 2011-11-07 10:53:28 -08:00
alena a32c4f1ec6 Fixed unit tests 2011-11-03 14:02:53 -07:00
alena 9e5a733a34 Fixed NPE in updateNetwork - userCaller wasn't passed in to restartNetworkElements call 2011-11-03 10:53:19 -07:00
Kelven Yang 7e9b210d5c bug 6745: Fix problems in Async create commands 2011-11-03 07:34:02 -07:00
alena 2250dff349 1) Removed tags from the network object
2) Get hypervisor tags from the physical network instead.
2011-11-01 17:42:06 -07:00
alena 9560e92015 physicalNetworkId is optional in createNetwork api. Works as follows:
* can be specified for Shared network only
* if not specified for the Shared networks, try to locate it based on the zoneId and tags. If tags is not null, pick up first physicalNetwork from the zone that has matching tags. If tags is null, and there are none/more than 1 physical netwroks in the zone, error out.
2011-11-01 15:49:39 -07:00
alena b413a625f4 1) replaced joinProject API with updateProjectInvitation api. You can accept/decline the invitataion with this command
2) Added deleteProjectInviation command. Can be executed by project admin only
2011-10-27 18:32:00 -07:00
frank 9e88c40ab0 clean out various interface from agent manager to decent managers 2011-10-27 16:06:51 -07: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
alena 96843be30a Pass cleanup parametet to shutdown() method of the networkElement. Based on this parameter, the element can decide if it wants to destroy the instances, or just shut them down 2011-10-25 18:48:59 -07:00
alena 525a0a7675 1)Changed implementation for restart network: call shutdown/implement methods as a part of it
2)Re-apply all existing firewall rules as a part of implement call. TODO: Cleanup all existing rules from the backend (leave them in the DB) as a part of shutdown call
2011-10-25 18:24:24 -07:00
alena f6717e0a23 1) Method name change
2) Rely on SourceNatService when decide if DirectNetworkGuru and GuestNetworkGuru should handle the network
2011-10-24 17:30:14 -07:00
alena 219978a9be Create network using physical network id 2011-10-20 18:25:13 -07:00
alena ceda05298e Deprecate guestIpType in networkOffering api. Use type (Shared/Isolated) instead 2011-10-19 16:38:39 -07:00
alena c00058adc2 Added type (Shared/Isolated) to the networkOffering/networks 2011-10-13 17:33:41 -07:00
frank 88b863d6e3 Bug 11522 - New agent manager
Initialize unit test case for resource manager
2011-10-07 15:51:24 -07:00
frank 0f5384d086 Bug 11522 - New agent manager
move findxxx interface from HostDao to Managers
2011-10-06 11:56:17 -07:00
frank 24b82a7a89 Bug 11522 - New agent manager
call SearchCriteriaService interface instead of SearchCriteria2 instance
2011-10-06 10:32:07 -07:00
frank 2b0afe505d Bug 11522 - New agent manager
refine SearchCirteria2
2011-10-05 16:49:47 -07:00
alena 25c2734e03 More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project 2011-10-05 13:24:25 -07:00
alena 998568283c Don't allow to add accounts to the domain of type Project
Don't allow to manipulate (delete/update) accounts/domains of type Project
2011-10-05 13:24:25 -07:00
frank 683113cc38 Bug 11522 - New agent manager
get rid of all secondary storage interface from HostDao, instead, put them in
SecondaryStorageVmManager using SearchCriteria2 with decent name
2011-10-03 11:21:34 -07:00
frank 3947c9a126 Bug 11522 - New agent manager
Initailize SearchCriteria2 in order to replace search interface of DAO
2011-10-03 10:32:27 -07:00
frank a1193149a0 Bug 11522 - New agent manager
renamce updateResourceState to resourceStateTransitTo
2011-09-29 11:58:41 -07:00
alena ccd47c1b21 Implemented Project Invitations 2011-09-26 17:47:20 -07:00
frank e8c3ff653d Bug 11522 - New agent manager
move maintanenceFailed to ResourceManager
2011-09-23 16:54:28 -07:00
frank 95dbf2ac73 Bug 11522 - New agent manager
move updatePassword to ResourceManager
2011-09-23 15:48:06 -07:00
frank 7c5d3597a9 Bug 11522 - New agent manager
move cancelMaintenanceMode to ResourceManager
2011-09-23 15:32:58 -07:00
Kelven Yang b06543a8db bug 11531: forget to include newly added JUnit test along with the fix, here it is 2011-09-22 16:22:24 -07:00
alena a1331d1cfc Intermidiate checkin to Project feature:
1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project
2011-09-20 18:35:28 -07:00
alena ba64010cb5 bug 11470: 1) fixed listResourceLimits 2) Fixed -1 to be treated as unlimited for all the resources
status 11470: resolved fixed
2011-09-19 09:47:07 -07:00
alena f6a79c603f bug 11036: resource count update is refactored
status 11036: resolved fixed

1) Use row locks instead of global lock when update resource_count table. When update resource_count for account, make sure that we lock account+all related domains
2) Insert resource_count records for account/domain at the moment when account/domain is created.
3) As a part of DB upgrade, insert missing resource_count records for all non-removed accounts/domains

Conflicts:

	core/src/com/cloud/alert/AlertManager.java
	server/test/com/cloud/agent/MockAgentManagerImpl.java
2011-09-13 10:47:36 -07:00
Chiradeep Vittal 9b424a762d fix compilation of mocks 2011-09-13 09:22:52 -07:00
Chiradeep Vittal 3cb4ad4934 Add more detail when unable to schedule cleanup
clean up tests for security group manager v2

move interval to listener -- allows it to be configurable if needed

fix mocks

Enhanced logging for security group manager (from zucchini)

fix merge issues

merge issues
2011-09-12 18:22:55 -07:00
Chiradeep Vittal 7e2c2c627f unit test for SG mgr v2 2011-09-12 18:20:22 -07:00
Chiradeep Vittal 4cd6a9217c Use hashset since it is 50% faster. we can use treeset when we support priority 2011-09-12 18:20:22 -07:00
Chiradeep Vittal 2fc782b8ba Add basic Mocks for some managers 2011-09-12 18:20:22 -07:00
Chiradeep Vittal abf4754503 New security group mgr WIP : memory based queueing 2011-09-12 18:20:22 -07:00
frank b3478c377e Full opensource 2011-08-23 19:52:19 -07:00
Chiradeep Vittal ec7c9a2f7e bug 10998: maintain lb id in map table
status 10998: resolved fixed
2011-08-05 17:37:11 -07:00
Chiradeep Vittal 0c408d8da5 handle elb vm restart 2011-08-04 22:05:48 -07:00
Chiradeep Vittal e5c4bf4e28 bug 10659: manage elb vms independently of virtualnetworkappliance. 2011-08-03 18:55:01 -07:00
Chiradeep Vittal fae6fa790c ELB VM: implement delete LB by deleting ELB vm
in the future we will manage a pool of vms more intelligently
2011-07-28 00:15:16 -07:00
Chiradeep Vittal b829cde18f track ip to vm mapping 2011-07-27 12:00:08 -07:00
alena 0d84cde633 bug 10409: added domainSuffix parameters to account/domain objects 2011-07-15 14:40:39 -07:00
Alex Huang 2cda9a91e6 bug 9651: missing changes 2011-06-14 11:11:24 -07:00
Alex Huang 9c72759007 bug 9651: update network working now 2011-06-09 11:54:47 -07:00
Alex Huang 575ac62926 bug 9651: propagating 3fd50fd8634958727f4c64c9d1fb7fa27e07e4c8 2011-06-08 15:58:01 -07:00
alena 8948c3dd84 1) listNetworks for domain level network case: fixed search to do multiple joins between the tables instead of querying all the data and making search for each entry.
2) Added new config parameter 'allow.subdomain.network.access' - default value is true. If it's set to false, the child domain can't use the network of the parent domain

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
2011-06-08 12:00:19 -07:00
alena 158807c877 Fixed unittest 2011-06-06 16:52:11 -07:00
Alex Huang d9e0bcfa1e bug 10126: Renamed getPodId() to getPodIdToDeployIn() 2011-06-03 22:17:08 -07:00
Alex Huang 8754f8fab8 bug 9651: checked in missing files 2011-05-31 10:27:50 -07:00
alena 5148725916 Fixed bunch of db upgrade bugs. 2011-05-18 17:38:49 -07:00
alena b963429063 Added upgrade from 224 to 225
Conflicts:

	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
2011-05-17 16:43:53 -07:00
Alex Huang ea9703997b proxy agent 2011-05-17 07:12:58 -07:00
Alex Huang eb4fd2fb53 Database upgrade from 2.2.2 to 2.2.4 was broken. 2011-05-16 16:32:08 -07:00
Kelven Yang 824f0586f7 Add manager context to CleanupMaid to allow management service access in cleanup() method 2011-05-02 18:28:38 -07:00
alena 11ef6bbbe2 bug 9638: fixed bunch of DB upgrade bugs
status 9638: resolved fixed

Conflicts:

	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	utils/src/com/cloud/utils/net/NetUtils.java
2011-04-28 18:30:40 -07:00
Kelven Yang 814fe02c59 Recalculate and update host used capacity (mem & cpu) in upgrade (2.1.x to 2.2.y)
Conflicts:

	server/src/com/cloud/upgrade/dao/Upgrade218to22.java
2011-04-28 10:11:01 -07:00
alena 485f7a10cc bug 9621: dbUpgrade - set reservation strategy to be Create for Guest Nics in Basic zone
status 9621: resolved fixed

Conflicts:

	server/src/com/cloud/upgrade/dao/Upgrade218to22.java
	setup/db/db/schema-222to224.sql
2011-04-27 22:51:56 -07:00
alena afa7d3f34d bug 9563: fixed DB upgrade from 2.2.2/2.2.3 to 2.2.4
status 9563: resolved fixed

Also added unittest for 2.2.2 to 2.2.4 upgrade

Conflicts:

	setup/db/db/schema-222to224.sql
2011-04-23 23:05:42 -07:00
Kelven Yang 6ed18b5583 Add keystore management and related JUNIT test case 2011-04-19 16:20:06 -07:00
Frank 92155522f2 Add license header to files 2011-04-14 11:23:14 -07:00
anthony 288a36d09f Merge branch '2.2.4'
Conflicts:
	api/src/com/cloud/configuration/ConfigurationService.java
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-21to22.sql
	setup/db/db/schema-222to224.sql
	utils/src/com/cloud/utils/exception/ExceptionUtil.java
2011-04-05 12:04:09 -07:00
Alex Huang 2230c24ab3 check in changes from 2.2.4 2011-04-05 11:01:35 -07:00
Alex Huang 075fba5899 stackmaid is now taskmanager 2011-04-05 10:17:22 -07:00
Alex Huang 04099a4950 bug 9311: changed instance_id to nic_id 2011-04-05 09:12:55 -07:00
Alex Huang 7ce3e22d36 bug 9259: added upgrade test suite 2011-04-01 17:01:53 -04:00
Alex Huang 8b34065623 bug 9259: added upgrade test suite 2011-04-01 10:32:23 -07:00
kishan 7f08061e72 Added missing semi-colon and corrected usage unit test error messages 2011-04-01 12:06:52 +05:30
kishan 9a29e1d926 Added missing semi-colon and corrected usage unit test error messages 2011-03-31 18:16:44 +05:30
kishan e276d3b7fb bug 7631: Convert unprocessed events to usage_events
status 7631: resolved fixed
2011-03-30 11:19:04 +05:30
kishan f06972b180 bug 7631: Convert unprocessed events to usage_events
status 7631: resolved fixed
2011-03-30 11:09:21 +05:30
alena 92f01ba143 2.1.x to 2.2.2 upgrade for Domain level vlans 2011-03-25 15:23:18 -07:00
Alex Huang 109c4eae0e restarting domr is close to working 2011-03-21 17:56:00 -07:00
alena abb2e2b2ff bug 8831: partial checkin for Domain specific Networks (includes DB changes) 2011-03-21 15:05:07 -07:00
alena 505848bbbe Fixed unittest 2011-03-21 10:29:11 -07:00
Alex Huang d7e0f8dcc1 db upgrade 2011-03-19 10:33:13 -07:00
Alex Huang 82f7504832 checking in the upgrade stuff for now 2011-03-19 09:27:10 -07:00
alena 10077be555 DB upgrade for LB rules 2011-03-17 11:52:23 -07:00
Alex Huang b18b2a68b1 fixed unit test 2011-03-17 10:40:59 -07:00
alena 7eb20f8133 DB upgrade for port forwarding rules 2011-03-16 18:19:02 -07:00
Alex Huang 8bec1e0b9f added the concept of system integrity checking before a system starts 2011-03-16 17:59:34 -07:00
Alex Huang b6f4ff33ca domr upgraded 2011-03-11 16:53:01 -08:00
alena e25fbe3a89 bug 8885: enableAccount - account/domainID are required parameters now
status 8885: resolved fixed
2011-03-09 09:31:39 -08:00
alena a50950bbef 221 to 222 DB upgrade for InstanceGroup. Unit test is included 2011-03-09 08:34:08 -08:00
anthony c013d0a6c6 fixed unit test 2011-03-08 20:04:28 -08:00
anthony 5781aafdcb fixed upgrade unittest 2011-03-08 18:24:11 -08:00
alena fe267c2cb2 Basic zone 221 to 222 DB upgrade. Unit test is included 2011-03-08 15:32:55 -08:00
Alex Huang f7ea6e17cd break upgrade fix upgrade 2011-03-04 18:07:26 -08:00
Alex Huang 40db230095 more changes for db upgrade 2011-03-04 11:09:24 -08:00
Alex Huang d0a5816999 Added Premium upgrade 2011-03-01 23:47:36 -08:00
Alex Huang e3438d2ff0 upgrade data center is done. 2011-02-28 17:59:02 -08:00
Alex Huang ab3c719389 run the scripts 2011-02-28 14:37:30 -08:00
Alex Huang 378a0da0df more unittest support 2011-02-25 11:58:12 -08:00
Alex Huang c22b37e402 latest work on db migration 2011-02-22 18:23:05 -08:00
Alex Huang c6efb2b09d bug 8529: propagated to master. Added junit test support to ant 2011-02-16 17:40:59 -08:00
Kelven Yang ddda5fc431 Cleanup of worker VMs left over from previous session in a reliable way 2011-01-31 17:41:07 -08:00
Kelven Yang 8a263f34ba Fix jUnit reference issue in test project for Eclipse 2011-01-05 03:58:47 -08:00
Kelven Yang ea88089fd2 Bug 7409: Implement forcely-cancelling mechenism for jobs that have been staying in queue for too long
1) introduced a global configuration variable job.cancel.threshold.minutes
2) Default value for the job.cancel.threshold.minutes is 60 minutes, if a job has been staying in processing state for over 60 minutes, system will forcely remove it from the queue to allow others to run
2011-01-05 15:44:10 -08:00
Kelven Yang 7a66300fc9 Update test to avoid eclipse compiling error 2010-12-30 21:07:00 -08:00
Kelven Yang dca59ce324 Disable IPAddress test case as couldn't follow on the rapid ever changing code refactoring of its dependent classes 2010-12-06 14:50:45 -08:00
Kelven Yang bb5d00fb7f Fix test code broken by changes in IPAddressDao 2010-12-06 09:49:56 -08:00
Alex Huang d38f7fd56d Moved DAO to server 2010-11-22 07:40:41 -08:00
alena 1c24deda34 1) Refactored current Apis not to use reflection for method invocation. In new version following has to be done:
* Implement callCreate() and execute() methods in apis extending BaseAsyncCreateCmd (example - CreateVolumeCmd)
* Implement execute() method in apis extending BaseCmd and BaseAsyncCmd (example - deleteVolumeCmd and deleteUserCmd)

We no longer need createMethod(), method(), manager() fields in @Implementation annotation, cleanup has to be done.

2) Moved Account/User related methods to AccountManagerImpl. Methods are exposed via AccountService interface.
3) Enhanced exception handing for Api calls.
4) Created ConfigurationService interface, all Api config methods are exposed via it.
2010-11-08 11:27:36 -08:00
Alex Huang 560d7a275e Removed InternalErrorException. Renamed the lock methods on the DAO objects to be more understandable. 2010-11-02 12:25:08 -07:00
Kris McQueen d7b6ccd056 Comment out code in executors during the transition to the new API framework. The code is being left around for reference during testing/debugging of the new framework and will be removed in the future. 2010-09-17 11:13:29 -07:00
Kris McQueen df10af0688 cleaning up imports, fixing up some compilation problems related to API refactoring 2010-09-13 15:25:46 -07:00
Manuel Amador (Rudd-O) 05c020e1f6 Source code committed 2010-08-11 09:13:29 -07:00