5eb767f563
CLOUDSTACK-710: mkdir -p destination before scp-ing file in CitrixResourceBase
...
- Assumption is that mkdir is available on xen host
- We don't know what kind of file we're copying, dirs would have 0777 permission
by default
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-11 16:42:49 +05:30
c811a025f2
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
add api annotation to baremetal related api
2013-02-08 14:18:05 -08:00
87286d0549
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:55:11 -07:00
4a578852a7
Fix bug CLOUDSTACK-1171 due to spring injection.
2013-02-05 21:59:30 -08:00
2a63dbe59d
CLOUDSTACK-1165, fix nonoss build startup issue
2013-02-05 14:38:13 -08:00
5bc9785bf3
Keep naming more or less consistent
...
(cherry picked from commit 9755d9b4a2
2013-02-05 21:08:23 +01:00
77d65b3e08
Summary: Disallow shrinking volume type QCOW2 to fail with better message
...
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360093176 -0700
2013-02-05 12:41:20 -07:00
7970384f6e
CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl
2013-02-05 16:43:40 +05:30
cce80832a7
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 23:56:01 +05:30
78453d9d91
ucs: Fix ucs plugin's pom, removes xml marktag
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit fec9934656
2013-02-02 09:16:59 -08:00
7da991638f
rat: Fix license headers on ucs plugin etc.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit c9e764818b
2013-02-02 08:58:34 -08:00
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
8416d81b99
Merge branch 'ucs' into javelin
...
Conflicts:
api/src/org/apache/cloudstack/api/ApiConstants.java
plugins/pom.xml
utils/src/com/cloud/utils/exception/CloudRuntimeException.java
utils/src/com/cloud/utils/exception/RuntimeCloudException.java
2013-01-31 14:44:07 -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
d7ad2da7e0
server: Fix network refactor regressions for CLOUDSTACK-297
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 17:33:53 -08:00
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
1b39b0e908
fixing licensing headers
2013-01-29 23:45:11 -05:00
1f7eaf3d61
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
merge baremetal feature to master
2013-01-29 17:19:57 -08:00
1f2147d3ec
Summary: Account for embedded nics (e.g. 'em0') when looking for physical nic
...
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-01-28 21:20:03 -08:00
482ce5fe07
Summary: Account for embedded nics (e.g. 'em0') when looking for physical nic
...
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-01-28 21:21:30 -07:00
1a1d716d90
CloudStack CLOUDSTACK-723
...
Enhanced baremetal servers support on Cisco UCS
2013-01-28 16:30:06 -08:00
997e9fb7b0
CloudStack CLOUDSTACK-723
...
Enhanced baremetal servers support on Cisco UCS
2013-01-28 16:29:54 -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
301b0b9090
CloudStack CLOUDSTACK-723
...
Enhanced baremetal servers support on Cisco UCS
init
2013-01-25 15:00:09 -08:00
a18baf8c83
fix compile
2013-01-25 10:24:25 -08:00
f56b96ad19
merge: Fast forward merge branch 'javelin'
...
FF merge commit due to recent merge of master and then Edison's commit.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:30:28 -08:00
356866c72b
Merge branch 'master' into javelin
...
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/swift/SwiftManagerImpl.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:18:53 -08:00
6f5655cb03
generalize storage orchestration: DataObjectManager will handle all the object life cycle management
2013-01-24 18:30:08 -08:00
6088cbfe47
nonoss compiled up til netscaler
2013-01-23 17:18:55 -08:00
c921118c58
add image create test case
2013-01-22 13:25:48 -08:00
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
b4988e86ab
add backedn code
2013-01-21 16:59:50 -08:00
f7e75d3aaf
Fixed the problems with simulator. Turned off the skip tests
2013-01-21 10:37:53 -08:00
a0373fe1ff
Summary: Apply feedback from Wido
...
Better checking on VlanID
Correct speling mistake
2013-01-21 12:34:20 +01:00
04f82623f6
Merge branch 'master' into cloud-agent-with-openvswitch
...
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2013-01-21 12:18:21 +01:00
a65b584d18
Summary: Fix bridge parsing when bridge names are subsets of others
...
Detail: There are several places in the code that do a
"brctl show | grep bridgeName" or similar, which causes all sorts
of problems when you have for example a cloudVirBr50 and a
cloudVirBr5000. This patch attempts to stop relying on the output
of brctl, instead favoring sysfs and /sys/devices/virtual/net.
It cuts a lot of bash out altogether by using java File. It was
tested in my devcloud-kvm against current 4.0, as well as by the
customer reporting initial bug.
BUG-ID: CLOUDSTACK-938
Fix-For: 4.0.1
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-01-18 18:28:08 -07:00
4a9cf4b4a8
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-18 15:59:24 -08:00
fe6f0457d5
fixed unit tests from merge
2013-01-18 15:58:55 -08:00
1283712d93
replace spring injection in nfssecondarystorage
2013-01-18 15:10:08 -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
55e8965bd0
Summary: Pass StoragePoolType that maps to libvirt in cleanupDisk
...
Description: When selecting a storage adaptor, cleanupDisk assumes that
libvirt is being used. Therefore, we pass a StoragePoolType that maps to
libvirt. This is the only place in LibvirtComputingResource where the
StoragePoolType can't be pulled from somewhere else.
BUG-ID: CLOUDSTACK-1011
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>
2013-01-18 00:20:34 -07:00
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
Rohit Yadav
frank
Marcus Sorensen
Min Chen
Kelven Yang
Hugo Trippaers
Kishan Kavala
Koushik Das
Sheng Yang
Jayapal
David Nalley
Edison Su
Edison Su
Alex Huang
Chiradeep Vittal