ce12d0d70d
Submit Midokura SDN controller stubs
2012-08-13 18:55:11 +05:30
4161cea5df
CS-15833: PrepareForMigrationCommand extends Command
...
PrepareForMigrationCommand which was extending StartCommand wrongly now
extends the base Command only.
Signed-off-by: Prasanna Santhanam <Prasanna.Santhanam@citrix.com>
2012-08-13 16:23:16 +05:30
a50cf618ec
bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code.
2012-08-13 16:20:57 +05:30
17304b3910
Remove @author tag from non third-party source files in api folder
2012-08-13 15:17:22 +08:00
bf1123246a
VPC : typo in CreateNetworkACLCmd.java
2012-08-12 11:00:16 -07:00
b61468d65c
Merge branch 'master' into vpc
...
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2012-08-11 18:27:18 -07:00
263216caa5
Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage).
...
RB: https://reviews.apache.org/r/6470/
Send-by: shadowsor@gmail.com
2012-08-10 13:33:06 -07:00
6cddd1e767
Removed trailing whitespaces and fixed line endings in some files
2012-08-09 23:30:33 -07:00
97e4906d8c
Merged the file with the master branch
2012-08-09 23:30:33 -07:00
0d1393a2d3
Removed unsed imports
2012-08-09 23:30:11 -07:00
493c8d1190
Removed @author annotation from IpAssocCommand and IpAssocAnswer
2012-08-09 23:30:11 -07:00
c5e3493792
Merge branch 'master' into vpc
2012-08-08 18:38:35 -07:00
a1f361904e
Reverted "Initialize user context from AccountManager" committed to master branch by mistake
...
This reverts commit da26302049
2012-08-08 15:26:45 -07:00
057d6ccbb8
Name change for vpc/Dao package (dao is lowercased now)
2012-08-08 14:51:51 -07:00
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
da26302049
Initialize user context from AccountManager
...
Conflicts:
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-08 11:17:01 -07:00
46a12b378c
CS-15243: Add service combination check at create network offering
2012-08-07 13:17:48 -07:00
629556c708
Fixed UserContext initialization - got broken by unittest
2012-08-07 11:51:00 -07:00
bda1e2d08d
VPC: more unittests for VpcService
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:37:36 -07:00
972fe01aec
VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:21:53 -07:00
a8cbba9e82
S2S VPN: CS-15820: Remove account information of vpn gateway and vpn connection
...
The owner would be always same as VPC owner.
Conflicts:
api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
setup/db/db/schema-304to305.sql
2012-08-06 15:21:54 -07:00
70d704c786
S2S VPN: Allow name to be modified in updateCustomerGateway
...
Conflicts:
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
2012-08-06 15:20:33 -07:00
1b5103c501
S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime
2012-08-06 15:19:26 -07:00
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
237d91d4c9
Removed @author tags in some classes
2012-08-03 14:25:17 -07:00
3496a73878
VPC: CS-15812 - fixed listVPCs by projectId
2012-08-03 14:23:56 -07:00
e7a1862867
VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/ha/UserVmDomRInvestigator.java
2012-08-03 14:23:45 -07:00
3c68f1f8e8
bug CS-15200: Introducing state transition when volume is getting copied from secondary storage and it is put into Creating state
...
Reviewed-by: Kishan
2012-08-03 17:18:13 +05:30
9b43753399
VPC : handle Revoke rules for staticroute
2012-08-02 18:59:49 -07:00
bda8fc1e0c
Fixed api doc
2012-08-02 18:49:42 -07:00
0e0b75a041
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-08-02 18:45:37 -07:00
befd6dd0c6
listVirtualMachines: implemented search by templateId/isoId
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/commands/ListVMsCmd.java
2012-08-02 18:15:13 -07:00
d6df2fdc64
VPC: createPrivateGateway - added cleanup part happening in case when the gateway fails to be applied on the backend
...
Conflicts:
api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java
api/src/com/cloud/api/response/AsyncJobResponse.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-02 18:12:19 -07:00
ce9f1afa78
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
21e8fb372b
VPC: CS-15805 - verify vpc guest network cidr only against networks in the same vpc
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-01 19:02:43 -07:00
b92d2336ad
VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details:
...
http://wiki.cloudstack.org/display/RelOps/Inter-VLAN+Routing+functional+spec
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
2012-08-01 18:57:33 -07:00
5cbe3d9722
ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute
...
Conflicts:
api/src/com/cloud/api/commands/ListVPCsCmd.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/projects/dao/ProjectDaoImpl.java
server/src/com/cloud/uuididentity/dao/IdentityDao.java
2012-08-01 18:54:08 -07:00
7cceaae912
VPC: moved vpc related code from NetworkManager to VpcManager
...
Conflicts:
api/src/com/cloud/api/commands/AssociateIPAddrCmd.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/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-01 18:45:06 -07:00
ebe53a91d7
VPC: reduced visability for some vpc related methods
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-01 18:33:12 -07:00
e0c85c0d41
VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands
2012-08-01 18:19:03 -07:00
3f571684aa
CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above
...
Support for up to 16 VDIs per VM on XS 6.0 and above (16 VDIs => root + cd + 14 data volumes). Currently in CS number of data disk that can be attached to VM is hard-coded to 6. Made this setting configurable by moving it to hypervisor capabilities. Although XS 6.0 and above supports upto 16 VDIs but while testing on XS 6.0.2 found that only 13 data volumes can be attached to a VM. So for XS 6.0 and 6.0.2 max_data_volumes_limit is set to 13 currently.
Signed-off-by: Koushik Das <Koushik.Das@citrix.com>
2012-08-01 19:39:30 +05:30
640087b534
api license header fixes
2012-07-31 20:31:57 -04:00
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
67941f818d
S2S VPN: CS-15724: Show more parameter for listVpnCustomerGateways API
2012-07-30 15:52:23 -07:00
36fc2bd9b5
CS-15044:API changes and UI changes to provide option to view the name of the guestnetwork a virtual machine belongs
2012-07-31 02:57:46 +05:30
9e59342608
S2S VPN: Remove obelete guest_ip from updateCustomerGateway
2012-07-30 11:11:11 -07:00
236f63fd34
When cleaning up or setting ip associations the NiciraNvpElement should be ignored.
...
Implemented a generic ConnectivyProvider interface work around the dependency from server to nicira-plugin.
2012-07-30 15:17:35 +02:00
9611a017e9
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-07-27 23:37:46 -04:00
8eee8f342e
S2S VPN: CS-15650: Add connection status update to s2s vpn
2012-07-27 16:28:06 -07:00
786d5995df
S2S VPN: Add list function for normal users
2012-07-27 16:27:36 -07:00
736c4c1510
CS-15670: Allow normal users to configure S2S VPN
2012-07-27 16:27:36 -07: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
2fc1dc0df6
VPC : vpc integration code for XenServer hypervisor
2012-07-27 15:54:30 -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
468f2720eb
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-07-27 23:13:18 +05:30
3f4b7602f4
CS-15628: ip address id is required by createFirewallRule command
2012-07-26 13:36:35 -07: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
119e4e7443
VPC: CS-15681 - execute VPC related methods only when router is a vpc router
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-07-24 16:12:13 -07:00
46cd99f01e
VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones
2012-07-23 16:38:14 -07: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
230ce1dfee
S2S VPN: Add state for vpn connection response
2012-07-23 14:38:06 -07:00
4b0515f8e5
CS-15471: Fix wrong type of updating customer gateway lifetime
...
Also fixes one typo.
2012-07-23 14:36:10 -07:00
830901d7cc
cloudstack 3.0 API - listVpnConnections API - add gatewayIp, guestCidrList,ipsecPsk, ikePolicy, espPolicy, lifetime property (get it from customerGateway object).
2012-07-23 14:21:10 -07:00
196885e378
cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object).
2012-07-23 14:20:43 -07:00
8fad593ac5
cloudstack 3.0 API: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response.
2012-07-23 12:14:59 -07:00
aac0a808c1
cloudstack 3.0 API - CreateVpnConnection API, ListVpnConnections API: set object name for API response.
2012-07-23 12:10:29 -07:00
497c324efc
cloudstack 3.0 API - CreateVpnCustomerGateway API: correct parameter type on server-side.
2012-07-23 11:35:48 -07:00
7cf7002571
Merge branch 'master' into vpc
2012-07-23 10:57:55 -07:00
7bef9a961d
Resource tags: CS-15661 - don't accept NULL or empty key value when create resource tag
2012-07-23 10:51:20 -07:00
c8f72c9198
Merge branch 'master' into vpc
...
Conflicts:
ui/scripts/network.js
2012-07-23 10:36:25 -07:00
8712812ca7
cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response.
2012-07-20 16:49:17 -07:00
50da77c63f
cleaning up one remaining license header issue in api
2012-07-20 13:51:56 -04:00
281b23c2cd
Fixed license headers
2012-07-18 14:52:13 -07:00
f2bbf62d9d
Added getUser API to get user details using API key. Services like S3 can user this API to authenticate. API is admin only.
2012-07-18 14:20:04 -07:00
6ad2388c72
VPC: added one more default network offering for VPC - the one not having LB service
2012-07-17 17:46:17 -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
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
1781f706f9
VPC: added forVpc parameter to listNetworks api call. If true, list networks not belonging to any vpc
2012-07-13 13:27:10 -07:00
79c7da07ab
Phase 1 of Nicira integration
2012-07-11 17:16:06 -07:00
79d277c30d
VPC: fixed listPrivateGateways by id
2012-07-11 13:22:50 -07:00
7cb4ab5e60
VPC: added State to vpc_gateways
2012-07-11 12:05:42 -07:00
f59b935da5
VPC: CS-15519 - fixed ipAssoc when only zoneId parameter is passed in to the API call
...
Conflicts:
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java
2012-07-10 15:20:39 -07:00
ade3ae4e3c
CS-15512: Fix delete vpn connection
2012-07-10 14:47:50 -07:00
c2f9417de4
VPC: CS-15345 - fixed regression in ipRelease happening as a part of cleanupNetworkResources method
2012-07-10 14:35:50 -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
8404dba5e0
CS-15452: Fix wrong repsonse ID for s2s vpn
2012-07-09 16:21:21 -07:00
f6aea09a16
CS-15498: Fix delete s2s vpn NPE
2012-07-09 12:04:57 -07:00
a6086dc806
Removed @author tag from bunch of resources
2012-07-06 17:25:36 -07: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
5be0a3eeb1
VPC: fixed listNetworkACLs by networkId
...
Conflicts:
api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
2012-07-06 16:43:39 -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
710fa36bfd
CS-15474: fixed response name for the deleteTags API
2012-07-06 11:43:31 -07:00
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
7044fa695d
VPC: CS-15469: createNetworkACL - startPort is not accepted if protocol is ICMP
2012-07-06 11:11:36 -07:00
83f566cfe7
VPC: added "forVpc" (boolean) parameter to listRouters call - filter by the fact if router belongs to VPC or not
2012-07-06 11:08:48 -07:00
234ae447ee
VPC: added field networkacl_service_provided to physical_network_service_providers table
2012-07-06 11:08:39 -07:00
540ea34f57
VPC: removed NetworkACL interface; added getTrafficType() to Firewall
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-07-06 11:08:00 -07:00
81afcabdb2
Added missing package name mistakenly removed by headers cleanup checkin
2012-07-05 11:12:02 -07:00
a77b6756fc
more cleanups of license headers and attribution
2012-07-04 21:48:07 -04:00
c0d5f86356
a bit more license header cleanup
2012-07-04 19:53:04 -04:00
f2078afbd8
VPC: added zoneName to the VPC api response
2012-07-03 17:28:20 -07:00
da6d876cd4
VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/api/ApiDBUtils.java
2012-07-03 17:23:40 -07:00
40a3482f13
VPC: multiple fixes:
...
* Separate service for NetworkACL - "NetworkACL" service
* allow having just one network supporting LB in the VPC
* perform check against VPC when upgrade network to the new network offering (the same set of checks when you add new network to the VPC)
2012-07-02 17:44:54 -07:00
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
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
8d16d7f94f
Fix build after merge site to site vpn
2012-07-02 16:39:41 -07:00
1d97af3abf
CS-6840: Add status checking for site 2 site VPN
2012-07-02 16:29:23 -07:00
d9688f74ba
CS-6840: List all objects without require parameter
2012-07-02 16:29:10 -07:00
8d4079d477
CS-6840: Add hypervisor commands for site-to-site vpn
...
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
2012-07-02 16:28:44 -07:00
0ce1e78364
CS-6840: Add Site2SiteVpnServiceProvider
2012-07-02 16:27:09 -07:00
24c480f9e6
CS-6840: Add commands for site-to-site vpn
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-02 16:26:34 -07:00
9bb65b1126
CS-6840: Add data structure for site-to-site vpn tables
2012-07-02 16:20:58 -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
c41094154d
moving out OVS code to plugins/network-elements/ovs
2012-06-28 17:23:41 -07:00
377b03acde
VPC: when add guest network to VPC, verify that the list of network services is within the list of services supported by VPC offering
2012-06-28 17:18:27 -07:00
24772bcb4e
VPC: createPF/createLBrule: 1) don't allow to pass openFirewall=true 2) when no openFirewall is passed in, defaulted to false if the public ip belongs to VPC
2012-06-28 17:18:15 -07:00
c19639e4a2
Static route can be created for generic VpcGateway now, not just Private gateway
2012-06-28 17:17:44 -07:00
b03265bc76
VPC: implemented vpc cleanup thread that cleans up Inactive VPCs (that were failed to delete)
2012-06-28 10:18:14 -07:00
c8ec262dea
VPC: as there is no support for FirewallRules/remoteAccessVPN in the VPC, removed the networkId from the list of parameters for corresponding api calls
2012-06-28 10:17:53 -07:00
fcdf6f2bec
Fixed @Implementation for the api commands - responseObject field should be the instance of BaseResponse
...
Conflicts:
api/src/com/cloud/api/commands/UpdateStorageNetworkIpRangeCmd.java
2012-06-28 10:15:43 -07:00
1140f081df
VPC: fixed getEntityOwnerId() in AssociateIpAddress command to return vpc owner if vpcId is passed in. Added action events for create/delete privateGateway/staticRoutes
2012-06-28 10:13:36 -07:00
a78fcedb5e
VPC: added vpcId to SetStaticNatRule and CreateLoadBalancerConfig commands
...
Conflicts:
server/src/com/cloud/network/element/NetscalerElement.java
2012-06-28 10:13:19 -07:00
1a232171eb
VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done
2012-06-28 10:11:41 -07:00
8197f1f07c
moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware
2012-06-26 19:48:55 -07: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
4eee9246d8
VPC: added missing @Implementation to listPrivateGateways
2012-06-25 20:57:23 -07:00
dc04e0b2e5
VPC: listPrivateGateways API implementation
2012-06-25 20:57:09 -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
300110931c
VPC: apply dhcp entries only after all guest nics are plugged
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-25 20:51:09 -07:00
1b1e52ddb0
VPC: apply firewall ACLs as a part of VPC router start/restart and VPC network implement
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-06-25 20:47:29 -07:00
392ae5cb13
moving out Srx code into Plugins/network-elements
2012-06-25 16:55:53 -07:00
422c4ce513
moving out F5 code from server into plugins/network-elements/f5/
2012-06-23 14:16:59 -07:00
361ca9643d
CS-15173: Additional Cluster is allowed to add with the same VSM IPaddress as the previous cluster
...
Description:
Restricting association of a Cisco Nexus VSM to a single
cluster.
2012-06-22 13:31:56 -07:00
49b88472a5
moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler
2012-06-21 18:57:18 -07:00
887970690b
Added NicTO to SetSourceNat command, CreateLoadBalancerConfigCommand, SetNetworkACLCommand
2012-06-21 10:02:33 -07:00
ccec9192a2
VPC: implemented delete and list Network ACL(s)
2012-06-20 17:20:04 -07:00
374a600746
VPC: initial checkin for network ACLs
...
Conflicts:
client/tomcatconf/commands.properties.in
2012-06-20 17:19:49 -07:00
55a12582b4
Completed API / Management server code for Resource tags feature. UI is yet to be done
2012-06-20 15:45:08 -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
bc94948e06
agent: Set the listen addr of a VM specificly to the private IP of a host
...
Now users have to modify their /etc/libvirt/qemu.conf vnc_listen, this is not needed anymore
2012-06-20 15:29:26 +02:00
27e504cb18
bug CS-15285: preserving order of network ids so that first network is taken as the default network
2012-06-20 11:32:43 +01:00
89d7e54732
Network usage for VPC implementation
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-19 10:08:03 -07:00
810151586b
1) Allow having multiple shared networks with the same vlan
...
2) Added new parameter to listNetworks command - canUseForDeploy(boolean). When true, list only networks that can be used for vm deployment (networks have enough ip addresses to allocate from for the vm)
Conflicts:
api/src/com/cloud/api/ApiConstants.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/IPAddressDao.java
2012-06-15 16:47:13 -07:00
9ae62d32cd
Isolated non-vpc networks: start router with 3 nics from the very beginning
2012-06-15 14:33:14 -07:00
b3985a3b48
Added new capabilities to VPN and Firewall services defining if VPN is S2S or Remote access, and if the Firewall rules should be created per cidr or per public ip address
2012-06-15 14:33:06 -07:00
tomoe@midokura.jp
Prasanna Santhanam
Nitin Mehta
Mice Xia
anthony
Alena Prokharchyk
Edison Su
Sheng Yang
Koushik Das
Chip Childers
Pranav Saxena
Hugo Trippaers
kishan
Wido den Hollander
Jessica Wang
bfederle
David Nalley
Murali reddy
Vijayendra Bhamidipati
Abhinandan Prateek