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
85de14f6a4
Increase sleep time to allow token expire to account for windows
...
environment clock issue.
2013-01-29 11:19:09 -08:00
1c20c80cb5
Fix unit test failure only on Windows environment.
2013-01-29 11:09:06 -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
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
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
753b884044
spring: Fix component annotation for VolumeDaoImpl and CfgServerImpl
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 15:40:40 -08:00
6088cbfe47
nonoss compiled up til netscaler
2013-01-23 17:18:55 -08:00
45a92ba369
Fix the initialization of management server
2013-01-23 15:29:41 -08:00
34f3e1c9a1
ApiDiscoveryServiceImpl: Fix fields variable definition from array to set
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
363182cf76
Merge remote-tracking branch 'origin/master' into cloud-agent-with-openvswitch
2013-01-23 08:09:33 +01:00
6482e27081
ApiDiscovery: Add mockito, unit test for ApiDiscovery service impl
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 14:28:31 -08:00
26d8113f99
plugins: Indentation fix for pom.xml, add build/test rules for api discovery
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 14:28:31 -08:00
179db40e3a
ApiDiscovery: Fix response and service impl to make them test-able
2013-01-22 14:28:30 -08:00
e4e2cf6be7
skip test in cloud engine
2013-01-22 13:25:48 -08:00
c921118c58
add image create test case
2013-01-22 13:25:48 -08:00
aa7b3e0f6d
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
...
Corresponding getter/setter is renamed too.
Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case.
2013-01-22 12:56:39 -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
5a865462e9
Merge branch 'api_limit'
2013-01-18 09:43:54 -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
2fd1d476b4
Merge branch 'master' into api_limit
2013-01-17 21:23:50 -08:00
ddc53771bf
implement toURI
2013-01-17 18:49:50 -08:00
805261a93f
Change a debug message to TRACE level.
2013-01-17 15:16:50 -08:00
86ada92ffa
Fix some bugs and add java integration test for api rate limit plugin.
2013-01-17 15:13:51 -08: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
c1a540c6bb
Merge branch 'master' into api_limit
...
Conflicts:
api/src/org/apache/cloudstack/api/BaseCmd.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/ApiServlet.java
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-16 22:48:22 -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
06fa338d42
Add some tests for api rate limit plugin.
2013-01-16 21:56:25 -08:00
bdcfa1919b
Clean up ApiServer, ApiServlet and ApiDispatcher in handling various
...
exceptions, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.
2013-01-16 21:52:48 -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
Kelven Yang
Jayapal
Rohit Yadav
David Nalley
frank
Min Chen
Marcus Sorensen
Edison Su
Edison Su
Alex Huang
Hugo Trippaers
Prachi Damle
Koushik Das
Chiradeep Vittal