apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,070 Commits 308 Branches 324 Tags
Commit Graph

392 Commits

Author SHA1 Message Date
Min Chen
5a2cd68fa8 Fix bug CLOUDSTACK-1171 due to spring injection. 2013-02-05 21:55:11 -08:00
Min Chen
1ce4d62ace Fix cast error from List<?> to array. 2013-02-05 21:44:38 -08:00
Min Chen
b9cf5c2147 Merge branch 'master' into vim51_win8 2013-02-05 14:40:53 -08:00
Kelven Yang
e5866cf2ef CLOUDSTACK-1165, fix nonoss build startup issue 2013-02-05 14:27:57 -08:00
Wido den Hollander
303fb650cb agent: Use FileUtil.readFileAsString for reading RX and TX bytes 
Since we already have this un utils it's better to use it here
then do the whole File/FileInputStream magic.

Keeps the code simpler and more readable.
 2013-02-05 22:17:40 +01:00
Marcus Sorensen
3535f88d16 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:39:36 -07:00
Min Chen
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
Kishan Kavala
fc0bf21a13 CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl 2013-02-05 16:49:34 +05:30
Min Chen
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
Koushik Das
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
Rohit Yadav
fec9934656 ucs: Fix ucs plugin's pom, removes xml marktag 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-02 09:16:17 -08:00
Wido den Hollander
4709756bd5 agent: Use FileInputStream for reading files instead of cat 
Cat'ing a file and parsing that output is not reliable and this can be done
by using Java's native methods for that.
 2013-02-02 18:08:24 +01:00
Rohit Yadav
c9e764818b rat: Fix license headers on ucs plugin etc. 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-02 08:57:16 -08:00
Hugo Trippaers
9755d9b4a2 Keep naming more or less consistent 2013-02-02 12:43:15 +01:00
Kelven Yang
7bd8bec68a Sync javelin with master up to 894cb8f7d9fc8b5561754a9fa541fef8f235148a 2013-01-31 17:20:19 -08:00
Sheng Yang
5cb9df91a1 Merge branch 'ipv6' 
Conflicts:
	api/src/com/cloud/network/NetworkProfile.java
 2013-01-31 15:07:33 -08:00
frank
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
Min Chen
8f33229fc1 Merge branch 'master' into vim51_win8 2013-01-31 14:04:38 -08:00
Kelven Yang
1b2b369ecb Merge latest master into javelin 2013-01-31 11:34:49 -08:00
Min Chen
780ac2a9c6 Introduce POM dependency on VSphere 5.1 SDK, not done yet, WIP. 2013-01-31 10:32:05 -08:00
Jayapal
b6727e5646 CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
Rohit Yadav
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
Kelven Yang
176523254e Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
David Nalley
1b39b0e908 fixing licensing headers 2013-01-29 23:45:11 -05:00
frank
1f7eaf3d61 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

merge baremetal feature to master
 2013-01-29 17:19:57 -08:00
Marcus Sorensen
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
Marcus Sorensen
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
frank
1a1d716d90 CloudStack CLOUDSTACK-723 
Enhanced baremetal servers support on Cisco UCS
 2013-01-28 16:30:06 -08:00
frank
997e9fb7b0 CloudStack CLOUDSTACK-723 
Enhanced baremetal servers support on Cisco UCS
 2013-01-28 16:29:54 -08:00
Sheng Yang
8f66d266b3 IPv6: Enable VR's ability to provide DHCPv6 service 2013-01-26 23:14:42 -08:00
Sheng Yang
9300a02ba4 IPv6: Update edithosts.sh accept parameters 2013-01-26 23:14:27 -08:00
Kelven Yang
767f54cc9a Make nonoss build work under Spring 2013-01-25 17:18:36 -08:00
Kelven Yang
af4485ae9e Put nonoss under Spring framework 2013-01-25 15:41:48 -08:00
frank
301b0b9090 CloudStack CLOUDSTACK-723 
Enhanced baremetal servers support on Cisco UCS

init
 2013-01-25 15:00:09 -08:00
Edison Su
a18baf8c83 fix compile 2013-01-25 10:24:25 -08:00
Rohit Yadav
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
Rohit Yadav
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
Edison Su
6f5655cb03 generalize storage orchestration: DataObjectManager will handle all the object life cycle management 2013-01-24 18:30:08 -08:00
Alex Huang
6088cbfe47 nonoss compiled up til netscaler 2013-01-23 17:18:55 -08:00
Edison Su
c921118c58 add image create test case 2013-01-22 13:25:48 -08:00
Edison Su
4fbecf15ec add unit test back, primary storage life cycle is tested 2013-01-21 17:01:00 -08:00
Edison Su
b4988e86ab add backedn code 2013-01-21 16:59:50 -08:00
Alex Huang
f7e75d3aaf Fixed the problems with simulator. Turned off the skip tests 2013-01-21 10:37:53 -08:00
Hugo Trippaers
a0373fe1ff Summary: Apply feedback from Wido 
Better checking on VlanID

Correct speling mistake
 2013-01-21 12:34:20 +01:00
Hugo Trippaers
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
Marcus Sorensen
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
Alex Huang
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
Alex Huang
fe6f0457d5 fixed unit tests from merge 2013-01-18 15:58:55 -08:00
Edison Su
1283712d93 replace spring injection in nfssecondarystorage 2013-01-18 15:10:08 -08:00
Alex Huang
10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00