f6c4b22139
agent: Remove the main() method from LibvirtComputingResource
...
Seems like very ancient code which is not needed.
2013-02-07 23:06:44 +01:00
9b691fc443
CLOUDSTACK-1175: Fix NPE by making _store a static variable shared by objects
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-07 18:23:49 +05:30
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
44316f7398
ApiDiscovery: Fix tests and make constructor light weight, let spring run init()
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-06 20:07:27 +05:30
d296a8fa65
Revert "ApiDiscovery: Discovery apis provided by PluggableServices as well"
...
This reverts commit 1b9e5c3006
2013-02-06 14:17:22 +01:00
1b9e5c3006
ApiDiscovery: Discovery apis provided by PluggableServices as well
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-06 16:54:46 +05:30
2a0c2be136
CLOUDSTACK-1175: PlainTextAuthenticator was being loaded due @Component annotation. Removed the annotation so that MD5 authenticator will be used
2013-02-06 15:27:03 +05:30
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
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
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
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
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
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
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
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
9755d9b4a2
Keep naming more or less consistent
2013-02-02 12:43:15 +01:00
296c20332d
Merge javelin into master
2013-02-01 14:40:45 -08:00
7b75f0d990
Sync master to javelin one more time
2013-02-01 11:37:33 -08:00
bfc4f982fd
adding missing license in one of the files of BigSwitch
2013-02-01 13:32:13 +05:30
736b236eaf
bigswitch controller support
...
Reviewed-by: Chiradeep Vittal <chiradeepv@gmail.com>
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 12:42:04 +05:30
96c24930ae
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2013-02-01 08:45:53 +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
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
e7a554fc6a
Merging events framework branch into master. This commit will bring
...
following changes
- introduced notion of event bus with publish, subscribe, unsubscribe
semantics
- a plug-in can implement the EventBus abstraction to provide event
bug to CloudStack
- A rabbitMQ based plug-in that can interact with AMQP servers to
provide message broker based event-bug
- stream lines, action events, usage events, alerts publishing in to
convineance classed which are also used to publish corresponding
event on to event bus
- introduced notion of state change event. On a state change, in the
state machine corrsponding to the resource, a state change event is
published on the event bug
- associated a state machined with Snapshot and Network objects
- Virtual Machine, Volume, Snaphost, Network object state changes wil
result in a state change event
2013-02-01 01:37:24 +05:30
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
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
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
975021dda1
Summary: adding resizeVolume api call
...
Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.
BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700
2013-01-16 17:43:35 -07:00
2be270de89
Separate loadable components like Gurus, Elements, Adapters to componentContext.xml
2013-01-16 16:33:59 -08:00
e83fe471c7
Merge branch 'master' into api_limit
2013-01-16 10:49:25 -08:00
88a0b5ac48
Revert "Summary: partical check-in for L4-L7 network services in the shared"
...
This reverts commit 6657246cd4
2013-01-16 16:05:17 +05:30
97cb16944f
Merge branch 'master' into api_limit
2013-01-15 18:18:34 -08:00
8608925216
Consolidate RuntimeCloudException and CloudRuntimeException into one
...
class CloudRuntimeException, and removed RuntimeCloudException to avoid
confusion.
2013-01-15 18:07:08 -08:00
f6a8b45de5
ApiDiscovery: Use UserContext getCallerUser, do a lazy eval to get account service
...
Impl. and use UserContext to get User.
CloudStack's @Inject is horrible, it may sometimes fail to inject account service
during startup. Do a lazy injection using ComponentLocator when needed.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-15 16:11:51 -08:00
4355d06a86
Reuse APIChecker adapter interface for APi Rate limit checking and optimize ApiRateLimitService interface.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-15 15:53:19 -08:00
c93918a896
rename dataobject to datastream
2013-01-15 15:46:21 -08:00
a6b9027630
default Security rule doesn't apply to system VMs since nic.getIsolationUri is not set
...
use to.setSecurityGroupEnabled to indicate if securitygroup is enabled on this NIC
CLOUDSTACK-983: default Security rule doesn't apply to system VMs
2013-01-15 11:15:42 -08:00
95222cdb6d
Templates: Add Ubuntu 12.04 to the templates
...
Although I still think the templates aren't well maintained, I just
added 12.04 since this is an LTS and people probably want it in the
list of templates.
This system should be more generic I think though.
2013-01-15 13:25:48 +01:00
2d69a1855d
Summary: Begone pesky tabs
2013-01-15 10:00:58 +01:00
9f00302ad3
Summary: Polish and shine
...
Document the used options in agent.properties
Default the bridge driver to something sensible based on the
configuration of the bridge type.
2013-01-15 09:18:24 +01:00
4267a3fc7c
Summary: copy/paste error
2013-01-15 09:18:24 +01:00
87fe646953
Summary: small fix causing trouble when shutting down virtual machines
2013-01-15 09:18:24 +01:00
e0ecf7b834
Summary: Add vlan configuration to the network inteface definition
...
Add xml piece for defining vlans
Set vlan tag in the libvirt definition for the network inteface
2013-01-15 09:18:24 +01:00
68523e641f
Summary: Add initial support for OpenVswitch to the KVM hypervisor
...
Create OvsVifDriver to deal with openvswitch specifics for plugging
intefaces
Create a parameter to set the bridge type to use in
LibvirtComputingResource.
Create several functions to get bridge information from openvswitch
Add a check to detect the libvirt version and throw an exception when
the version is to low ( < 0.9.11 )
Fix classpath loading in Script.findScript to deal with missing path
separators at the end.
Add notification to the BridgeVifDriver that lswitch broadcast type is
not supported.
2013-01-15 09:18:24 +01:00
3d570c7647
Summary: Add vlan configuration to the network inteface definition
...
Add xml piece for defining vlans
Set vlan tag in the libvirt definition for the network inteface
2013-01-15 09:09:14 +01:00
Wido den Hollander
Rohit Yadav
Marcus Sorensen
Hugo Trippaers
Kishan Kavala
Min Chen
Kelven Yang
Koushik Das
Hugo Trippaers
Murali Reddy
Kanzhe Jiang
Sheng Yang
frank
Jayapal
David Nalley
Edison Su
Edison Su
Alex Huang
Prachi Damle
Chiradeep Vittal
anthony