Commit Graph

643 Commits

Author SHA1 Message Date
Wei Zhou 0ce1d4fde1 CLOUDSTACK-1668: Fix IP conflict in VPC tier
Currently, allPossibleIps return the Ip lists which include the gateway,
so we need to remove gateway ip from this list.

Now, for non-VPC network it works, because NetUtils.getAllIpsFromCidr
return the Ip lists which do not include the first IP of the network
(like 192.168.0.1).
We need too add the first IP into the returned Ip list, because it can
be used for VM if it is not the gateway IP (for example, VPC networks).

The corresponding patch for 4.0.1 has been posted on
https://reviews.apache.org/r/9923/

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-20 00:26:37 +00:00
Prachi Damle b66ee30566 CLOUDSTACK-1706 Failed to deploy VM with error "cannot find DeployPlannerSelector"
Changes:

- Regular plugin/adapter components should usually be loaded at run level RUNLEVEL_COMPONENT(5)
- HypervisorVmPlannerSelector was at level 0, while configurationServer at level 2  - causing config to be not loaded for the HypervisorVmPlannerSelector
2013-03-18 15:16:47 -04:00
Kelven Yang d813a7ba98 CLOUDSTACK-1267: Configure log4j in proper place so that it can be initialized correctly in KVM and system VM environment 2013-03-12 09:36:08 -04:00
Kelven Yang 6213935f22 Disable out-dated CGLIB unit test assertion 2013-03-07 19:13:34 -05:00
Kelven Yang 0783839530 CLOUDSTACK-1562: Replace @DB support to be the formal implementation instead of a temporary hacking one 2013-03-07 19:13:10 -05:00
frank 2093aefcb8 CloudStack CLOUDSTACK-723
Enhanced baremetal servers support on Cisco UCS

change UcsXxxDao to Spring xml loading
change ListxxxCmd to inherit ListCmd
change API response in line with current API architecture
adding missing db schema  to db upgrade schemaOh
2013-02-28 15:34:57 -08:00
Kelven Yang df8c7506fc CLOUDSTACK-1173: fix the regression caused by life-cycle management changes 2013-02-26 11:51:31 -08:00
Kelven Yang 4f38d745b8 CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory 2013-02-24 13:31:42 -08:00
Sheng Yang 1f64917fcc CLOUDSTACK-1303: Fix NPE when extend vlan with ipv4 only 2013-02-21 16:45:15 -08:00
frank 172de30341 CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

remove workaround for unable to deploydb
remove wrongly added region upgrade entries
2013-02-21 15:39:15 -08:00
frank 241d05e685 CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

fixing bugs to align to new code base
2013-02-21 15:39:15 -08:00
Likitha Shetty ed06c16944 CLOUDSTACK-863: Fix Non-printable characters in api call
Non-printable characters results in empty pages for all users loading the
corrupted object in the web interface. It also results in the API call results
getting truncated with an error when it encounters the non-printable characters.
Every decoded parameter value is checked for control character using OWASP's
ESAPI library.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 87b668b71b)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 11:56:50 +05:30
Min Chen 2ee16350dd CLOUDSTACK-1253: Remove @author tag. 2013-02-15 10:40:39 -08:00
Rohit Yadav a184816488 CLOUDSTACK-1181: Find by catalina.home property first
The previous commit fails if a person had defined CATALINA_HOME already.
Instead of system env variable, get any passed variable 'catalina.home' and find
the file in that path.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 44287d20c0)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-11 12:18:33 +05:30
Hugo Trippaers 76a5bdac70 Before any database calls are made we need to make sure that encryption
is properly initialized if we have an encrypted db.properties.(cherry picked from commit b1d70f7fe3)

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-02-06 23:03:22 +01:00
Hugo Trippaers 6287d4512e If encryption is already initialized we don't need to do it again.(cherry picked from commit b28f3addfc)
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-02-06 23:00:19 +01:00
Sheng Yang 659955483d IPv6: CLOUDSTACK-1153: Fix integer overflow on IPv6 address calcuation
Use BigInteger, which is 128 bits long.
2013-02-05 17:41:12 -08:00
Hugo Trippaers 5793a0c597 Summary: We need the integrity checkers to run
The EncryptionSecretKeyChecker is required to load db.properties with
encrypted passwords.

