Commit Graph

16072 Commits

Author SHA1 Message Date
Pradeep Soundararajan 8b2aabe687 Commit review 9409 Added a global package name in the packaging script
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
(cherry picked from commit 3279b41465)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-21 10:47:15 +01:00
Rohit Yadav 759b301341 CLOUDSTACK-1347: Don't enforce not null rule on queue_proc_time of sync_item_queue
In c63dbb8804 I removed the rule from create-schema:
-  `queue_proc_time` datetime COMMENT 'when processing started for the item',

But, upgrade path schema-40to410.sql had a different rule which caused the bug:
+ALTER TABLE `cloud`.`sync_queue_item` ADD `queue_proc_time` DATETIME NOT NULL
COMMENT 'when processing started for the item' AFTER `queue_proc_number`;

In this fix we just revert to whatever rule was defined in create-schema as the
developer may have forgetten to fix same rule in create-schema and upgrade path.
This commit can be reverted or the code be fixed if we want that queue_proc_time
cannot be null.

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-21 15:02:13 +05:30
Sheng Yang e4b83993a9 IPv6: Update java-ipv6 dependency to 0.10 2013-02-20 18:41:32 -08:00
Prachi Damle e6626973ed CLOUDSTACK-1346: Check to see if external devices are used in the network, is hardcoded for specific devices
- Changes the check to list all providers of a network and check if it is an external provider
2013-02-20 15:36:01 -08:00
Jessica Wang 9ba0f10ff1 CLOUDSTACK-1343: cloudstack UI - baremetal - enable baremetal providers who are selected in the network offering. 2013-02-20 15:09:41 -08:00
Prachi Damle 3c02af0cdf CLOUDSTACK-1344 Typo in use.external.dns setting description
Fixed the typo.
2013-02-20 12:01:22 -08:00
Chip Childers 86ce4c9ab1 Updating the java-ipv6 legal docs to reflect the newly added NOTICE and copyright statements for version 0.10
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-20 14:51:39 -05:00
Prachi Damle 20a747601c CLOUDSTACK-1331: Upgrade fails for a 2.2.14 Zone having multiple guest networks using network_tags and Public Vlan
Changes:
-We need to update the physical_network_id for public vlans.
-Physical network ID should be retrieved from the network if present.
2013-02-20 11:25:36 -08:00
radhikap cc72218975 cloudstack-806
Signed-off-by: radhikap <radhika.puthiyetath@citrix.com>
2013-02-20 10:23:05 -05:00
Chip Childers 46df530ad1 CLOUDSTACK-1341: Corrected the URL for the KEYS file
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-20 10:16:50 -05:00
Rohit Yadav 8d9412492c CLOUDSTACK-1312: Fix diversions between create-schema since 4.0 for 4.1 release
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 904561a1b0b969052286b7af0602465feb296d70)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 15:51:21 +05:30
Rohit Yadav 55271ab9e9 db: Remove create-schema-view.sql, views are created using schema-40to410.sql
- Remove create-schema-view.sql, views are created when mgmt server does rolling
  upgrade from 4.0.0 to 4.1.0
- Fix reference and usage of the sql file in scripts

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

Conflicts:
	setup/db/create-schema-view.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 15:02:05 +05:30
Rohit Yadav 8d1c460448 db: Fix developer's deploydb and cloud-setup-databases for rolling update
- Fix developer prefill to use 4.0's schema
- Fix developer/pom.xml and cloud-setup-databases to not run create-schema-view,
  the upgrade path is configured to do a rolling update and set it up

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 15:00:39 +05:30
Rohit Yadav 7ce22fc2b2 db: Fix commas which should be dots in create-schema, fix debug msg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 44c8a33cf2)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 14:57:05 +05:30
Rohit Yadav d427e1ae0d db: Remove and merge 4.1-new-db-schema.sql to schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit f2ae6dcda9)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 14:56:37 +05:30
Rohit Yadav 12b439baa6 db: Fix Upgrade40to41 and add cleaning path schema-40to410-cleanup.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 46ab973143)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 14:52:37 +05:30
Sheng Yang 373c927a1e IPv6: Fix db upgrade path
All the table column should be modified before view was added
2013-02-19 21:23:59 -08:00
Kelven Yang cc58b7b85a CLOUDSTACK-1333: enable logging at Spring startup phase 2013-02-19 20:49:14 -05:00
Kelven Yang f91bf6b73a CloudStack-1267: initialize log4j in agent main() 2013-02-19 19:22:10 -05:00
Sheng Yang 81db0c2076 IPv6: Add ipv6 for user vm view 2013-02-19 15:49:24 -08:00
Sheng Yang f3dae81daa IPv6: Add IPv6 for domain router view 2013-02-19 15:49:24 -08:00
Prachi Damle f900d0bc71 CLOUDSTACK-1330: ec2-run-instances - When -n option is used to deploy multiple Vms API returns error even though few of the Vms have been deployed successfully.
Changes:
- Instead of throwing out error, return the response containing the info about the instances that were launched.
2013-02-19 15:15:27 -08:00
Prachi Damle 378827efed CLOUDSTACK-1307 Noticed NPE when we put host in maintenance mode in clustered management setup
Changes:
   - Use of class variable of type GenericSearchBuilder causes issues when multiple threads invoke this method to findCapacity
   - Changing the scope of the variable to be local to these methods.
