6157 Commits

Author SHA1 Message Date
Murali Reddy
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
Sheng Yang
d9aa051953 Fix a typo
CanUseForDeploy() didn't return correct result due to this
2013-02-08 14:48:14 -08:00
Sheng Yang
0c5c08b78b IPv6: CLOUDSTACK-1107: Add support for createVlanIpRange to extend existed network 2013-02-08 14:48:08 -08:00
Min Chen
1cf85aa87a CLOUDSTACK-1216: insert UUID when we create "admin" user in DB. 2013-02-08 14:18:31 -08:00
anthony
6df0ff2596 fix build issue after revert 2013-02-08 12:30:12 -08:00
anthony
c0f2cf1e06 Revert "Revert "CLOUDSTACK-737""
This reverts commit dd67cfc5d07783cd4f8cf3480323f3ed030cc216.
2013-02-08 12:19:31 -08:00
anthony
b66f6c88f9 Revert "Revert "CLOUDSTACK-737""
This reverts commit 447d49ae91277be2d8e60c28a5acd86a0e6691d5.
2013-02-08 12:19:03 -08:00
Anthony Xu
27d1f3fa07 Revert "CLOUDSTACK-737"
This reverts commit 8a86d08fe307719e50d28d61d8e9025e56ab27da.
2013-02-08 10:47:40 -08:00
Anthony Xu
a2fa167613 Revert " CLOUDSTACK-737"
This reverts commit 65210f4e7ee62b237ccdd8d853553e7c990f19c8.

Conflicts:
	server/src/com/cloud/vm/UserVmManagerImpl.java
2013-02-08 10:47:08 -08:00
Anthony Xu
447d49ae91 Revert "CLOUDSTACK-737"
This reverts commit d7201dfe1f49fb75054e1f0b6922ed21446ad130.

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
2013-02-08 10:46:20 -08:00
Anthony Xu
dd67cfc5d0 Revert "CLOUDSTACK-737"
This reverts commit d7201dfe1f49fb75054e1f0b6922ed21446ad130.

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
2013-02-08 10:45:40 -08:00
Anthony Xu
0a6c6bb254 Revert "CLOUDSTACK-737"
This reverts commit d7201dfe1f49fb75054e1f0b6922ed21446ad130.

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2013-02-08 10:42:36 -08:00
Anthony Xu
b4f3f92607 Revert " CLOUDSTACK-737,"
This reverts commit 95aef332cc851f91bafb9af7bf5f0f682bb566ce.
2013-02-08 10:29:53 -08:00
Murali Reddy
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
Rohit Yadav
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
Min Chen
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
anthony
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
Murali Reddy
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
Mice Xia
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
Rohit Yadav
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
Sheng Yang
06acd9f0ea IPv6: One network can have more than one vlan 2013-02-06 20:07:07 -08:00
Sheng Yang
3d1989c103 IPv6: CLOUDSTACK-1141: Fix reboot router with IPv6 assigned VM 2013-02-06 13:59:53 -08:00
Marcus Sorensen
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
Rohit Yadav
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
Rohit Yadav
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
Sheng Yang
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
Sheng Yang
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
Sheng Yang
2e236a8322 IPv6: Fix ip address in range check 2013-02-05 14:31:06 -08:00
Koushik Das
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
Kishan Kavala
0816a0bdea CLOUDSTACK-1154: Added @Component annotation to RegionServiceImpl and RegionManagerImpl 2013-02-05 17:18:23 +05:30
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
Rohit Yadav
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
Mice Xia
d8062e5633 CLOUDSTACK-1142 Testing LDAP Auth Failed - due to % being illegal character in queryfilter 2013-02-05 11:26:42 +08:00
Anthony Xu
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
Hugo Trippaers
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
Kishan Kavala
6b3da5fbdc CLOUDSTACK-1083: Include removed projects while listing usage records 2013-02-04 19:29:59 +05:30
Hugo Trippaers
0495f5309e Remove yet another test where the database was not properly mocked. FIXME 2013-02-02 12:18:51 +01:00
Kelven Yang
296c20332d Merge javelin into master 2013-02-01 14:40:45 -08:00
Kelven Yang
7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Koushik Das
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
Likitha Shetty
13ee8d1865 Persistent Networks support
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 15:10:06 +05:30
Saksham Srivastava
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
Kishan Kavala
fc925022bd Upgrade changes for Region schema. Made region_id not null 2013-02-01 13:49:57 +05:30
Kishan Kavala
519ca619df Encode password using UserAuthenticator 2013-02-01 12:23:15 +05:30
Kishan Kavala
4f53eb11f0 Merge branch 'master' into regions 2013-02-01 11:59:12 +05:30
Murali Reddy
1a348c85fd adding apache license heders to the files that are faling RAT check 2013-02-01 11:41:30 +05:30
Kishan Kavala
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
Murali Reddy
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
Sheng Yang
c0b18c76f0 IPv6: Add missing license header 2013-01-31 17:26:46 -08:00
Kelven Yang
7bd8bec68a Sync javelin with master up to 894cb8f7d9fc8b5561754a9fa541fef8f235148a 2013-01-31 17:20:19 -08:00