Make usre the integrity checkers are run before anything else during
start-up(cherry picked from commit 9d134f0f19)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-05 23:51:55 +01:00
Sheng Yang 5c7ab24b85 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:27:05 -08:00
Sheng Yang 22383d7837 IPv6: Fix ip address in range check 2013-02-05 13:21:41 -08:00
Hugo Trippaers 6a19da78c3 Summary: Path changes for new rpm packaging
The path to the keyfile was hardcoded, so added an alternative path for
compatibility with the packaging locations. Should ideally become a
setting in the config file.(cherry picked from commit cb6b96cda2)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-05 21:14:34 +01:00
Rohit Yadav 2fd8b15d64 Transaction: Fix better debug message
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 9cf5f9d780)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-05 12:44:21 +05:30
Rohit Yadav 482e939456 Transaction: Fix NPE while reading db.properties file
Handle NPE while setting up data source in Transaction

- This occured as Transaction is called it would run the following which
  assumed db.properties file, which may not be in one's classpath;

        // Initialize with assumed db.properties file
        initDataSource("db.properties");
- So, while this would be logged in logs, this is ignored for DatabaseCreator's
  case. In DatabaseCreator we call initDataSource with full path anyway.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 7795cfd759)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-05 12:44:11 +05:30
Rohit Yadav 7da991638f rat: Fix license headers on ucs plugin etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit c9e764818b)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-02 08:58:34 -08:00
Kelven Yang 7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
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
Kelven Yang 7bd8bec68a Sync javelin with master up to 894cb8f7d9 2013-01-31 17:20:19 -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
Kelven Yang 176523254e Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
Kelven Yang da2e6461a6 Remove temporary hacking and use Official way to wire-up servlet with injection under Spring 2013-01-30 15:21:01 -08:00
Sheng Yang 4640b82719 IPv6: Fix generated DUID-LL
Should be: 00:03:00:01 + <Mac>
2013-01-29 22:01:44 -08:00
Sheng Yang f9a68e7f15 IPv6: Add vlan overlap checking 2013-01-29 22:01:38 -08:00
Sheng Yang 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
Sheng Yang 2cbca372bf IPv6: Add support for IPv6 on DeployVMCmd 2013-01-28 18:54:34 -08:00
Kelven Yang 8887f01b37 CLOUDSTACK-1070: HypervisorTemplateAdapter needs to be configured with proper name 2013-01-28 17:12:41 -08:00
frank 997e9fb7b0 CloudStack CLOUDSTACK-723
Enhanced baremetal servers support on Cisco UCS
2013-01-28 16:29:54 -08:00
Sheng Yang fa00ddf07e IPv6: Fix getIp6FromRange() 2013-01-27 19:07:44 -08:00
Sheng Yang 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
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
Kishan Kavala c6ae19d12f Merge branch 'master' into regions 2013-01-25 18:49:47 +05:30
Kishan Kavala 1f57d925eb Apply API refactoring changes. Make changes to Regions API to work with new code 2013-01-25 18:41:59 +05:30
Edison Su cb25eed37a forget to check in code 2013-01-25 00:25:14 -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
Alex Huang 1567a112fa unit test works again 2013-01-24 14:36:44 -08:00
Kelven Yang a26e075f0e Remove final modifer to ListS3Cmd class as it conflicts with Spring injection 2013-01-23 18:24:03 -08:00
Kelven Yang 45a92ba369 Fix the initialization of management server 2013-01-23 15:29:41 -08:00
Rohit Yadav 03d2c015ae GenericDao: Add method to find by uuid string including removed entities
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 14:57:41 -08:00
Rohit Yadav 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