c5185c09ef
Summary: Add missing ResizeVolumeCommand in VmwareResource.java
...
Submitted-by: hongtu_zang <hongtu_zang@tcloudcomputing.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-02-06 07:52:37 -07:00
5a2cd68fa8
Fix bug CLOUDSTACK-1171 due to spring injection.
2013-02-05 21:55:11 -08:00
e5866cf2ef
CLOUDSTACK-1165, fix nonoss build startup issue
2013-02-05 14:27:57 -08:00
ca56e7667c
CLOUDSTACK-435: Vmware network labels are ignored when creating a Zone using basic networking
...
Due to incorrect logic the private network traffic label specified was not getting used, instead some default was getting used (vSwitch0 or privateEthernetPortProfile). The fix passes the correct label in the format vSwitchX or vSwitchX,<vlan_id> and based on that the correct switch is used.
2013-02-04 19:23:30 +05:30
7bd8bec68a
Sync javelin with master up to 894cb8f7d9
2013-01-31 17:20:19 -08:00
5cb9df91a1
Merge branch 'ipv6'
...
Conflicts:
api/src/com/cloud/network/NetworkProfile.java
2013-01-31 15:07:33 -08:00
1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
b6727e5646
CLOUDSTACK-299: Egress firewall rules feature for guest network on VR
2013-01-31 11:20:47 +05:30
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
8f66d266b3
IPv6: Enable VR's ability to provide DHCPv6 service
2013-01-26 23:14:42 -08:00
9300a02ba4
IPv6: Update edithosts.sh accept parameters
2013-01-26 23:14:27 -08:00
af4485ae9e
Put nonoss under Spring framework
2013-01-25 15:41:48 -08:00
6088cbfe47
nonoss compiled up til netscaler
2013-01-23 17:18:55 -08:00
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
070856affd
CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version
...
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 16:49:52 +05:30
cadca5fc0c
Merge branch 'master' into network-refactor-merge2
...
Conflicts:
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
server/src/com/cloud/acl/DomainChecker.java
server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
2013-01-16 19:17:14 -08:00
56e5fbdee2
removed import of componentlocator and inject from all files
2013-01-10 11:44:47 -08:00
5a830c4db0
Network-refactor: Refactor NetworkManager into NetworkModel and NetworkManager.
...
NetworkManager's exclusive focus is now
- handling plugins during orchestration, and
- to deal with ip address allocation.
Those classes that used to refer to NetworkManager to get access to the datamodel now refer to NetworkModel
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00
0bcb64605f
all built with the latest
2013-01-09 05:02:39 -08:00
b274c570f9
Cleanup places that use explicit wiring of the components
2013-01-08 17:45:33 -08:00
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
bf6ed9312d
Missed portion of the fix for CLOUDSTACK-595 submitted by commit
...
3ffbc4320a
2013-01-07 16:36:47 +05:30
3ffbc4320a
CLOUDSTACK-595 : Recreate root volume scenarios doesn't work in vmware
...
Issue seen during system vm template upgrade and restoreVM command
scenarios for vmware. In these cases CS tries to recreate root disk with
same name as the existing one, in case of vmware this results in creation
of vmdk file with same name for both existing and new root volume.
This results in undesired behavior when storage cleanup thread tries to
cleanup old volume. Made the vmdk file name unique by adding the volume
id to it. This will ensure that during volume recreation in the scenarios
mentioned vmdk will get created with a new name and there will be
no undesired side effects of running the storage cleanup thread.
2013-01-07 16:18:05 +05:30
c1ed9a9010
Modify Async callback setup convention
2012-12-17 20:37:19 -08:00
cea8f3bf37
Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation
2012-11-07 15:03:22 -08:00
aab02e2743
Add Spring annotation to major components
2012-11-07 14:53:39 -08:00
9d94e6b1d3
Changed the hardcoded vmware path to point to cloud/common
2012-10-06 23:43:44 -07:00
3e7ba774f9
CLOUDSTACK-254: Fix exec path for netusage.sh
...
Fixes the hard coded path in the vmware plugin.
The systemvm.iso file would copy the script only to /opt/cloud/bin.
Same is the path used for vpc_netusage.sh
Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-10-04 15:30:43 +05:30
25dd8de70a
Fix dependencies for vmware hypervisor.
...
Remove unused imports from VmwareResource as they caused a dependency to
xapi.
2012-10-02 14:25:40 -07:00
5d301f2af5
CS-16370 , VCP, support delete guest network for vmware
2012-09-26 17:42:42 -07:00
4c5f41bfeb
Commit for https://reviews.apache.org/r/6928/
2012-09-20 15:42:06 -07:00
fe8a2992a2
Elimiate mystery guestIp in IpAddressTO
...
Nobody can explain why it's there...
Also fix wrong return result of several empty network element callbacks
2012-09-12 15:42:48 -07:00
eb7746c965
CS16171 : Cannot attach ISO on VMware VM due to Invalid datastore path error
...
Handled upgrade scenario where data store already exists in vCenter
2012-09-10 14:26:25 +05:30
fbba8c2ef3
CS-15542, return success when vif is not there on deipassoc
2012-09-07 17:29:49 -07:00
9214fa0af6
CS-15542: UnPlugNicCommand return success if vif doesn't exist
2012-09-07 17:21:52 -07:00
2ba09d88c8
Patch from Gavin Lee: Change license to ASL2.0 in plugin
2012-08-30 09:17:11 -04:00
0c915cd69e
bug CS-16171 : Cannot attach ISO on VMware VM due to Invalid datastore path error
2012-08-30 11:04:30 +05:30
60df21a023
Merge S2S VPN for VMware
2012-08-29 14:17:29 -07:00
55c67092d0
Commit for https://reviews.apache.org/r/6547/
2012-08-28 14:58:04 -07:00
fd4a1a39c1
Bug CS-15970: Fixes Redundant router status when host is XenServer
2012-08-28 12:07:33 +05:30
1289b947f9
S2S VPN: Fix CheckS2SVpnConnectionsCommand on VMware
2012-08-23 18:30:31 -07:00
691be5c60e
bug CS-15577: Added per gateway network usage for VPC and VPN usage. VPN usage uses 525 mark for outgoing traffic and 524 mark for incoming traffic
...
status CS-15577: resolved fixed
2012-08-17 17:07:13 +05:30
4b3af0c961
fixed typo
2012-08-15 14:06:07 -07:00
f0baaf6a22
Apply patch https://reviews.apache.org/r/6552/
2012-08-13 17:11:54 -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
e0c85c0d41
VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands
2012-08-01 18:19:03 -07:00
1aa4ed84b9
Merge VPC support in VMware integration
2012-08-01 17:27:59 -07:00
8eee8f342e
S2S VPN: CS-15650: Add connection status update to s2s vpn
2012-07-27 16:28:06 -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
Marcus Sorensen
Min Chen
Kelven Yang
Koushik Das
Sheng Yang
Jayapal
Alex Huang
Edison Su
Chiradeep Vittal
Murali Reddy
Rohit Yadav
Hugo Trippaers
Anthony Xu
Kelven Yang
Chip Childers
kishan
Alena Prokharchyk
Kelven Yang