Commit Graph

25583 Commits

Author SHA1 Message Date
Rohit Yadav 67a67ff549 Merge pull request #1170 from shapeblue/4.5-rate-limit-testfix
[4.5] rate-limit: increase JVM memory and enable fork mode for unit testsEnables forkmode for surefire plugin and increases memory opts for JVM
for rate-limit tests. This tries to fix intermittent Jenkins failures
which look like:

multipleClientsCanAccessWithoutBlocking(org.apache.cloudstack.ratelimit.ApiRateLimitTest):
unable to create new native thread

* pr/1170:
  rate-limit: increase JVM memory and enable fork mode for unit tests

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-12-07 10:43:21 +05:30
Rohit Yadav 421bc00cd6 rate-limit: increase JVM memory and enable fork mode for unit tests
Enables forkmode for surefire plugin and increases memory opts for JVM
for rate-limit tests. This tries to fix intermittent Jenkins failures
which look like:

multipleClientsCanAccessWithoutBlocking(org.apache.cloudstack.ratelimit.ApiRateLimitTest):
unable to create new native thread

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-12-04 13:50:48 +05:30
Rohit Yadav 0a8e43b502 debian: Partially pick change from #626 for getting version
- fix release version automatically updated using pom.xml
- allows building of 4.5 pkgs on Ubuntu

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-12-03 00:10:30 +05:30
Boris Schrijver d62335215b CLOUDSTACK-9039: Fix paths for logging Ubuntu Management.
(cherry picked from commit acd49d801b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-30 15:45:38 +05:30
Boris Schrijver 865dd46bbe CLOUDSTACK-9045: Corrected mount point for management server DEBIAN.
(cherry picked from commit 7bbc5338c5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-30 15:43:49 +05:30
Rohit Yadav 75f7c4d085 CLOUDSTACK-9053 security upgrade as per COLLECTIONS-580
Picked from Daan's fix from: https://github.com/apache/cloudstack/pull/1089

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-30 15:39:24 +05:30
dsclose 296a5d7752 CLOUDSTACK-9058
Respond with "saved_password" if no password is to be issued.
(cherry picked from commit 8a7deefe64)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-30 15:37:42 +05:30
Boris Schrijver e1ef2e9ac0 CLOUDSTACK-9078: Gave scripts executable permissions.
(cherry picked from commit e2fc270480)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	python/lib/cloudutils/serviceConfigServer.py
2015-11-30 15:35:56 +05:30
Rohit Yadav 3f2e259e16 Merge pull request #1120 from shapeblue/4.5-cloudstack-9083
[4.5] CLOUDSTACK-9083: Add disk serial to kvm virt xmlAdds disk serial ids based on volume uuids to the virt xml. This may be useful
for appliances/software that needs some serial ids on the VM disks. This does not
impact existing/running VMs, the vm virt xmls will be updates for running VMs
the next time they are stopped/started.

For testing, disk serial (of debian based systemvm) in the virt xml matched that
in /sys/devices/pci0000:00:0000:00:07.0/virtio4/block/vda/serial.

We currently don't support scsi-blcok devices for which serial is not supported,
for this we've added a DeviceType (LUN) which may be used in future and a check
to not add the serial to the xml if disk type is LUN.
Refer: https://libvirt.org/formatdomain.html#elementsDisks

JIRA: https://issues.apache.org/jira/browse/CLOUDSTACK-9083

* pr/1120:
  CLOUDSTACK-9083: Add disk serial to kvm virt xml

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-30 15:11:31 +05:30
Rohit Yadav abb7e3fba3 Merge pull request #1117 from shapeblue/4.5-9064
CLOUDSTACK-9064: The users should be able to create multiple Guest Sh https://issues.apache.org/jira/browse/CLOUDSTACK-9064

    CLOUDSTACK-9064: The users should be able to create multiple Guest Shared Networks in same Vlan ID, same Physical Network and same network, just with a different IP ranges.

* pr/1117:
  CLOUDSTACK-9064: The users should be able to create multiple Guest Shared Networks in same Vlan ID, same Physical Network and same network, just with a different IP ranges.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-30 10:07:45 +05:30
Rohit Yadav cbb9c4acdf CLOUDSTACK-9083: Add disk serial to kvm virt xml
Adds disk serial ids based on volume uuids to the virt xml. This may be useful
for appliances/software that needs some serial ids on the VM disks. This does not
impact existing/running VMs, the vm virt xmls will be updates for running VMs
the next time they are stopped/started.

For testing, disk serial (of debian based systemvm) in the virt xml matched that
in /sys/devices/pci0000:00:0000:00:07.0/virtio4/block/vda/serial.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-25 14:46:49 +05:30
Rohit Yadav 0da2736fbf ui: fix instances null check regression from 2f250e2
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-25 14:12:53 +05:30
Abhinandan Prateek 2e6c7ce4c8 CLOUDSTACK-9064: The users should be able to create multiple Guest Shared Networks in same Vlan ID, same Physical Network and same network, just with a different IP ranges. 2015-11-25 10:29:21 +05:30
nnesic e65446cb94 CLOUDSTACK-9052 Shuffling the password to avoid having a subset of characters in fixed positions.
(cherry picked from commit 52ccfaac0c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-23 11:50:26 +05:30
Rohit Yadav fd44bc5f3d Merge pull request #1045 from resmo/CLOUDSTACK-9042-4.5
[4.5] CLOUDSTACK-9042: VR: DHCP: fix missing DHCP host entiesin /etc/dhcpentries.txt we had:

02:00:1e:07:01:53,set:10_102_92_5,10.102.92.5,songlog-1,infinite
02:00:0b:a2:00:3d,set:10_102_92_234,10.102.92.234,log-1,infinite

This sed matched unexpectetly "songlog-1" as well when "log-1" was processed, resulting
missing dhcp entry for songlog-1.

Also fixed other potenials problems relating to sed matching.

* pr/1045:
  CLOUDSTACK-9042: VR: DHCP: fix missing DHCP host enties

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-23 11:47:33 +05:30
Rohit Yadav e41850c2d7 Merge pull request #1099 from milamberspace/L10N-L10N-update-4.5-20151120
Update 4.5 branch with L10N resources files from Transifex 20151120
Open PR before the 4.5.3 release to update the L10N resources files from Transifex to the 4.5 branch.

Merge this PR just before the start of the release process.

cc @bhaisaab

* pr/1099:
  Update 4.5 branch with L10N resources files from Transifex 20151120

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-23 11:46:32 +05:30
Rohit Yadav 8259c9ba3c ui: remove viewMetrics from instances/storage/system
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-23 11:45:58 +05:30
Milamber 85bffef617 Update 4.5 branch with L10N resources files from Transifex 20151120 2015-11-21 11:49:52 +00:00
Rohit Yadav ea5aecbe07 ui: Remove Metrics UI feature
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-20 14:02:00 +05:30
Rohit Yadav 2f250e269b Merge pull request #1091 from shapeblue/metrics-4.5
[4.5] Metrics viewFrom #1038, for 4.5 branch

* pr/1091:
  CLOUDSTACK-9020: Metrics UI fixes
  CLOUDSTACK-9020: Increase UI container width by 200px
  CLOUDSTACK-9020: add ipaddress in instances view
  CLOUDSTACK-9020: add instances count in host view, ip address in instances view
  CLOUDSTACK-9020: Metrics views for CloudStack UI

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-20 11:47:13 +05:30
Rohit Yadav ebee0f0c9d CLOUDSTACK-9020: Metrics UI fixes
- Allow all users to see resource metrics
- Fix instance count issue on host metrics view
- Fix sorting issue

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 53084c4c8a87ccbdb1a7017e0a4cc66dbc386220)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-08 20:57:13 +05:30
Rohit Yadav 0d73788464 CLOUDSTACK-9020: Increase UI container width by 200px
Based on suggestion from Lucian (Nux), this patch increases the UI's container
width by 200px as most modern resolutions on desktop/laptops/workstations are
at least 1400px wide. By increasing the width and adjusting css properties
throughout the UI, we get more space to show information. This also gets
rid of horizontal scrollbar in case of metrics views. This also, fixes the UI
logos to include our mascot 'cloudmonkey'.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f7b64726d9ad4ac53c19fb47378068433cf86ae3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-07 16:54:31 +05:30
Rohit Yadav 1391f476f1 CLOUDSTACK-9020: add ipaddress in instances view
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit edc74aebbffc3f8fb4853de3cf6740eee83c78fd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-07 16:54:13 +05:30
Rohit Yadav 14940a3c9a CLOUDSTACK-9020: add instances count in host view, ip address in instances view
Add minor features based on community discussions

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b4d1fed849aa7873af870b7e583ac91dd1ca4cc6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-07 16:54:01 +05:30
Rene Moser e7291fd600 CLOUDSTACK-9042: VR: DHCP: fix missing DHCP host enties
in /etc/dhcpentries.txt we had:

02:00:1e:07:01:53,set:10_102_92_5,10.102.92.5,songlog-1,infinite
02:00:0b:a2:00:3d,set:10_102_92_234,10.102.92.234,log-1,infinite

This sed matched unexpectetly "songlog-1" as well when "log-1" was processed, resulting
missing dhcp entry for songlog-1.

Also fixed other potenials problems relating to sed matching.
2015-11-07 11:31:14 +01:00
Rohit Yadav d34da5aa8f CLOUDSTACK-9020: Metrics views for CloudStack UI
Implements following:
- A metrics table widget that is:
  - vertically and horizontally scrollable with pagination/infinite scrolling
  - sortable columns (client side)
  - groupable/collapsible columns
  - alternate row coloring
  - refresh button to refresh views
  - threshold table cell coloring
  - panel/breadcrumb navigation
  - quick view action column
  - translatable labels
- Sortable column for all CloudStack tables (client side)
- Configurable UI pagesize for list API calls, 'default.ui.page.size'
- Metrics views: Zones, Clusters, Hosts, Instances, Storage pools, Volumes
- Resource filtering/navigation: Zones->Clusters->Hosts->Instances->Volumes, Storage Pool->Volumes

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-06 11:06:02 +05:30
ramamurtis efe93d7487 CLOUDSTACK-9006 - ListTemplates API returns result in inconsistent order when called concurrently
Adding filter test to verify addOrderBy method.

(cherry picked from commit 9d1a469ae5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-04 16:22:41 +05:30
ramamurtis 4e6ff4b3c3 CLOUDSTACK-9006 - ListTemplates API returns result in inconsistent order when called concurrently
(cherry picked from commit c90723f491)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-04 16:22:31 +05:30
Rohit Yadav 7aeff217a3 Merge pull request #1025 from shapeblue/CLOUDSTACK-9019-4.5
[4.5] CLOUDSTACK-9019: Add storage network offering in ssvm only if storage network is defined

During creation of SSVM, checks and adds NetworkOffering.SystemStorageNetwork to
offerings only if storage network exists for the target datacenter

(Manually tested)

* pr/1025:
  CLOUDSTACK-9019: Add storage network offering in ssvm only if storage network is defined

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-04 10:46:59 +05:30
Rohit Yadav 619f0eb276 CLOUDSTACK-9019: Add storage network offering in ssvm only if storage network is defined
During creation of SSVM, checks and adds NetworkOffering.SystemStorageNetwork to
offerings only if storage network exists for the target datacenter

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-03 13:51:21 +05:30
Nitin Kumar Maharana 76554e6f5e CLOUDSTACK-8913: Search box in Templates tab out of alignment
Increased the margin and padding to accomodate all the boxes inside toolbar.

(cherry picked from commit febaeb2a15)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-11-03 09:29:27 +05:30
Rohit Yadav ef90fec5ea Merge pull request #993 from shapeblue/4.5-logrotate-kvm-agent-erroutlogs
[4.5] CLOUDSTACK-9000: logrotate cloudstack-agent out and err logsAdds logrotate rules for cloudstack-agent.{err,out} log files

cc @remibergsma @wido @wilderrodrigues and others

* pr/993:
  CLOUDSTACK-9000: logrotate cloudstack-agent out and err logs

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-10-30 16:10:34 +05:30
Rohit Yadav ba9a600410 CLOUDSTACK-9000: logrotate cloudstack-agent out and err logs
Adds logrotate rules for cloudstack-agent.{err,out} log files

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-10-29 11:14:04 +05:30
Rohit Yadav bacf971220 CLOUDSTACK-9000: logrotate cloudstack-agent out and err logs
Adds logrotate rules for cloudstack-agent.{err,out} log files

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-10-28 11:14:49 +05:30
Rohit Yadav 59f337da56 Merge pull request #922 from resmo/fix/4.5-8848
[4.5] CLOUDSTACK-8848: ensure power state is up to date for missing PowerState handling1:1 cherry-picks, see #909

* pr/922:
  CLOUDSTACK-8848: added null pointer guard to new public method
  CLOUDSTACK-8848: ensure power state is up to date when handling missing VMs in powerReport

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-10-13 15:06:25 +05:30
Daan Hoogland 8cd8b6c83c CLOUDSTACK-8848: added null pointer guard to new public method 2015-10-12 13:03:02 +02:00
Rene Moser 30c704915c CLOUDSTACK-8848: ensure power state is up to date when handling missing VMs in powerReport
There 2 things which has been changed.

* We look on power_state_update_time instead of update_time. Didn't make sense to me at all to look at update_time.
* Due DB update optimisation, powerState will only be updated if < MAX_CONSECUTIVE_SAME_STATE_UPDATE_COUNT. That is why we can not rely on these information unless we make sure these are up to date.
2015-10-11 14:05:23 +02:00
Pierre-Luc Dion f1f1fefdf6 Fix dockerbuild because hardcoded filename for marvin
Signed-off-by: Pierre-Luc Dion <pdion891@apache.org>
2015-09-29 08:59:53 -04:00
Rohit Yadav bab993864c Merge pull request #817 from borisroman/4.5
[4.5.3]Cherry-pick PR #795 into 4.5 branch.

* pr/817:
  Added Unit Tests for QCOW2Utils.
  Fixed Findbugs issue introduced by 1c6378ec00 PR #795.
  Added QCOW2 virtual size checking for S3.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-09-18 10:15:15 +05:30
Boris Schrijver 54595d11d4 Added Unit Tests for QCOW2Utils. 2015-09-16 16:10:44 +02:00
Rohit Yadav 11abfb8766 tools/appliance: update Debian 7 iso URLs based on 615261
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-09-16 12:56:25 +05:30
Suresh Kumar Anaparti 52e23996b8 CLOUDSTACK-8820: Updated the code for vCenter6 data center support.
(cherry picked from commit 1d73418c2c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-09-16 12:52:46 +05:30
Suresh Kumar Anaparti 5f95f1688e CLOUDSTACK-8820: Showing error when try to add advance zone using VMWare ESXi 6.0 host
Summary: In vCenter 6.0, response headers need to be fetched after service login for server cookie unlike previous versions of vCenter.

(cherry picked from commit 4a6e2cdeee)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-09-16 12:52:18 +05:30
Rohit Yadav 17166eb631 schema: add 4.5.2 to 4.5.3 upgrade path stubs
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-09-15 09:57:48 +05:30
Rohit Yadav 284ce1fb88 engine/schema: add 4.5.2 to 4.5.3 upgrade path
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-09-15 09:57:12 +05:30
Boris Schrijver dc670d55bf Fixed Findbugs issue introduced by 1c6378ec00 PR #795. 2015-09-14 13:16:42 +02:00
Boris Schrijver a54dffc570 Added QCOW2 virtual size checking for S3.
- Cleaned up S3TemplateDownloader
- Created static QCOW2 utils class.
- Reformatted some parts of DownloadManagerImpl
2015-09-14 13:15:52 +02:00
Rohit Yadav af38c492d8 debian: add 4.5.3-snapshot to changelog
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-09-14 10:01:58 +05:30
Rohit Yadav a4f552d46d cloudstack: set next version to 4.5.3-SNAPSHOT
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-09-14 09:59:40 +05:30
Rohit Yadav d58dfbf21b Merge pull request #814 from wido/CLOUDSTACK-8443
CLOUDSTACK-8443: Support CentOS 7 for 4.5This is based on two PRs:
- 731
- 757

This commit is based on the 4.5 branch for a future 4.5 release.

* pr/814:
  CLOUDSTACK-8443: Support CentOS 7 for 4.5

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-09-14 09:52:06 +05:30