GitHub user chrismattmann opened a pull request:
https://github.com/apache/cloudstack/pull/1442
Pull Request - ignore -
Why in the world is Apache Cloudstack creating an organization externally
on Github? At a minimum, you can't use the Apache Cloudstack logo?
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/cloudstack 4.8
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/1442.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1442
----
commit acfc19dc8285a07412ee0078fbc13d7319d5be8b
Author: Wei Zhou <w.z...@tech.leaseweb.com>
Date: 2015-12-10T12:26:02Z
CLOUDSTACK-9134: set device_id as the first device_id not in use instead of
nic count
when we restart vpc tiers, the old nics will be removed, and create a new
nic.
however, the device_id was set to the nic count, which may be already used.
this commit get the first device_id not in use as the device_id of new nic.
This issue also happen when we add multiple networks to a vm and remove
them.
commit 709e0c555e5896f5f2abe16f9ba029010b4f42cc
Author: Wei Zhou <w.z...@tech.leaseweb.com>
Date: 2015-12-10T13:09:45Z
[UI] bug fix: Delete added ACL lists is not available for Domain Admin and
normal users
commit 45f1e8d64fde1dd2330dd7a092f8f0fc3630b876
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-10T13:51:54Z
Merge pull request #1208 from shapeblue/master-quota-greyicon
ui/quota: Make the quota UI plugin icon grayMakes the quota ui plugin icon
gray, based on comment at:
https://github.com/apache/cloudstack/pull/768#issuecomment-163364606
* pr/1208:
ui/quota: Make the quota UI plugin icon gray
Signed-off-by: Remi Bergsma <git...@remi.nl>
commit b14dfca82d5446cf3a7a473186514fc979089030
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-10T15:19:41Z
Merge pull request #1187 from nlivens/4.6_test_improvement
Adapted HypervisorUtilsTest to no longer give false positives
* pr/1187:
Adapted HypervisorUtilsTest to no longer give false positives
This closes #1185
Signed-off-by: Remi Bergsma <git...@remi.nl>
commit 312b9aff9490214c51cf6adf90661262c3670cd3
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-10T15:24:36Z
Merge release branch 4.6 to master
* 4.6:
Adapted HypervisorUtilsTest to no longer give false positives
commit 51c9f0e3b524f978eadb6a6ba630c3f7281b1a11
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2015-12-10T18:51:28Z
CLOUDSTACK-9138 - Adds multiple providers back to VPC implementation
- It is need and already allowed/used in the current implementation. For
example, the Default [redundant] VPC offerings use
two LB providers. If we cannot create offerings with 2 LB providers,
the whole internal loadbalancer implementation won't work
commit 0d075906ad40b0bd681ece777045684379ba93a5
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2015-12-11T06:51:22Z
CLOUDSTACK-4374 - Adds HA capabilities to redundant routers
- Redundant Routers are not the same as Haigh Available.
Having a router HA is actually saying that the given router will be
controlled by the High Availability monitor.
Hence fix any problem we might face.
commit 1e17c3e38cf70d965d0fc84cbf67f78ef5203e71
Author: Abhinandan Prateek <abhinandan.prat...@shapeblue.com>
Date: 2015-12-08T04:29:06Z
QUOTA: Ensuring that the dates displayed are as per user expectations
When querying db we use start of next day to query quota usage for
today, but while displaying it to user we still need to show it as
todays date
commit bc8994ba1c24f68d24576986d29ff8322d00a8ed
Author: Abhinandan Prateek <abhinandan.prat...@shapeblue.com>
Date: 2015-12-08T11:51:00Z
CLOUDSTACK-9122: latest credit entries should be incorporated when the
balance is
calculated
commit 67b4a7bd7827fea4923cba5b4e96cf5f399568ee
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-10T16:50:45Z
Setup routes for RFC 1918 ip space
Setup general route for RFC 1918 space, as otherwise it will be sent to
the public gateway and not work. More specific routes that may be set
have preference over this generic routes.
When public network is RFC1918, we do not setup the routes to avoid
problems with internal-only deployments.
commit 9b89dfd6438b8a669617c64c82198c92443a29d8
Author: Daan Hoogland <d...@onecht.net>
Date: 2015-12-11T10:37:42Z
CLOUDSTACK-9139 make zwps default when defined on zone level
commit 590af145b0c703f9c957c6f81ef450856dc2c407
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2015-12-11T14:02:55Z
CLOUDSTACK-9135 - Makes possible to add multiple providers per service
- Same is done in the Java side. Check the createVpcOffering() method in
the VpcManagerImpl class
commit 43ce049d43ce7aa0e4d25b0630cbcd1c423156b9
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2015-12-11T14:03:50Z
CLOUDSTACK-9135 - Makes test compliant with Redundant VPCs
commit 1ed5c209086aa38da1f75881056cf2d6d6c1afc9
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-11T16:14:42Z
Merge pull request #1197 from ustcweizhou/vpc-router-by-keyword
[4.7] CLOUDSTACK-9129: list vpc routers by keyword in Infrastructure ->
Virtual Routers
and two more changes:
(1) add network name/vpc name in the listRouters response
(2) add network name/vpc id, vpc name in the router details page
* pr/1197:
CLOUDSTACK-9129: list vpc routers by keyword in Infrastructure -> Virtual
Routers
Signed-off-by: Remi Bergsma <git...@remi.nl>
commit c9985e96a5446395f402faccd422935d24b7c933
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-11T18:42:36Z
Merge pull request #1214 from remibergsma/rfc1918_route
CLOUDSTACK-9143 Setup routes for RFC 1918 ip spaceSetup general route for
RFC 1918 space, as otherwise it will be sent to the public gateway and likely
to be dropped (internet providers do not route ip space that is meant for
internal use). More specific routes that may be set have preference over this
generic routes so this works even with private ranges used for public ip space
(as shown below).
When using an internal DNS server some hosts may resolve to an RFC 1918 ip
address. The SSVM has a default gw to public so if it has no route for this ip
address space, it will not work. This PR makes generic RFC 1918 (so all
internal ip adresses like 10.0.0.10 etc) to the local management gateway. This
makes them reachable. Without this fix, it is sent upstream and it is dropped
there.
Should there be a more generic route (smaller prefix), this has preference
over the generic routes.
Example in my dev environment:
```
root@v-1-VM:~# route -n
Kernel IP routing table
Destination Gateway Genmask Flags Metric Ref Use
Iface
0.0.0.0 192.168.23.1 0.0.0.0 UG 0 0 0 eth2
10.0.0.0 192.168.22.1 255.0.0.0 UG 0 0 0 eth1
169.254.0.0 0.0.0.0 255.255.0.0 U 0 0 0 eth0
172.16.0.0 192.168.22.1 255.240.0.0 UG 0 0 0 eth1
192.168.0.0 192.168.22.1 255.255.0.0 UG 0 0 0 eth1
192.168.22.0 0.0.0.0 255.255.255.0 U 0 0 0 eth1
192.168.23.0 0.0.0.0 255.255.255.0 U 0 0 0 eth2
```
Route `192.168.0.0/16` goes via `eth1` but `192.168.23.0/24` is more
specific and has preference and goes via `eth2`. It works:
```
root@v-1-VM:~# ping 8.8.8.8
PING 8.8.8.8 (8.8.8.8): 48 data bytes
56 bytes from 8.8.8.8: icmp_seq=0 ttl=49 time=7.179 ms
^C--- 8.8.8.8 ping statistics ---
1 packets transmitted, 1 packets received, 0% packet loss
round-trip min/avg/max/stddev = 7.179/7.179/7.179/0.000 ms
```
This solves a lot of the 'internal resolving' issues we face.
When the public ip address is RFC1918 itself, we do not set the routes.
* pr/1214:
Setup routes for RFC 1918 ip space
Signed-off-by: Remi Bergsma <git...@remi.nl>
commit 6be2cc78c7585659a58d4715fc7082426c4192be
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-11T18:45:14Z
Merge pull request #1215 from
ekholabs/improve/mult-providers-CLOUDSTACK-9138
CLOUDSTACK-9138 - Adds multiple providers back to VPC implementation - It
is need and already allowed/used in the current implementation. For example,
the Default [redundant] VPC offerings use two LB providers. If we cannot create
offerings with 2 LB providers, the whole internal loadbalancer implementation
won't work.
* pr/1215:
CLOUDSTACK-9138 - Adds multiple providers back to VPC implementation
Signed-off-by: Remi Bergsma <git...@remi.nl>
commit 879b6da4eda10af9a1a42018a4713ad85301a327
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-12T08:33:54Z
Merge pull request #1192 from shapeblue/master-9122
CLOUDSTACK-9122: latest credit entries should be incorporated when
thefuture credit entries should be incorporated when the balance is calculated
1. Some code is refactored so that unit tests (TODO in future) are more
comprehensive
2. The fix is to incorporate the credit entries on line 228.
https://issues.apache.org/jira/browse/CLOUDSTACK-9122
* pr/1192:
CLOUDSTACK-9122: latest credit entries should be incorporated when the
balance is calculated
Signed-off-by: Remi Bergsma <git...@remi.nl>
commit 66d7f413e8e67c83727ca159495df8f4a8dc1bd0
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-12T08:37:05Z
Merge pull request #1188 from kansal/CLOUDSTACK-9086
CLOUDSTACK-9086: ACS allows to create isolated networks with invalide
gateway IP address - Fixed and Test cases added
Problem: There was no check for the network and broadcast IP addresses in
the case where we provide the gateway and netmask while creating the isolated
network. As a result the provided IP gets assigned to the eth0 interface of the
VR.
Note: This is in continuation of PR #1125 which I closed.
* pr/1188:
CLOUDSTACK-9086: ACS allows to create isolated networks with invalide
gateway IP address - Fixed and Test cases added
Signed-off-by: Remi Bergsma <git...@remi.nl>
commit 2071a9e395841a896f9cef3d80aa9b31822d8fa7
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-12T08:53:00Z
Merge pull request #1222 from ekholabs/fix/rvr-ha-CLOUDSTACK-4374
CLOUDSTACK-4374 - As a Developer I want to have HA enabled for routers that
are part or a redundant network or VPCThis PR fixes the issue we were facing
with crashed redundant routers not being picked up by the HA monitor due to an
IF statement in the code.
* Redundant Routers are not the same as Haigh Available. Having a router HA
is actually saying that the given router will be controlled by the High
Availability monitor. Hence fix any problem we might face.
* pr/1222:
CLOUDSTACK-4374 - Adds HA capabilities to redundant routers
Signed-off-by: Remi Bergsma <git...@remi.nl>
commit 52edbbb6cc2e2c58e360b737143c10adddc43880
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-12T10:00:41Z
Show actual diff in commits after merge
commit 7fa62a576523ad7740563d7626b4caec6c040735
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-12T10:29:28Z
Merge pull request #1221 from
ekholabs/improve/test-internal-lb-CLOUDSTACK-9135
CLOUDSTACK-9135 - As a Developer I want the test_internal_lb.py to test
Redundant VPCsThis PR refactors the existing tests and adds tests to cover
internal LB with Redundant VPCs.
In order to make it possible I had to change the base.py, allowing multiple
providers per service. This change requires the changes in the Java side which
were dealt with PR #1215 .
* pr/1221:
CLOUDSTACK-9135 - Makes test compliant with Redundant VPCs
CLOUDSTACK-9135 - Makes possible to add multiple providers per service
CLOUDSTACK-9135 - Moves test into smoke directory
Signed-off-by: Remi Bergsma <git...@remi.nl>
commit 61ebb53e17f225fc17b9011332cd9ae344db4350
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-12T12:55:20Z
Merge pull request #1227 from remibergsma/git-pr-show-commits
Show actual diff in commits after merge with git-pr / git-fwd-mergeThis
shows the diff in commits after using `git-pr` and `git-fwd-merge` tools, like
this:
```
44e8c92 Merge pull request #1226 from borisroman/CLOUDSTACK-9148
0554610 Removed .pydevproject from plugin kvm hypervisor.
```
That helps in quickly seeing what change is applied and whether it makes
sense. It doesn't touch the actual code base. I'm using this patch for some
time already.
* pr/1227:
Show actual diff in commits after merge
Signed-off-by: Remi Bergsma <git...@remi.nl>
commit 65bf2edfa196601d68e82f09012a393ee73499a2
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-12T12:58:48Z
Merge pull request #1182 from ustcweizhou/CLOUDSTACK-9113-getVmStats
[4.6] CLOUDSTACK-9113: skip vm with inconsistent state when
getVmStats/getVmDiskStatson KVM, if there is a vm has inconsistent state
between hypervisor and db, the getVmStat will terminate and return null, all vm
stats will not be updated.
we should skip the vm which has inconsistent state, and continue on others.
* pr/1182:
CLOUDSTACK-9113: skip vm with inconsistent state when
getVmStats/getVmDiskStats
Signed-off-by: Remi Bergsma <git...@remi.nl>
commit bdaa60fd6c04f0e8d08bf889a11702eb6017ad53
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-12T13:03:43Z
Merge release branch 4.6 to master
* 4.6:
Show actual diff in commits after merge
CLOUDSTACK-9113: skip vm with inconsistent state when
getVmStats/getVmDiskStats
commit 8c78f89c91cf139b81110f80fbfede89a6f3df8b
Author: Daan Hoogland <d...@onecht.net>
Date: 2015-12-12T13:38:27Z
Merge pull request #1132 from shapeblue/4.6-vmware-diskcontrollers
[4.6] CLOUDSTACK-4787 - vmware diskcontrollersSame as #1131 (see this for
screenshots etc)
* pr/1132:
CLOUDSTACK-4787: Allow users to select disk controller for VM/template
CLOUDSTACK-4787 Allow selection of scsi controller type in vSphere
Signed-off-by: Daan Hoogland <d...@onecht.net>
commit 1597a4c749c98383b838d88e8307eebc370012f4
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-12T13:40:16Z
Merge pull request #1211 from ustcweizhou/delete-acl-items
[UI] bug fix: Delete added ACL lists is not available for Domain Admin and
normal usersOnly the owner or domain admin/admin can access the page
(vpc->Network ACL Lists), they are also able to remove the network ACL lists,
which is not allowed on UI.
* pr/1211:
[UI] bug fix: Delete added ACL lists is not available for Domain Admin
and normal users
Signed-off-by: Remi Bergsma <git...@remi.nl>
commit 7f2bbcbfff909ad4bb155f6db1fa923794e85ef2
Author: Boris Schrijver <bo...@pcextreme.nl>
Date: 2015-12-12T13:57:51Z
Removed cloud-cli folder and contents, as it is not maintained or used
anymore.
commit 27e23fb11c80e14518afc48c91d5a18977d898c0
Author: Boris Schrijver <bo...@pcextreme.nl>
Date: 2015-12-12T14:13:48Z
Remove docs/.tx/config
The config file docs/.tx/config has been replaced with
tools/transifex/.tx/config. It's not maintained or used so it must be removed.
commit 2bebb7f8a38c3ef94bbd55c69d7ec1070450dc22
Author: Wilder Rodrigues <wrodrig...@schubergphilis.com>
Date: 2015-12-12T15:26:00Z
CLOUDSTACK-9151 - Removes the replacement of the VRID in the CsRedundant
file
- Just like with RVRs, use the VRID 51 instead of making it dependent on
the VPCID
- Reason: arbitary unique number 0..255 used to differentiate multiple
instances of vrrpd running on the same NIC (and hence same socket).
virtual_router_id 51
commit 6947afee3aa1d4ed2dd8a118cd51f8d0e4d2de67
Author: Milamber <milam...@apache.org>
Date: 2015-12-09T09:33:14Z
Update L10N resource files with 4.7 strings from Transifex (20151211)
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