2013-02-19 15:15:00 -08:00
Marcus Sorensen 27479d569a Summary: Re-adjusting tomcat memory settings per Rohit's emails
Detail: adjusting MaxPerm to 800, Perm to 512.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361312885 -0700
2013-02-19 15:28:05 -07:00
Marcus Sorensen 2bbbe09098 Summary: Increase tomcat servers memory size per dev list discussion
Detail: Per Kelven Yang when Javelin was merged into master/4.1, the memory
settings for management server should be a heap of 2g and a max perm size of
512m, due to increased footprint introduced by spring framework/Javelin.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361311099 -0700
2013-02-19 14:58:19 -07:00
Sheng Yang 87bb4dbff0 Add db upgrade path for ipv6 2013-02-19 11:54:43 -08:00
Chip Childers 865c2cbce6 Adding springsource artifacts to package legal docs.
Signed-off-by: Chip Childers <chip.childers@gmail.com>

Conflicts:

	tools/whisker/LICENSE
	tools/whisker/descriptor-for-packaging.xml

Also fixed the ordering for where we put java-ipv6.jar.
2013-02-19 13:29:36 -05:00
Chip Childers 12630b4f09 Adding legal documentation for the Java IPv6 library
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-19 12:39:05 -05:00
Rohit Yadav 2c102ca0e5 db: Fix upgrade paths to 4.1.0
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit ca432fe6b7)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-19 14:02:48 +05:30
Prasanna Santhanam b51ee1819a CLOUDSTACK-1320: listroutercmd: response should be set to the name of router
host name of router's resident host returned instead of the name of the
router. correcting the setter.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-19 13:23:32 +05:30
Radhika PC 9cb9f45a04 CLOUDSTACK-1313
Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
Signed-off-by: Joe Brockmeier <jzb@zonker.net>
2013-02-18 15:33:02 -06:00
Radhika PC 05555e7417 cloudstack-991
Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
2013-02-18 18:01:38 +05:30
Rohit Yadav cb83c23484 ApiServer: Get rid of finding system account and user at init() time
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 8094e933b0)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-17 00:24:58 +05:30
Rohit Yadav 65d1a4bc7d client: In pom.xml fix jetty:run to include utilities/scripts/db/ in its classpath
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 295b327281)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-17 00:24:58 +05:30
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
Kishan Kavala 8863031c47 exclude usage unit test since it requires db connection 2013-02-16 09:14:35 +05:30
Min Chen 2ee16350dd CLOUDSTACK-1253: Remove @author tag. 2013-02-15 10:40:39 -08:00
Kishan Kavala 009014c1b8 added db.properties to usage test resources 2013-02-15 22:35:45 +05:30
Radhika PC d11505f4b4 Egress Firewall Rules Documentation 2013-02-15 21:33:17 +05:30
Kishan Kavala 3d3714c79b CLOUDSTACK-1295 : Added usage unit tests
Fixed Component annontation for usage parsers
Fixed mvn target to run usage
removed UsageServerComponentConfig which is not required
Added region_id to account table in cloud_usage db
2013-02-15 18:34:24 +05:30
Likitha Shetty a6427266bf CLOUDSTACK-1207. UpdateNetwork API fails with NPE if the network offering is not being updated and is non-persistent. 2013-02-15 17:24:59 +05:30
Min Chen 24b48f3119 CLOUDSTACK-1137: force reconnect to a disconnected host throws error. 2013-02-14 17:56:45 -08:00
Marcus Sorensen 06f13a2693 Summary: centos63/package.sh, slightly better version parsing
Description: current package.sh fails if user hasn't downloaded all maven poms
prior to running package.sh. Now we match for something that vaguely resembles
a cloudstack version.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360889840 -0700
2013-02-14 17:59:15 -07:00
Sheng Yang 5ec29e9608 CLOUDSTACK-1219, CLOUDSTACK-1220: Fix IPv6 error messages 2013-02-14 16:27:53 -08:00
Min Chen 07ce770e97 CLOUDSTACK-1277: populating transit password field to UserVmJoinVO in
converting from UserVm to UserVmJoinVO.
2013-02-14 12:01:40 -08:00
Marcus Sorensen 86bb0055cd Summary: Adjust systemvm.iso path for KVM, due to packaging changes
Detail: Removing references to /usr/lib/cloud and /usr/lib64/cloud so that old
systemvm.iso files aren't found by accident. systemvm.iso should exist in
/usr/share/cloudstack-common/vms now.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360860243 -0700
2013-02-14 09:44:03 -07:00
Rohit Yadav 0853aca36b maven: Fix stray characted in client/pom.xml introduced in 4572bc06
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 4f33ea29e8d0953c42ae9a3185e3656961174f9a)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-14 16:29:42 +05:30
Rohit Yadav 19a9ca4289 CLOUDSTACK-1272: Fix incorrect annotation for service offering id
Fixes param annotation in:
   api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
   api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
   api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-14 16:29:42 +05:30
Pranav Saxena 3411a6a7e7 Merge branch '4.1' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into 4.1 2013-02-14 15:42:44 +05:30
Sebastien Goasguen c3cdadebc5 Docs: Fixed typo in nicira plugin guide 2013-02-14 11:27:32 +01:00