660 Commits

Author SHA1 Message Date
Prachi Damle
fe2a86871f Changes to add AffinityGroupprocessor, deployVM changes 2013-04-11 13:22:42 -07:00
Chiradeep Vittal
2e6c65fd34 QuickCloud: sanitize logs for normal running of agents outside systemvm 2013-04-09 14:45:27 -07:00
Kelven Yang
c062808912 CLOUDSTACK-1917: Finalize componentContext.xml/nonComponentContext.xml content organization to be plugin friendly 2013-04-04 15:35:18 -07:00
Brian Spindler
469c4dd139 Removing ^M's from code.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-04 00:53:20 +05:30
Kelven Yang
58c962ef15 Retire unused files to avoid confusions 2013-04-02 15:55:41 -07:00
Wido den Hollander
ea0daeaee3 CLOUDSTACK-1158: Wrap qemu-img into it's own util
Signed-off-by: Edison Su <sudison@gmail.com>
2013-04-01 16:37:58 -07:00
Kelven Yang
85971b5194 CLOUDSTACK-1818: make DababaseCreator ready to invoke DatabaseUpgradeChecker, adjust Component startup sequence for integrity checkers
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-29 11:12:36 -07:00
Kelven Yang
3ab744d100 CLOUDSTACK-1795: implement custom AOP to fully support legacy CloudStack AOP semantcis
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-29 11:12:36 -07:00
Sanjay Tripathi
18695276f7 CLOUDSTACK-1156: Limit Primary and Secondary storage for domain/accounts
Addition of two new resource types i.e. Primary and Secondary storage space in the existing pool of
    resource types.
    Added methods to set the limits on these resources using updateResourceLimit
    API command and to get a count using updateResourceCount. Also added calls in the
    Templates, Volumes, Snapshots life cycle to check these limits and to increment/decrement the new
    resource types

    Resource Name          :: Resource type number
        Primary Storage               10
        Secondary Storage             11

    Also added jUnit Tests for the same.
Reviewed by : nitin mehta<nitin.mehta@citrix.com>
2013-03-29 11:26:38 +05:30
Pradeep Soundararajan
582f8a0f38 BUG-ID: CLOUDSTACK-1713, CLOUDSTACK-1719
Summary: EC2 REST API: AWS APIs are not getting translated on the CloudStack Management Server and AWS API Installation Problems.

Fixing the class not found exception, key not found and other issues as mentioned in the above two defects.

Signed-off-by: Pradeep <pradeep.soundararajan@citrix.com>
2013-03-26 13:28:03 +00:00
Wei Zhou
86a2a75046 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:31:52 +00:00
Kelven Yang
fb94b72213 CLOUDSTACK-1568,CLOUDSTACK-1664: Fix ActionEvent interception and optimize @DB lookup with caching 2013-03-18 18:07:52 -07:00
Prachi Damle
d9b85e397d 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 12:12:56 -07:00
Kelven Yang
c235d029ce CLOUDSTACK-1267: Configure log4j in proper place so that it can be initialized correctly in KVM and system VM environment 2013-03-11 19:13:32 -07:00
Kelven Yang
89f4ac0439 CLOUDSTACK-1562: Replace @DB support to be the formal implementation instead of a temporary hacking one 2013-03-07 15:47:01 -08:00
Kelven Yang
0b84958a66 Fix an out-dated unit test assertion 2013-03-05 19:47:37 -05:00
Kelven Yang
cc91d826df Fix conflicts in storage subsystem with Spring 2013-03-05 19:03:31 -05:00
Kelven Yang
3f2b771e07 CLOUDSTACK-1173: fix the regression caused by life-cycle management changes 2013-03-05 19:03:30 -05:00
Kelven Yang
333dd810d2 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-03-05 19:03:30 -05:00
Edison Su
8ae8001933 CLOUDSTACK-1498: even we put the db encryption check at the wrong place, but seems it breaks other people's task, so add it back 2013-03-04 14:11:09 -08:00
frank
bd0fc2f354 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

Conflicts:

	client/pom.xml
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
	plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
2013-02-28 15:42:48 -08:00
Edison Su
8e360f342d CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support 2013-02-26 18:39:23 -08:00
Rohit Yadav
a32c6d5c9d db: Fix deploydb, make sure scripts are in path
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-25 11:00:56 +05:30
Sheng Yang
a0762bc4a7 CLOUDSTACK-1303: Fix NPE when extend vlan with ipv4 only 2013-02-21 18:02:50 -08:00
frank
8a523476ec CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

remove workaround for unable to deploydb
remove wrongly added region upgrade entries
2013-02-21 15:48:26 -08:00
frank
1f15c1e9e7 CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

fixing bugs to align to new code base

Conflicts:

	client/tomcatconf/componentContext.xml.in
2013-02-21 15:42:38 -08:00
Rohit Yadav
80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
Likitha Shetty
87b668b71b 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>
2013-02-16 11:54:12 +05:30
Min Chen
5147fb16ac CLOUDSTACK-1253: Remove @author tag. 2013-02-15 10:42:06 -08:00
Rohit Yadav
44287d20c0 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>
2013-02-11 12:14:46 +05:30
Kelven Yang
c67b9c9650 Avoid using strong-type-safe in Java generics provided only by higher version JDK compilers, make it more friendly to old-fashion 1.5 javac compiler 2013-02-08 18:00:33 -08:00
Hugo Trippaers
b28f3addfc If encryption is already initialized we don't need to do it again. 2013-02-06 16:49:12 +01:00
Hugo Trippaers
b1d70f7fe3 Before any database calls are made we need to make sure that encryption
is properly initialized if we have an encrypted db.properties.
2013-02-06 15:55:13 +01:00
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
Hugo Trippaers
9d134f0f19 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
2013-02-05 23:50:01 +01: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
Hugo Trippaers
cb6b96cda2 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.
2013-02-05 20:49:02 +01:00
Rohit Yadav
9cf5f9d780 Transaction: Fix better debug message
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-05 12:42:33 +05:30
Rohit Yadav
7795cfd759 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>
2013-02-05 12:35:43 +05:30
Rohit Yadav
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
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 894cb8f7d9fc8b5561754a9fa541fef8f235148a 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