f013c28536
Fixed unittest
2012-06-21 15:43:02 -07:00
aaf0d24a83
Merge branch 'vpc-3.0.x' into 3.0.x
...
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/AssociateIPAddrCmd.java
api/src/com/cloud/api/commands/EnableStaticNatCmd.java
api/src/com/cloud/event/EventTypes.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/rules/RulesService.java
client/tomcatconf/commands.properties.in
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
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/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java
setup/db/create-schema.sql
wscript
2012-06-14 19:04:59 -07:00
9c01ca2785
VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip)
2012-06-12 10:58:20 -07:00
3b943d84dd
Fixed addDhcpEntry/userdata/password in VPC setup
2012-06-11 13:37:38 -07:00
460bab4a7d
Support for adding private network
2012-06-05 10:57:29 -07:00
e0723cd9cc
CS-15220: fixed db upgrade for networks using external devices
...
Reviewed-by: Sheng Yang
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-04 19:21:35 -07:00
aa0c0cb260
Added support for network shutdown in VPC guest networks
2012-05-24 15:33:52 -07:00
978c2f414a
Initial checkin for VPC feature:
...
1) Added API frameworks for the feature. New commands:
* CreateVPCCmd
* ListVPCsCmd
* DeleteVPCCmd
* UpdateVPCCmd
* CreateVPCOfferingCmd
* UpdateVPCOfferingCmd
* DeleteVPCOfferingCmd
* ListVPCOfferingsCmd
2) New db tables:
* `cloud`.`vpc`
* `cloud`.`vpc_offerings`
* `cloud`.`vpc_offering_service_map`
and corresponding VO/Dao objects.
Added vpc_id field to `cloud.`networks` table - not null when network belongs to VPC
3) New Manager and Service interfaces- VpcManager/VpcService
4) Automatically create new VpcOffering (if doesn't exist) on system start
5) New Action events:
* VPC.CREATE
* VPC.UPDATE
* VPC.DELETE
* VPC.OFFERING.CREATE
* VPC.OFFERING.UPDATE
* VPC.OFFERING.DELETE
2012-05-17 18:08:03 -07:00
05609b9074
CS-14904
...
Fixed the bug where vm_instance.ha_enabled wasn't updated during service offering upgrade
2012-05-15 12:35:48 -07:00
72d284de7d
Switch to Apache license
2012-04-03 04:54:14 -07:00
f9b31e895a
Fixed unittest
2011-11-11 14:32:25 -08:00
ddbcd01f56
fixed up unit test
2011-11-11 14:15:13 -08:00
f6fcaa49ec
Merge complete except for virtualnetworkappliancemanager
2011-11-10 15:18:16 -08:00
a32c4f1ec6
Fixed unit tests
2011-11-03 14:02:53 -07:00
3947c9a126
Bug 11522 - New agent manager
...
Initailize SearchCriteria2 in order to replace search interface of DAO
2011-10-03 10:32:27 -07:00
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
2fc782b8ba
Add basic Mocks for some managers
2011-09-12 18:20:22 -07:00
Alena Prokharchyk
frank
Alex Huang
alena
frank
Chiradeep Vittal