c9f0af42a6
Fix systemvm.iso path search issue.
2013-02-21 10:22:14 -08:00
640fa6be76
Fix a bug in converting Enum type to String.
2013-02-07 12:23:57 -08:00
105bf7134a
Merge branch 'master' into vim51_win8
...
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-02-06 15:27:45 -08:00
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
1ce4d62ace
Fix cast error from List<?> to array.
2013-02-05 21:44:38 -08:00
b9cf5c2147
Merge branch 'master' into vim51_win8
2013-02-05 14:40:53 -08:00
e5866cf2ef
CLOUDSTACK-1165, fix nonoss build startup issue
2013-02-05 14:27:57 -08:00
a224287403
Merge branch 'master' into vim51_win8
...
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
pom.xml
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-02-05 10:05:39 -08:00
481f480472
Upgrade to use Vsphere 5.1 SDK jar, fixed all compilation error with new
...
wrapper class VmwareClient.
2013-02-04 17:41:36 -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
8f33229fc1
Merge branch 'master' into vim51_win8
2013-01-31 14:04:38 -08:00
1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
780ac2a9c6
Introduce POM dependency on VSphere 5.1 SDK, not done yet, WIP.
2013-01-31 10:32:05 -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
767f54cc9a
Make nonoss build work under Spring
2013-01-25 17:18:36 -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
56cd809600
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
...
Re-merge with network-refactor
2013-01-17 11:32:49 -08:00
3dabd5fbf3
Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException
...
and CloudException in one place, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-16 22:36:34 -08:00
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
497dcd5044
Get rid of PlugService annotation, replace it with Spring standard injection in command classes
2013-01-16 18:44:44 -08:00
bca2c928e8
PluggableService: Fix interface definition
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
1294cdc701
pulled from master
2013-01-10 16:01:01 -08:00
d6f44a4d6a
merged from master
2013-01-10 15:55:42 -08:00
c4e890c55d
PluggableService: Refactor method to return map of key value pairs
...
- Makes plugins self contained so they decide their properties file format
- PluggableService creates the contract that implementing entity will return a
properties map which is apiname:rolemask (both are strings)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 15:55:02 -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
dcbb0ecef5
Fix CLOUDSTACK-936: fix nonoss build due to CloudException IdentityProxy
...
removal.
2013-01-09 13:47:53 -08:00
b6c56736e5
merge from master
2013-01-09 05:20:36 -08:00
0bcb64605f
all built with the latest
2013-01-09 05:02:39 -08:00
2eee2cd999
plugins: Fix getPropertiesFiles() for pluggable service plugins, CiscoNexusVSMEElement
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 04:56:32 -08:00
b274c570f9
Cleanup places that use explicit wiring of the components
2013-01-08 17:45:33 -08:00
cf8de7ee17
Removed all the .project files
2013-01-08 14:11:00 -08:00
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
a948a89378
Sync updates: Merge branch 'master' into api_refactoring
...
Conflicts:
server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java
server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-07 10:38:43 -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
596f9d0905
api: Annotate netscaler apis, remove IdentityMapper from everywhere
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 17:09:40 -08:00
4cf0b05a0b
vmware: Annotate cisco related apis, remove IdentityMapper
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 16:42:28 -08:00
edb00bb613
Merge branch 'master' into api_refactoring
2013-01-03 08:32:56 -08:00
bba43f51dc
vmware stuff should be compile time dependency
2013-01-02 16:25:17 -08:00
Min Chen
Marcus Sorensen
Kelven Yang
Koushik Das
Sheng Yang
Jayapal
Alex Huang
Edison Su
Chiradeep Vittal
Rohit Yadav
Murali Reddy
Edison Su