7706a9c32f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-31 13:37:28 -07:00
911261a2ce
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-07-31 16:40:04 +05:30
b4b1a38f7e
Fix typo in create-schema.sql. comma at EOL
2012-07-31 16:39:50 +05:30
420f08ab4a
Add changes in rrq 5839 to the update script
2012-07-31 09:41:14 +02:00
894407caa9
rrq 5839: This table should not have a contraint on device and physical network id. This is dealt with in the code and by using the removed field.
2012-07-30 08:46:56 +02:00
5789cd94a5
setup: Update 3.0.3 to 4.0.0 SQL update file
...
I noticed that we have pending changes for the resource tags and Nicira integration.
Adding them as a precaution, so they don't get lost.
2012-07-27 23:37:45 -04:00
72a4b2f410
S2S VPN: Add name field for customer gateway
...
Easier for user to identify the correct gateway
2012-07-27 16:27:36 -07:00
a39fd61249
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineGuru.java
2012-07-27 13:47:46 -07:00
38a140ecb4
setup: Update 3.0.3 to 4.0.0 SQL update file
...
I noticed that we have pending changes for the resource tags and Nicira integration.
Adding them as a precaution, so they don't get lost.
2012-07-27 08:53:44 +02:00
bf2e3d6ae1
setup: Initiate SQL upgrade file from 3.0.3 to 4.0.0
...
This only adds the user_info column to the storage_pool table, but we'll probably have more SQL changes coming up.
They can all go into this file.
2012-07-26 23:03:34 +02:00
406fd95d87
Add RBD support for primary storage
...
This patch adds RBD (RADOS Block Device) support for primary storage in combination with KVM.
To get this patch working you need:
- libvirt-java 0.4.8
- libvirt with RBD storage pool support (>0.9.13)
- Qemu with RBD support (>0.14)
The primary storage does not support all the functions of CloudStack yet, for example snapshotting is disabled
due to the fact that backupping up a RBD snapshot is not possible in the way CloudStack wants to do it.
Creating templates from RBD volumes goes well, creating a VM from a template however is still a hit-and-miss.
NFS primary storage is also still required, you are not able to run your System VM's from RBD, they will need
to run on NFS.
Other then these points you can run instances with RBD backed disks.
2012-07-26 22:22:26 +02:00
7d68e33323
S2S VPN: Use source NAT ip address for VPN gateway
...
Conflicts:
api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-23 14:44:05 -07:00
671475242c
S2S VPN: Add domain and account for VPN
...
Admin can add VPN connection for others
Conflicts:
api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
server/src/com/cloud/api/ApiResponseHelper.java
setup/db/create-schema.sql
2012-07-23 14:40:26 -07:00
52c145dc46
CS-15470: Remove UNIQUE keyword for some fields
...
User can create/delete/create gateway again and again, then it would no longer
be unique. The unique should be guaranteed by API level.
2012-07-23 14:36:22 -07:00
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
79c7da07ab
Phase 1 of Nicira integration
2012-07-11 17:16:06 -07:00
7cb4ab5e60
VPC: added State to vpc_gateways
2012-07-11 12:05:42 -07:00
911ed25fbc
Merge branch 'master' into vpc
2012-07-09 18:31:28 -07:00
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
fa414bbf0a
It's due to replace.properties is missing, by default the password is cloud for user cloud
...
Revert "removing unneeded password from cloud-dev setup-script"
This reverts commit f157b702e4
2012-07-09 11:48:43 -07:00
f157b702e4
removing unneeded password from cloud-dev setup-script
2012-07-08 22:14:20 -04:00
63d6941bdc
ResourceTags: respect tag parameter in listTemplates/listIsos commands
...
Conflicts:
server/src/com/cloud/storage/dao/VMTemplateDao.java
server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
2012-07-06 16:59:14 -07:00
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
85677b71fe
Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value
...
Conflicts:
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
server/src/com/cloud/projects/dao/ProjectDaoImpl.java
2012-07-06 11:43:31 -07:00
d33429783f
Fixed deploydb
2012-07-06 11:18:16 -07:00
234ae447ee
VPC: added field networkacl_service_provided to physical_network_service_providers table
2012-07-06 11:08:39 -07:00
27e9cdbece
add console proxy support for devcloud
2012-07-03 23:38:39 -07:00
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
57927c9f23
From: jason.bausewein@tier3.com
...
Updated script to create cloud_usage database similar to deploy-db-dev.sh.
2012-07-03 15:16:51 -07:00
b565f63e42
VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation)
...
Conflicts:
api/src/com/cloud/api/ResponseGenerator.java
server/src/com/cloud/api/ApiResponseHelper.java
2012-07-02 17:44:28 -07:00
78b31bb7db
CS-6840: Add tables for site to site VPN use.
2012-07-02 16:20:53 -07:00
1f01d923ca
Merge branch 'master' into vpc
2012-06-28 17:44:08 -07:00
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
c19639e4a2
Static route can be created for generic VpcGateway now, not just Private gateway
2012-06-28 17:17:44 -07:00
5f6387e113
add clouddev
2012-06-27 23:28:34 -07:00
fc3ac862dc
applying the commits from Chip Childers licensing cleanup
2012-06-26 10:44:04 -04:00
ce876e24de
VPC: intermidiate checkin to Static Routes
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-06-25 21:00:57 -07:00
d35eb73c9b
VPC: initial checkin for Static Routes
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-25 20:59:33 -07:00
030458a37b
VPC: implemented add/delete Private gateway
...
Conflicts:
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/dc/DataCenterVO.java
server/src/com/cloud/network/NetworkManagerImpl.java
2012-06-25 20:54:14 -07:00
5697ff2baf
CS-15181: Remove stale global config parameters from upgrade script
...
Description:
Removing stale global config params.
2012-06-21 13:55:52 -07:00
374a600746
VPC: initial checkin for network ACLs
...
Conflicts:
client/tomcatconf/commands.properties.in
2012-06-20 17:19:49 -07:00
62d45b9670
Initial checkin for resource tags feature
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/uuididentity/dao/IdentityDao.java
server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
setup/db/create-schema.sql
2012-06-20 15:45:08 -07:00
c6364dfdf0
Fixed create-schema.sql
2012-06-15 14:27:14 -07:00
aa84256542
1) Added VpcVirtualNetworkApplianceService interface
...
2) Pass dns1/dns2 to setupGuestNetworkCommand
3) Network implement - don't get source nat ip address for Vpc if it already has one
2012-06-15 14:27:00 -07:00
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
9ec8526281
1) Added VPC restart support - new api command RestartVPC. The purpose of the call is to shutdown and start VPC including VPCVirtualRouter restart, rules re-implement, etc
...
2) Only networks created from offerings with conserveMode=false, can participate in VPC
2012-06-15 14:10:09 -07:00
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
9debd3a5df
1) Added start logic to the VPC
...
2) VirtualRouterManagerImpl - refactored deployVirtualRouter method
3) Added vpcId to domain_router/user_ip_address tables and corresponding vo objects
Conflicts:
server/src/com/cloud/network/IPAddressVO.java
2012-06-15 13:56:05 -07:00
afd2d0331f
Set networkId as a join parameter in DomainRouterDaoImpl as networkId was moved to the helper table
2012-06-15 13:55:01 -07:00
998cf66e6c
Removed network_id reference from domain_router table as now VirtualRouter can be associated with multiple networks (VPC case). Code modifications were done accordingly to the places where this field was used.
...
Router->Networks (one to many) are held in router_network_ref table now
2012-06-15 13:54:48 -07:00
Alena Prokharchyk
Prasanna Santhanam
Rohit Yadav
Hugo Trippaers
Wido den Hollander
Sheng Yang
Edison Su
David Nalley
Vijayendra Bhamidipati