bd4661e467
CLOUDSTACK-1137: force reconnect to a disconnected host throws error.
2013-02-14 17:57:41 -08:00
ca5c6d5d14
CLOUDSTACK-1219, CLOUDSTACK-1220: Fix IPv6 error messages
2013-02-14 16:28:29 -08:00
cf7ac9d6c4
CLOUDSTACK-1277: populating transit password field to UserVmJoinVO in
...
converting from UserVm to UserVmJoinVO.
2013-02-14 12:03:18 -08:00
f542c320d3
Removed a bunch of missing files and useless imports
2013-02-13 15:41:27 -08:00
d346f632c3
add missing file, fix build
2013-02-13 15:27:03 -08:00
8652e5f87e
Summary: Fix hanging references to /var/lib/cloud, changed to /var/cloudstack
...
BUG-ID: CLOUDSTACK-1201
BUG-ID: CLOUDSTACK-1196
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360786749 -0700
2013-02-13 13:22:28 -07:00
9a12756ae4
CLOUDSTACK-684 support vm snapshot
2013-02-14 01:26:30 +08:00
2e2ee2f3ed
CLOUDSTACK-1088: EnableStaticNat error will clear the data in database
...
The issue occur in two conditions
(1) If I use two sessions or browsers to EnableStaticNat on CloudStack
UI. one is successful, the other is failed. However, there is no ip in
database.
(2) If I use API call EnableStaticNat several times The first time
succeed, the second failed, the third succeed. the result is
success-fail-success-fail-success-fail, which it is not correct.
Reported-by: Wei Zhou <w.zhou@leaseweb.com>
Reviewed-by: https://reviews.apache.org/r/9254/
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-13 18:43:42 +05:30
fcb4b7a6a7
CLOUDSTACK-1237: Fix an overriding method that would help find template adapter
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 15:19:30 +05:30
0a9af54c9f
rat: Fix license for ResourceLimitManagerImplTest.java
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 14:32:33 +05:30
ae2b673e03
Summary: fix cloud-agent KVM calls to cloudstack-agent for centos6.3
...
BUG-ID: CLOUDSTACK-1234
Bugfix-for: 4.1, master
Reported-by: Rayees Namathponnan
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360736064 -0700
2013-02-12 23:16:22 -07:00
15e466c56d
Add missing break to applyRules in FirewallManager
...
Otherwise it would falling through PortForwarding rule.
Seems like a typo after network refactor.
2013-02-12 20:27:31 -08:00
2776ad14c8
CLOUDSTACK-1242: Fix inline mode
...
Network refactor dropped many inline mode codes. I've added at least part of
them back. Now I can create LB rule for inline mode.
2013-02-12 20:27:26 -08:00
c0442e2556
Fix a bug in register template, cannot find template adapter.
2013-02-12 16:56:02 -08:00
5828e526b3
CLOUDSTACK-713: Limit Resources(CPU and Memory) to domain/accounts
...
Addition of two new resource types i.e. CPU and Memory in the existing pool of
resource types.
Added some methods to set the limits on these resources using updateResourceLimit
API command and to get a count using updateResourceCount. Also added calls in the
Virtual machine life cycle to check these limits and to increment/decrement the new
resource types
Resource Name :: Resource type number
CPU 8
Memory 9
Also added Unit Tests for the same.
2013-02-12 12:02:07 -08:00
bd034e0b9f
CLOUDSTACK-1243: Add @Inject to fix NPE in AccountManagerImpl
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-12 17:58:17 +05:30
c809d057ef
CLOUDSTACK-1241: Network apply rules logic is broken
...
added logic to check if the network element is configured service
provider for the network before applying rules
2013-02-12 15:28:05 +05:30
6320cad9a1
Merge branch 'master' into vim51_win8
2013-02-11 15:47:08 -08:00
d9aa051953
Fix a typo
...
CanUseForDeploy() didn't return correct result due to this
2013-02-08 14:48:14 -08:00
0c5c08b78b
IPv6: CLOUDSTACK-1107: Add support for createVlanIpRange to extend existed network
2013-02-08 14:48:08 -08:00
1cf85aa87a
CLOUDSTACK-1216: insert UUID when we create "admin" user in DB.
2013-02-08 14:18:31 -08:00
6df0ff2596
fix build issue after revert
2013-02-08 12:30:12 -08:00
c0f2cf1e06
Revert "Revert "CLOUDSTACK-737""
...
This reverts commit dd67cfc5d0
2013-02-08 12:19:31 -08:00
b66f6c88f9
Revert "Revert "CLOUDSTACK-737""
...
This reverts commit 447d49ae91
2013-02-08 12:19:03 -08:00
27d1f3fa07
Revert "CLOUDSTACK-737"
...
This reverts commit 8a86d08fe3
2013-02-08 10:47:40 -08:00
a2fa167613
Revert " CLOUDSTACK-737"
...
This reverts commit 65210f4e7e
2013-02-08 10:47:08 -08:00
447d49ae91
Revert "CLOUDSTACK-737"
...
This reverts commit d7201dfe1f
2013-02-08 10:46:20 -08:00
dd67cfc5d0
Revert "CLOUDSTACK-737"
...
This reverts commit d7201dfe1f
2013-02-08 10:45:40 -08:00
0a6c6bb254
Revert "CLOUDSTACK-737"
...
This reverts commit d7201dfe1f
2013-02-08 10:42:36 -08:00
b4f3f92607
Revert " CLOUDSTACK-737,"
...
This reverts commit 95aef332cc
2013-02-08 10:29:53 -08:00
68c110cb18
CLOUDSTACK-1208: Failed to shutdown guest network
...
Firewall manager was being used instead of LoadBalancingRules manager
while applying the load balancer rules in shut down network. Changing it
to LoadBalancingRules manager.
2013-02-08 18:54:15 +05:30
b59a18d1a1
CLOUDSTACK-1210: Fix pluggable service, apiserver, mgmt server impl, api-discovery
...
- Mgmt server impl is a pluggable service, fix it's method
- Fix getCommands() to return all cmd api classes supported by this mgmt server
- For api-discovery, get commands from pluggable services only, don't use reflections
- Don't use reflections in ApiServer, iterate pluggableservices
- Fix api discovery unit test
- The fix was done automatically using following python program along with
following step:
1. Get all apis provided by default mgmt server, all of them are in cloud-api now
cd api/src/org/apache/cloudstack/api/command
find . >> apis
2. For all apis, generate java code that adds the class to the cmdList arraylist:
f = open('apis', 'r')
data = f.read()
f.close()
output = ""
for a in data.split('\n'):
output += "cmdList.add(%s);" % a.split('/')[-1].replace('.java', '.class')
# wrote output to a file, copied content to mgmt server impl's getCommands()
# similarly, fixed import statements using same code, splitting on /
Testing:
Ran apiserver, put breakpoints in ApiServer's init() where classes are processed
Total cmd classes found by reflections (ReflectUtil) = 354
Total cmd classes found by getCommands for all pluggable services = 354
Next, copied the comma separated values for each set to a string in ipython, a & b
set(a).difference(set(b)) returned null.
The above test implies both set of cmd classes found by both methods, i.e. using
reflections and using getCommands() had same set of apis and all were unique.
Conclusion:
The changes are idempotent and don't break api server's cmd class api discovery
processing.
BUG-ID: CLOUDSTACK-1210
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-08 16:48:13 +05:30
0b1e3a4af0
Move Api rate limit configurations from xml file to global
...
configuration, and also modify listCapabilitiesCmd to also return api
limit interval and max for UI consumption.
2013-02-08 00:02:25 -08:00
14ef9151a5
Fix ClassCastException.
2013-02-07 16:23:56 -08:00
951cba92bb
Merge branch 'sg-in-advanced-zone'
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2013-02-07 15:19:41 -08:00
a71fb83c77
CLOUDSTACK-1178:DB Commit warning logged for every Deploy VM request
...
removing the regression that introduced premature transaction commit
2013-02-07 13:12:37 +05:30
13a4c0670e
CLOUDSTACK-1176 1) remove 'final' modifier from id attribute in SnapshotVO 2) make state setter method comply with convention
2013-02-07 13:41:49 +08:00
7c003611d0
CLOUDSTACK-1181: Fix NPE, ignore if default path is not readable, we're passing props file anyway
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-07 11:09:56 +05:30
06acd9f0ea
IPv6: One network can have more than one vlan
2013-02-06 20:07:07 -08:00
3d1989c103
IPv6: CLOUDSTACK-1141: Fix reboot router with IPv6 assigned VM
2013-02-06 13:59:53 -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
dfcd9b05a0
ApiServer: Ask pluggable services to return list of apis to ApiServer
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-06 16:54:46 +05:30
8c5cd42b56
ManagementServerImpl: Fix NPE, PluggableService should not return null list
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-06 16:54:46 +05:30
fda8ec3c59
IPv6: CLOUDSTACK-1153: Fix integer overflow on IPv6 address calcuation
...
Use BigInteger, which is 128 bits long.
2013-02-05 17:41:37 -08:00
f89dd9050c
IPv6: CLOUDSTACK-1113: Fix the mechanism to find the usable IP in the IPv6
...
The new policy is:
1. Generate a random IP.
2. Find the next available IP, start from the generated IP.
3. If we cannot find an available IP after certain times(10000 by default,
network.ipv6.search.retry.max) retry, give up.
2013-02-05 14:31:12 -08:00
2e236a8322
IPv6: Fix ip address in range check
2013-02-05 14:31:06 -08:00
0ff6612f7f
CLOUDSTACK-446 : Host going to alert state, if you are adding already added host
...
Adding an already added host fails with error but in the process incorrectly updates the status of the host to 'Alert'. Put a check to prevent this.
2013-02-05 19:11:22 +05:30
0816a0bdea
CLOUDSTACK-1154: Added @Component annotation to RegionServiceImpl and RegionManagerImpl
2013-02-05 17:18:23 +05:30
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
2b267c1ceb
CLOUDSTACK-1142: Refactor handleRequest definition, clean redundant code
...
- Get rid of boolean decode arg
- Method assumes that OTW params have been already decoded
- Remove redundant code that tries to decode again based on boolean arg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-05 10:37:09 +05:30
d8062e5633
CLOUDSTACK-1142 Testing LDAP Auth Failed - due to % being illegal character in queryfilter
2013-02-05 11:26:42 +08:00
8a86d08fe3
CLOUDSTACK-737
...
Security Group script assume there is only one nic per VM, it is a big task to support multiple NICs, may seperate that as another project
2013-02-04 17:09:06 -08:00
f8a22d7520
Fix the situation where only a gateway and a netmask is passed with the
...
createNetwork command.
2013-02-04 15:08:53 +01:00
6b3da5fbdc
CLOUDSTACK-1083: Include removed projects while listing usage records
2013-02-04 19:29:59 +05:30
0495f5309e
Remove yet another test where the database was not properly mocked. FIXME
2013-02-02 12:18:51 +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
777147ce8a
CS-CLOUDSTACK-606:
...
The issue happens randomly when hosts in a cluster gets distributed across multiple MS. Host can get split in following scenarios:
a. Add host – MS on which add host is executed takes ownership of the host. So if 2 hosts belonging to same cluster are added from 2 different MS then cluster gets split
b. scanDirectAgentToLoad – This runs every 90 secs. and check if there are any hosts that needs to be reconnected. The current logic of host scan can also lead to a split
The idea is to fix (b) to ensure that hosts in a cluster are managed by same MS. For (a) only the entry in the database is going to be created except in case if the host getting added is first in the cluster (in this case agent creation happens at the same time) and then (b) will take care of connection and agent creation part. Since currently addHost only creates an entry in the db there is a small window where the host state will be shown as 'Alert' till the time (b) is scheduled and picks up the host to make a connection. The MS doing add host will immediately schedule a scan task and also send notification to peers to start the scan task.
2013-02-01 15:34:41 +05:30
13ee8d1865
Persistent Networks support
...
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 15:10:06 +05:30
482ea4a71e
CLOUDSTACK-822: system.vm.password is not encrypted
...
Signed-off-by: Kishan Kavala <kishan@cloud.com>
2013-02-01 14:18:59 +05:30
fc925022bd
Upgrade changes for Region schema. Made region_id not null
2013-02-01 13:49:57 +05:30
519ca619df
Encode password using UserAuthenticator
2013-02-01 12:23:15 +05:30
4f53eb11f0
Merge branch 'master' into regions
2013-02-01 11:59:12 +05:30
1a348c85fd
adding apache license heders to the files that are faling RAT check
2013-02-01 11:41:30 +05:30
9ea90c3359
Merge branch 'master' into regions
...
Conflicts:
client/tomcatconf/components.xml.in
server/src/com/cloud/api/ApiResponseHelper.java
2013-02-01 11:38:16 +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
c0b18c76f0
IPv6: Add missing license header
2013-01-31 17:26:46 -08:00
7bd8bec68a
Sync javelin with master up to 894cb8f7d9
2013-01-31 17:20:19 -08:00
65210f4e7e
CLOUDSTACK-737
...
support multiple NICs in Security group in java side
2013-01-31 15:45:52 -08:00
5cb9df91a1
Merge branch 'ipv6'
...
Conflicts:
api/src/com/cloud/network/NetworkProfile.java
2013-01-31 15:07:33 -08:00
44d1397d36
fix CS-1080
2013-01-31 13:04:36 -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
6a6d93c309
Fix a bug in listStoragePools api where SQL exception is thrown when a
...
parameter is passed.
2013-01-31 11:56:48 -08:00
1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
a33d8f9601
Fixed listRegions serach by id, name
2013-01-31 23:25:29 +05:30
c607e03f0e
Merge branch 'master' into regions
2013-01-31 22:31:25 +05:30
e7341313e9
Added unit tests
2013-01-31 22:28:09 +05:30
c17c7007f4
Added RegionServiceImpl to DefaultComponentLibrary
2013-01-31 18:26:54 +05:30
1b922e816c
Revert "CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second"
...
Reverted as per discussion at http://s.apache.org/NOm
This reverts commit 5060f98268
2013-01-31 18:15:41 +05:30
8b1a5b1de2
- Separated RegionServiceImpl and RegionManagerImpl
...
- Added comments
- Changed package name to org.apache.cloudstack.region
2013-01-31 18:08:20 +05:30
ed777bb7f3
IPv6: Check startipv6, endipv6 and ip6Gateway with ip range
2013-01-30 22:13:46 -08:00
b6727e5646
CLOUDSTACK-299: Egress firewall rules feature for guest network on VR
2013-01-31 11:20:47 +05:30
f57cbaacd6
IPv6: Fix VlanIpRangeResponse
2013-01-30 20:01:04 -08:00
f45576bce5
IPv6: Fix missed AddressFormat in nic table
2013-01-30 19:46:30 -08:00
4adc974ab7
IPv6: Disable untested features
2013-01-30 17:43:29 -08:00
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
b21595c10d
CLOUDSTACK-297: Reset SSH key to access VM
...
This feature provides resetting a SSH key for an existing VM which means,
setting the old ssh key that is assigned to the VM previously with the new ssh
key.
Signed-off-by: Harikrishna Patnala <harikrishna.patnala@citrix.com>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 17:33:44 -08:00
ed547d91f7
IPv6: Rename public_ipv6_address to user_ipv6_address
2013-01-30 17:05:47 -08:00
15906c03ca
Summary: add/remove/update default nics feature
...
Description: Adds API calls updateDefaultNicForVirtualMachine,
addNicToVirtualMachine, and removeNicFromVirtualMachine. These are
intended to allow a user to modify a VM's configuration post
deployment, to adjust the networks to which the VM belongs.
BUG-ID: CLOUDSTACK-645
Submitted-by: Brian Angus <blangus@betterservers.com>
Submitted-by: Ryan Dietrich <ryan@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359494800 -0700
2013-01-30 17:43:21 -07:00
99556a4f30
CLOUDSTACK-617: Unable to edit a sub-domain. Change UpdateDomain to be consistent with CreateDomain i.e. before this operation, while checking if the domain-name is unique, search under the parent domain instead of searching under the ROOT domain.
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 16:40:48 -08:00
85aa3a9977
Revert "api: Include cloudstack-version in both xml and json api response"
...
This reverts commit f8a483fc5a
2013-01-30 16:12:21 -08:00
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
da2e6461a6
Remove temporary hacking and use Official way to wire-up servlet with injection under Spring
2013-01-30 15:21:01 -08:00
25ae2e4f3f
IPv6: Remove dualstack parameter from createNetworkCmd
...
We can tell if it's dual stack by looking into the startIp and startIpv6.
2013-01-30 13:35:47 -08:00
6b19086874
Fix a bug in listHosts that returns wrong zoneId for host.
2013-01-30 10:47:16 -08:00
301c4413bc
CLOUDSTACK-1054: When calling listDomains through the API do not restrict ADMIN users
...
When an admin calls this command without the ID parameter do not set the domain's ID
to the ID where the admin is in, this prevents him from doing lookups.
2013-01-30 15:48:01 +01:00
f9a68e7f15
IPv6: Add vlan overlap checking
2013-01-29 22:01:38 -08:00
b1972f6c11
IPv6: Update NetworkResponse and NicResponse
2013-01-29 22:01:31 -08:00
60fd29dacd
Add sync entry to region_sunc table on region api failure
2013-01-30 11:11:49 +05:30
0b62fc4c17
IPv6: Verify if requested IPv4/IPv6 addresses are valid
...
Also rename NetUtils.isValidIPv6() to NetUtils.isValidIpv6()
2013-01-29 19:08:09 -08:00
cb9f2d018d
IPv6: move assignPublicIp6Address() from NetworkManager to new Ipv6AddressManager
...
Don't want to involve IP address management code in NetworkManager.
2013-01-29 19:08:03 -08:00
1f7eaf3d61
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
merge baremetal feature to master
2013-01-29 17:19:57 -08:00
d3089ba2a5
Merge branch 'master' into regions
2013-01-29 11:50:49 +05:30
158ee8b2fa
Add sync entry to region_sunc table on region api failure
2013-01-29 11:49:23 +05:30
2cbca372bf
IPv6: Add support for IPv6 on DeployVMCmd
2013-01-28 18:54:34 -08:00
8887f01b37
CLOUDSTACK-1070: HypervisorTemplateAdapter needs to be configured with proper name
2013-01-28 17:12:41 -08:00
71835018e5
CLOUDSTACK-249: Add hostId to failed VM deploy alerts
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-28 15:27:09 -08:00
ea660cd06d
removed MockAPI server
2013-01-28 17:50:38 +05:30
def9fd1f2e
remove finduser, findaccount, finddomain APIs
2013-01-28 17:04:25 +05:30
fa00ddf07e
IPv6: Fix getIp6FromRange()
2013-01-27 19:07:44 -08:00
74811fa8b4
IPv6: Disable password and userdata service for ipv6 for now
...
Would add support later.
2013-01-26 23:14:48 -08:00
6169c1d724
IPv6: Enable IPv6 address for router
2013-01-26 23:14:21 -08:00
bd4bc025d1
IPv6: Accept IPv6 parameter for createNetworkCmd
...
Also ass public_ipv6_address for ipv6 address management.
Extend nics and vlans for ipv6 address.
Add dependency to com.googlecode.ipv6(java-ipv6).
Modify dhcpcommand for ipv6.
2013-01-26 23:14:15 -08:00
1450547987
Put usage server under Spring
2013-01-25 23:00:55 -08:00
767f54cc9a
Make nonoss build work under Spring
2013-01-25 17:18:36 -08:00
fc7d07305f
Fix a bug in listHosts that returns wrong zoneId for host.(cherry picked from commit 17c419ceb4)
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-25 14:21:41 -08:00
17c419ceb4
Fix a bug in listHosts that returns wrong zoneId for host.
2013-01-25 14:18:25 -08:00
e9bca76a32
set local storage as up
2013-01-25 13:07:36 -08:00
c6ae19d12f
Merge branch 'master' into regions
2013-01-25 18:49:47 +05:30
de20cb6c1a
Apply API refactoring changes. Make changes to Regions API to work with new code
2013-01-25 18:45:01 +05:30
1f57d925eb
Apply API refactoring changes. Make changes to Regions API to work with new code
2013-01-25 18:41:59 +05:30
df5c4c3048
Fixing VPC unit test to use Spring
2013-01-24 23:05:31 -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
f8e5740c31
A workaround to injection problems in servlets (ConsoleProxyServlet and RegisterCompletionServlet) classes
2013-01-24 18:04:48 -08:00
d7201dfe1f
CLOUDSTACK-737
...
add xenserver support in UI
only XenServer and KVM clusters are allowed in security enabled zone.
only shared security enabled networks are allowed in security enabled zone.
2013-01-24 17:26:51 -08:00
b6f780fa33
Fix StoragePool unit testcase.
2013-01-24 16:11:35 -08:00
f85ac65645
Fix Snapshot unit testcase.
2013-01-24 16:05:03 -08:00
e5b23e387d
AccountManagerImpl: Fix method to check and return systemuser, spring injection failsafe
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 15:41:04 -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
1567a112fa
unit test works again
2013-01-24 14:36:44 -08:00
057097d0e0
Planner should set the pool information in the destination for volumes that are not yet ready.
2013-01-23 17:31:00 -08:00
45a92ba369
Fix the initialization of management server
2013-01-23 15:29:41 -08:00
a7fd74f94a
ApiDispatcher: Fix uuid->id translation and throw better debug statement
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
b335684ec5
EntityManager: Implement method to search by uuid including removed entities
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
7a927e36f0
ReflectUtil: Use collections to grow list and not manual array memory management
...
Fix usage in ApiDispatcher. Add two kinds of helpers:
- One that gets list of exclude cmd whose fields are not be included
- One that loops till a base class is asssignable from superclass
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
a8623bacd7
ApiXmlDocWriter: Fix multiple field occurence in apidocs by using set
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
95aef332cc
CLOUDSTACK-737,
...
allow to add security group enabled networks in security group enabled zone
2013-01-23 11:08:24 -08:00
485761f0b4
Fix a bug for listZones and listServiceOfferings for normal user, caused
...
by a misuse of SearchCriteria class.
2013-01-23 10:17:08 -08:00
1e40551cd5
Disabled test 'com.cloud.network.vpn.RemoteAccessVpnTest' as it requires
...
a database connection which we don't have during unittest phase.
2013-01-23 08:46:53 +01:00
c3f1a9d324
CLOUDSTACK-355: fix count for listSwiftsCmd.
2013-01-22 17:14:44 -08:00
e5bf16b00f
Fixing error with merge
2013-01-22 16:44:28 -08:00
26be5ce2df
CLOUDSTACK-355: create DB view for ZoneResponse to fix count for
...
listZonesByCmd.
2013-01-22 16:39:45 -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
434c21a149
Fixing Merge error
2013-01-22 12:54:18 -08:00
02185d4240
VO should not contain any DAO. Transient should be loaded by the caller using the Dao.
2013-01-22 12:54:16 -08:00
e6cd47ddc0
More changes for deployVM flow.
2013-01-22 12:54:07 -08:00
94e8090bf3
Deploy, Start, Stop, Destroy VM orchestration service changes
2013-01-22 12:54:04 -08:00
ee39ec82d3
Making unit tests work
2013-01-22 11:18:51 -08:00
2e14cf5b57
Summary: Allow for same vlan num on different physical NICs
...
Detail: A previous bug in the database schema did not allow the same vlan num
to exist on separate physical networks, even though this is possible and should
be allowed. To fix this, the code was changed to also disallow the same vlan
num on different physical networks, to avoid hitting the database constraint.
The database constraint has now been changed to allow only one of a vlan num
per physical nic per data center, so different physical nics can reuse vlan
numbers. This fix adjusts the code to match by removing the old fix.
BUG-ID: CLOUDSTACK-686
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358881555 -0700
2013-01-22 12:05:55 -07:00
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
6e40c33628
CLOUDSTACK-355: create DB view for ServiceOfferingResponse to fix count
...
for ListServiceOfferingsCmd.
2013-01-21 15:25:49 -08:00
6db719d58b
CLOUDSTACK-355: Create DB view to fix count issue for
...
listDiskOfferingsCmd.
2013-01-21 10:50:10 -08:00
f27692aa7a
Removed a useless class?
2013-01-21 10:25:58 -08:00
04d93ef0aa
Use the user.home property instead of a bash thing. See
...
http://docs.oracle.com/javase/tutorial/essential/environment/sysprop.html
2013-01-21 11:56:53 +01:00
2c5859dbd4
Bring javelin back to the status of being able to start System VMs after another round of master branch merge
2013-01-18 19:15:32 -08:00
64f13e1cd8
DatabaseCreator: Fast forward merge due to recent pull in merge of master
2013-01-18 18:16:04 -08:00
03a3837d92
DatabaseCreator: Make it reinit db, add flags, opts, run scripts and upgrade checkers
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:09:04 -08:00
fe6f0457d5
fixed unit tests from merge
2013-01-18 15:58:55 -08:00
2955d58976
Fix "Count" for listSnapshotPoliciesCmd.
2013-01-18 13:55:11 -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
ce4b49d30b
network-refactor merge: fix nonoss build
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-18 09:38:49 -08:00
e45a9f3aed
CLOUDSTACK-803: HA gets triggered even when the host investigator is unable to determine the state of the host HA won't be triggered in case the host investigator is not able to determine the state
...
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 17:20:51 +05:30
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
51c1ca7cbe
CLOUDSTACK-1010: Fix count issue for listHosts command
2013-01-18 16:13:25 +05:30
2fd1d476b4
Merge branch 'master' into api_limit
2013-01-17 21:23:50 -08:00
e5507c3892
Deprecate 2.1.x migration DAOs, it breaks EntityManager's singleton assumption
2013-01-17 18:55:14 -08:00
b45cdef5d9
DatabaseCreator: Process db props, sql and upgrade classes separately
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 18:25:27 -08:00
17a94b20ec
Always use premium setting in ConsoleProxyManager
2013-01-17 18:23:06 -08:00
b120e19280
ApiDispatcher: In case of incorrect long int value or uuid, throw error
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 17:59:53 -08:00
cd37e22f9b
CLOUDSTACK-810: Make DirectAgent thread pool size configurable Removed hard-coding of directagent thread pool size and now reading it from configuration
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-17 17:21:52 -08:00
f264571e92
ApiServer: Fix default reponse type for apiserver on intergration port to xml
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 17:03:27 -08:00
2d19f3b052
network-refactor: merge stomped on a logical not'
2013-01-17 16:59:48 -08:00
8d016d035b
MockConfigurationDaoImpl: Fix build issue, add base class method
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 16:15:15 -08:00
ef07cde449
DBCreator: Fix ScriptRunner to strip comments, reformat code
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 16:10:07 -08:00
86ada92ffa
Fix some bugs and add java integration test for api rate limit plugin.
2013-01-17 15:13:51 -08:00
6d155416c2
System VM can start now with Spring bootstraped management server
2013-01-17 14:22:14 -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
cbb7ff1c32
added missing files
2013-01-17 06:50:59 -08:00
b751b69c55
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-17 06:50:19 -08:00
9759ad57f2
Commit the current changes to unit tests
2013-01-17 06:50:11 -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
d9e36ac37b
network-refactor: fix license issues
...
Fix build after merge of network-refactor
2013-01-16 19:25:23 -08:00
4d4fb9c959
https://issues.apache.org/jira/browse/CLOUDSTACK-993
...
Changes:
- Introduction of maven skipped the java code that inserts the admin user. This causes the NPE in management server while trying to find the user and also, admin user cannot login as expected.
- Fixing the insertion of the admin user as part of startup.
2013-01-16 19:18:59 -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
c08d151e05
https://issues.apache.org/jira/browse/CLOUDSTACK-993
...
Changes:
- Introduction of maven skipped the java code that inserts the admin user. This causes the NPE in management server while trying to find the user and also, admin user cannot login as expected.
- Fixing the insertion of the admin user as part of startup.
2013-01-16 17:18:11 -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
727fab71cb
Disable StorageProvider, storageType introduced in Javelin new code, temporarily, to make existing code run
2013-01-16 14:16:01 -08:00
4c1257bf18
Handle proxy object situation in dispatching API command
2013-01-16 11:28:09 -08:00
e83fe471c7
Merge branch 'master' into api_limit
2013-01-16 10:49:25 -08:00
4b67340d8c
Revert "Summary: partical check-in for L4-L7 network services in the
...
shared"
This reverts commits 0de5a145e428bbf6c527
2013-01-16 16:43:37 +05:30
316c5267cc
Revert " Summary: check-in for L4-L7 network services in the shared network in"
...
This reverts commit 7fcfcdf91e
2013-01-16 16:04:14 +05:30
156ed7a336
Revert "Summary: partical check-in for L4-L7 network services in the shared"
...
Reverting due to IP clearance issued for the commit done as part of
CLOUDSTACK-312
This reverts commit d4c604cfd8
2013-01-16 15:58:44 +05:30
Min Chen
Sheng Yang
Alex Huang
Edison Su
Marcus Sorensen
Mice Xia
Wei Zhou
Rohit Yadav
Sanjay Tripathi
Murali Reddy
anthony
Anthony Xu
Koushik Das
Kishan Kavala
Anthony Xu
Hugo Trippaers
Hugo Trippaers
Kelven Yang
Likitha Shetty
Saksham Srivastava
joesan
Prasanna Santhanam
Jayapal
Harikrishna Patnala
Wido den Hollander
frank
Andrew Bayer
Edison Su
Prachi Damle
Chiradeep Vittal