[ACS44] cherry pick

[Jayapal Reddy Uradi]

Hi Daan,

Can you please cherry-pick the following commits  from 4.4-forward.

commit a708d5c4982595666cfe8fe03510517cfefe1326
Author: Jayapal 
Date:   Mon May 5 13:45:51 2014 +0530

CLOUDSTACK-6577: Disable service monitoring in RVR

commit 758f7f2f16d361c40bf61db1e7fd799efe9827db
Author: Jayapal 
Date:   Mon May 5 13:56:59 2014 +0530

CLOUDSTACK-6578: Fixed issue in delete remote access vpn command

commit 645516ee78a8117dfa221caa0fc8d4dfe521af2b
Author: Rajani Karuturi 
Date:   Mon May 5 15:31:35 2014 +0530

CLOUDSTACK-6531: stopping the router in case of command failures. Also 
added alerts for failures.

Signed-off-by: Jayapal 

Thanks,
Jayapal

[ACS44] cherry pick

[Kelven Yang]

Hi Daan,
Could you cherry-pick following fix in 4.4-forward to 4.4 branch.

commit be2b5918e6b09a488d75966c49d34bdeb803fdd8
Author: Kelven Yang 
Date:   Mon May 5 15:21:59 2014 -0700

CLOUDSTACK-6586: Move EventBus hookup on job framework to ApiServer to
decouple job framework away from business logic related hookups.

Thanks

Kelven

[ACS44] cherry pick

[Jayapal Reddy Uradi]

Hi Daan,

Can you please cherry pick the below commit to 4.4

commit 3ec8de9b85c03a79ac87ee0732c629ee621a8cbc
CLOUDSTACK-6582 updated the table network_acl_item_cidrs name in Upgrade430to440

Thanks,
Jayapal

[ACS44] cherry pick

[Jayapal Reddy Uradi]

Hi Daan,

Can you please cheery pick the following commit to 4.4
99f75db1ebd35f5afa897e9d94ed176668e04cd5

Thanks,
Jayapal

[ACS44] cherry pick

[Jayapal Reddy Uradi]

Hi Daan,

Can you please cherry pick the following commit to 4.4

commit 45f6bac727bf6631153ac8e17dd7b074759052eb
CLOUDSTACK-6714: monitor script echo service command is added with quotes

Thanks,
Jayapal

[ACS44] Cherry-pick

[Murali Reddy]

Daan,

Please cherry-pick below commit in 4.4-froward in 4.4.

commit 9e4e62466a8c3d00ab5381d7ebfeb70466192a55
Author: Murali Reddy 
Date:   Thu Jun 12 13:50:01 2014 +0530

CLOUDSTACK-6755: [OVS] Can't create more than 7 GRE tunnel networks in
xen cluster

XenServer does not create a bridge automatically when VIF from domU is
connected
to internal network. So there is logic to force bridge creation by
creating VIF in dom0 connected to GRE tunnel network. But there is no
logic to delete the VIF after bridge gets created. So this fix ensure
VIF is delted when atleast there is one domU VIF connected to the
network.

[ACS44] Cherry-Pick

[Santhosh Edukulla]

Hi Daan,

Please cherry pick the below commit. 

Bugid: CLOUDSTACK-6791

Commit id : 62cc238e1276bad1af7934fe5c150fe801b89140

Thanks!
Santhosh

Re: [ACS44] cherry pick

[Daan Hoogland]

3 commits pulled in

On Tue, May 6, 2014 at 4:18 PM, Jayapal Reddy Uradi
 wrote:
> Hi Daan,
>
> Can you please cherry-pick the following commits  from 4.4-forward.
>
> commit a708d5c4982595666cfe8fe03510517cfefe1326
> Author: Jayapal 
> Date:   Mon May 5 13:45:51 2014 +0530
>
> CLOUDSTACK-6577: Disable service monitoring in RVR
>
> commit 758f7f2f16d361c40bf61db1e7fd799efe9827db
> Author: Jayapal 
> Date:   Mon May 5 13:56:59 2014 +0530
>
> CLOUDSTACK-6578: Fixed issue in delete remote access vpn command
>
> commit 645516ee78a8117dfa221caa0fc8d4dfe521af2b
> Author: Rajani Karuturi 
> Date:   Mon May 5 15:31:35 2014 +0530
>
> CLOUDSTACK-6531: stopping the router in case of command failures. Also 
> added alerts for failures.
>
> Signed-off-by: Jayapal 
>
> Thanks,
> Jayapal



-- 
Daan

Re: [ACS44] cherry pick

[Daan Hoogland]

On Wed, May 7, 2014 at 1:51 AM, Kelven Yang  wrote:
> be2b5918e6b09a488d75966c49d34bdeb803fdd8




-- 
Daan

[ACS44] Cherry pick requests

[Amogh Vasekar]

Hi Daan,

Can you please cherry pick the following two commits, in order?

8f37841eb49532a729c9cc42a61e610da05b04a3

5949e33578a886061b18510cf5cfbd8c2b4e4c3b


They are for CLOUDSTACK-6358

Thanks,
Amogh

[ACS44] Cherry pick requests

[Min Chen]

Hi Daan,

Can you please cherry pick the following commits from 4.4-forward to 4.4
branch? Some of them are resending previous requests.

Commit: 500c99eef7f7a04d95ed95697a2678fef283e61d
CLOUDSTACK-6600:IAM Security checker needs to have cache to improve
checkAccess performance.



Commit:b9bdaf9d31803cd080475e27da56695c3293c4ca
CLOUDSTACK-6598:IAM - listAccount() retrurns "Caller cannot be passed as
NULL to IAM!" when domain deletion is in progress.


Commit: e8e0449ed4eaa489d53b43c0137833a660b6d6cf
CLOUDSTACK-6613:IAM: authorizeSecurityGroupIngress fails when SG Name is
passed.


Commit: 4889031492e543c318fcd639d7491cfb2013eb76
CLOUDSTACK-6600: fix a bug in IAM cache in constructing cache key.

Commit: f447a2c38c15ad5b7844237e72ab551149f46bfb
CLOUDSTACK-6617: [Automation] detach / resize volume test cases failing
with permission error.



Commit: a7dd5aae55c1f6059aea324760f2800537f5d294
CLOUDSTACK-6628:[Automation] Create PF rulw API failing with error
"database id can only provided by VO objects".


Commit: be73571c74084a31819c150dfca2ca28bd13e64b
CLOUDSTACK-6628: Fix IpAddress import typo.

Thanks.
-min

[ACS44] Cherry pick request

[Amogh Vasekar]

Hi Daan,

Can you please cherry-pick 594f66d12521c6a3a07475e37e7ab0f09d247b19
It is a fix for https://issues.apache.org/jira/browse/CLOUDSTACK-6437

Thanks,
Amogh

Re: [ACS44] cherry pick

[Daan Hoogland]

On Wed, May 7, 2014 at 2:23 PM, Jayapal Reddy Uradi
 wrote:
> 99f75db1ebd35f5afa897e9d94ed176668e04cd5


pulled

-- 
Daan

Re: [ACS44] cherry pick

[Daan Hoogland]

On Tue, May 20, 2014 at 8:11 AM, Jayapal Reddy Uradi
 wrote:
> 45f6bac727bf6631153ac8e17dd7b074759052eb


is in

-- 
Daan

[ACS44] Cherry pick 73330167228d14ea8494c9c1893627b6936626a7

[Nitin Mehta]

Hi Daan,

Can you please cherry-pick the following commit ?
commit 73330167228d14ea8494c9c1893627b6936626a7
CLOUDSTACK-6824: In case there is a failure to delete the soft link of a 
download url, dont bail out since there can be cases such as destroy ssvm where 
the soft links do not exist any more.

Thanks,
-Nitin

[ACS44] cherry pick 5e80e5d33d9a295b91cdba9377f52d9d963d802a

[Edison Su]

If Vpc public network with snat enabled, mgt server will send down "vlan-id" 
instead of "vlan://vlan-id" in ipassoccommand, which will cause issue on the 
hypervisor resource to program VR.

[ACS44]cherry-pick: dfb59cd6cc0292a88cb619e53f34cdb713879ffd

[Edison Su]

CLOUDSTACK-6464:
The root cause is that, in 3.0.x, if guest network is "vlan://untagged", then 
kvm agent will use whatever value in "private.network.device", while in 4.x, 
kvm agent will use "guest.network.device". So if both value are not the same in 
the agent.properties, then kvm agent will use incorrect bridge to create vif.
The fix will be, kvm agent code needs to honor traffic type passed down from 
mgt server in startcommand, in case of "vlan://untagged".

[ACS44] Cherry pick request

[Amogh Vasekar]

Hi Daan,

Request you to please cherry-pick the following two commits to 4.4 branch :

1. ac92b3690304ff224e7e2530ea7d8e39f28a05c3 for CLOUDSTACK-6710
2. a4b401f29f83f2f0b467a9d05b509f951b5a3bca for CLOUDSTACK-6358

Thanks,
Amogh

[ACS44] Cherry pick request

[Saksham Srivastava]

Hi Daan,

Request you to cherry-pick the following commits to 4.4:

c5ee5ad5c828d9f0b128e3d7280a30dcf717e045   -   CLOUDSTACK-6864
5bcd017de6f421a6125406120b39fb8602276dc7   -CLOUDSTACK-6654
f14f36170e94c0184ade28a50226b17d25ecf57c-CLOUDSTACK-6812

Thanks,
Saksham

Re: [ACS44] Cherry-pick

[Daan Hoogland]

On Thu, Jun 12, 2014 at 10:55 AM, Murali Reddy  wrote:
> 9e4e62466a8c3d00ab5381d7ebfeb70466192a55


is in

-- 
Daan

Re: [ACS44] Cherry-Pick

[Daan Hoogland]

On Thu, Jun 12, 2014 at 1:22 PM, Santhosh Edukulla
 wrote:
> 62cc238e1276bad1af7934fe5c150fe801b89140


is in

-- 
Daan

[ACS44] cherry-pick request

[Murali Reddy]

Daan, 

Please cherry-pick below commits in 4.4-forward into 4.4

commit be937a08213f06a801cf07d19867d48dad35d19f
CLOUDSTACK-6832: [OVS]vnet is not released even the network is deleted

fix ensures allocated VNET is released during network shutdown

commit 9dfbdb5ffd2f0981651bc98f1c5d71718a24a29f
CLOUDSTACK-6749: [OVS] xe network-param-get with
param-key=is-ovs-vpc-distributed-vr-network alway returns error

fixing unnecessary errors in the logs


Thanks.

[ACS44] Cherry Pick Request

[Santhosh Edukulla]

Daan,

Please pick up the below fixes for resource leaks and other Coverity issues.

4ba3aae2ea0290ca012623083e13625e08a9dde5
3c5f64c97ab071451aee7f232d8f2cec6d89044d
dbfce8b11e25855a8cb21ec2bbbfe20940bb788d


As well, please check the below commit, its fix for CLOUDSTACK-6793

91d054cb00f6a5818f2be1c7e4d3f44a2c58bfcc

Thanks!
Santhosh

[ACS44] Cherry pick request

[Amogh Vasekar]

Hi Daan,

Can you please cherry-pick de04881da177b28d7cb3efc09adb2d8069f0fdd3 from
4.4-forward to 4.4?

This fixes CLOUDSTACK-6915

Thanks,
Amogh

[ACS44] cherry-pick request

[Murali Reddy]

Daan, please cherry-pick below commit in 4.4-forward into 4.4

commit 8ca8a7217ec155a37b24e3d9cfc3d5fc67adef2d
CLOUDSTACK-6925: [OVS] get rid custom logic to create bridges on hosts
in the XenServer pool for GRE tunnel networks


Fix uses XenServer recommended way
Network.other_config:assume_network_is_shared=true
which ensures bridge is created automatically on hosts in the pool for
GRE tunnel networks. Fix also gets rid of  error prone custom logic
that ensures
bridge is created by plugging a VIF into the dom0 and connected to
GRE tunnel network.

[ACS44] cherry-pick request

[Murali Reddy]

Please cherry-pick below commit in 4.4-forward into 4.4

commit d8cbba1bc616d43e218229a2807915c1b21569dc

CLOUDSTACK-6750: [OVS] With stretched network deploying vm in a ovs
disabled zone does not fail

[ACS44] Cherry pick Request

[Anshul Gangwar]

Hi Daan/Hugo,



Can you please cherry-pick following commits from 4.4-forward to 4.4:


commit ef45f06f88c955dcf47f1fb69a3a0e87eb817e1d
Author: Anshul Gangwar 
Date:   Mon Jun 23 10:58:44 2014 +0530

CLOUDSTACK-6965: fixed the NullPointerException introduced by fix for 
cloudstack
6935 in AbstractStoragePoolAllocator#filter method for Zone Wide storage


commit e7ba46b5f7da21c4fc13dc3284aa802d177045f2
Author: Anshul Gangwar 
Date:   Fri Jun 20 16:35:06 2014 +0530

CLOUDSTACK-6968: Allowing cluster scope volumes to attach to any VM. If 
migration is
needed then first they will be migrated to appropriate cluster before 
attaching.

commit 64153a43711420224655bfbe248b4b87474a1f23
Author: Anshul Gangwar 
Date:   Fri Jun 20 14:32:05 2014 +0530

CLOUDSTACK-6830: Fixed [hyper-v] during VM migration, volumes on zone wide 
primary
store requires storage migration resulting in failure of VM migration. This 
also
improves the hostsformigration api. Firstly we were trying to list all 
hosts and
then finding suitable storage pools for all volumes and then we were 
checking
whether vm migration requires storage migration to that host. Now the 
process is
updated. We are checking for only those volumes which are not in zone wide 
primary
store. We are verifying by comparing volumes->poolid->clusterid to host 
clusterid.
If it uses local or clusterids are different then verifying whether host has
suitable storage pools for the volume of the vm to be migrated too.

Thanks,
Anshul

[ACS44] cherry pick CLOUDSTACK-6474

[Prachi Damle]

Hi Hugo/Daan,

Could you please cherry-pick following commit to 4.4 branch?

Commit hash:be10b32b273bed1a1492f02b943b168195e762c0
CLOUDSTACK-6474: IAM - Not able to list shared networks that is created with 
scope="all"

Thanks,
Prachi

[ACS44] cherry pick CLOUDSTACK-6478

[Min Chen]

Hi Hugo/Daan,

Would you please cherry-pick following commit from 4.4-forward branch to
4.4 branch?

Commit: f3e9c84cddbc0ab7b89f8000dd0db42ba1570d28
CLOUDSTACK-6478: Failed to download Template when having 3 SSVM's in one
zone on Vmware.

Thanks
-min

[ACS44] cherry pick CLOUDSTACK-6477

[Jessica Wang]

Hi Hugo/Daan,

Would you please cherry-pick following commit from 4.4-forward branch to 4.4 
branch?

Commit: 62cac4f645205d590cbdd7c1102cace46034834c

CLOUDSTACK-6477: UI: Load Balancing - add VMs fails => error "Unable to decode 
parameter vmidipmap[0].vmip[]; if specifying an object array, please use 
parameter[index].field=XXX, ~ "

Thanks

Jessica

[ACS44] cherry pick CLOUDSTACK-6458

[Prachi Damle]

Hi Hugo/Daan,

Could you please cherry-pick following 2 commits to 4.4 branch?

Commit bc3a8378d0e58ad53f862b6102c0dfa39d97a06a
Commit 81adee346cd5135234207717d0243d174e0f116c
CLOUDSTACK-6458 IAM - 
When a domain is deleted , the group created for this domian is not removed
This is needed to avoid any issues evaluating permissions in the domain tree, 
possibly when a domain with same path is created later.

Thanks,
Prachi

[ACS44] cherry pick bug fix

[Nitin Mehta]

Hi Hugo/Daan,

Could you please cherry-pick the following bug fix from 4.4-forward to 4.4?

commit b8a1cbe81a03580a25cb473b59f8702734d665dc
Author: Nitin Mehta 
Date:   Thu Apr 24 17:20:41 2014 -0700

CLOUDSTACK-6499:
Made changes so that uploading custom certificate works for ssvm.
1. Reboot ssvm only when private key is passed meaning the server cert 
is passed. This is because while uploading the server cert is the last to be 
uploaded. And we want   to propagate the entire chain once uploading is done.
2. Change the SecStorageSetupCommand sent to ssvm so that it also 
carries the root cert apart from having the chain and the server cert and key.
3. Change ssvm agent code to be able to configure root cert to the java 
key store.
4. Change ssvm configure ssl script to insert the chain certs correctly.
5. Fix order of chain certificates for apache webserver in SSVM
6. Remove double encoding and decoding for uploadCustomCertificate API 
from UI and server code respectively, so that API call without UI works fine
7. Java 1.7 - disable using SNI since copyTemplate doesnt work for SSL.



Thanks,
-Nitin

[ACS44] cherry pick CLOUDSTACK-6255

[Gabor Apati-Nagy]

Hi Daan/Hugo,

Could you please cherry-pick the following commit?

commit 83e5ea9812cb57eb214ec9548671b0404914ae9b

CLOUDSTACK-6255

UI for supporting region level VPC, distributed routing enabled VPC and
stretched L2 neworks

Thanks,
Gabor

[ACS44]cherry pick CLOUDSTACK-6517

[Prachi Damle]

Hi Hugo/Daan,

Can you please cherry-pick following to 4.4:

Commit hash:e14c2ec7241ec2333ea3ac3d56a0e938fe1bf131

CLOUDSTACK-6517: IAM - Admin is allowed to create PortFowarding rule for a 
regular user, when admin does not have " UseEntry" permission for IpAddress.
Contained in branches: 4.4-forward

Thanks,
Prachi

[ACS44]cherry pick CLOUDSTACK-6443

[Min Chen]

Hi Hugo/Daan,

Would you please cherry pick the following commit from 4.4-forward to 
4.4
branch?

Commit: ef2616bfda1b37887312a93068937f5ecfaa36b4
CLOUDSTACK-6443: [Automation] Two Test Cases failed on "test_volumes.py"
- AttributeError: VirtualMachine instance has no attribute 'hosted'.

Thanks
-min

[ACS44]cherry pick CLOUDSTACK-6581

[Prachi Damle]

Hi Hugo/Daan,

Can you please cherry-pick following to 4.4:

Commit hash:eb28f77d1a07e902577a38194196b463ba5aef42

CLOUDSTACK-6581: IAM - Shared Network -Root Admin user is allowed to deploy VM 
in a shared network that is scoped for a specific domain/account.
Contained in branches: 4.4-forward

Thanks,
Prachi

[ACS44] cherry pick CLOUDSTACK-6379

[Jessica Wang]

Hi Hugo/Daan,

Could you please cherry-pick following commit to 4.4 branch?

Commit hash:f4c726d7b842636e665ba4ca3616688e2b26192b

CLOUDSTACK-6379: UI:MS: Unable to create a user type Admin under a domain; No 
API being fired

Thanks,

Jessica

[ACS44] cherry pick CLOUDSTACK-6606

[Jessica Wang]

Hi Hugo/Daan,

Could you please cherry-pick following commit to 4.4 branch?

Commit hash:0d7ddc4337568939f47de875f1a03f39b54e3b30

CLOUDSTACK-6606: create network offering dailog box has greyed out (not 
selectable) providers for the connectivity service.

Thanks,

Jessica

Re: [ACS44] Cherry pick request

[Daan Hoogland]

ok

On Tue, May 13, 2014 at 7:13 PM, Amogh Vasekar  wrote:
> Hi Daan,
>
> Can you please cherry-pick 594f66d12521c6a3a07475e37e7ab0f09d247b19
> It is a fix for https://issues.apache.org/jira/browse/CLOUDSTACK-6437
>
> Thanks,
> Amogh
>



-- 
Daan

Re: [ACS44] Cherry pick requests

[Daan Hoogland]

pulled in all commits from hijacked thread

On Mon, May 12, 2014 at 9:13 PM, Min Chen  wrote:
> Hi Daan,
>
> Can you please cherry pick the following commits from 4.4-forward to 
> 4.4
> branch? Some of them are resending previous requests.
>
> Commit: 500c99eef7f7a04d95ed95697a2678fef283e61d
> CLOUDSTACK-6600:IAM Security checker needs to have cache to improve
> checkAccess performance.
>
>
>
> Commit:b9bdaf9d31803cd080475e27da56695c3293c4ca
> CLOUDSTACK-6598:IAM - listAccount() retrurns "Caller cannot be passed as
> NULL to IAM!" when domain deletion is in progress.
>
>
> Commit: e8e0449ed4eaa489d53b43c0137833a660b6d6cf
> CLOUDSTACK-6613:IAM: authorizeSecurityGroupIngress fails when SG Name is
> passed.
>
>
> Commit: 4889031492e543c318fcd639d7491cfb2013eb76
> CLOUDSTACK-6600: fix a bug in IAM cache in constructing cache key.
>
> Commit: f447a2c38c15ad5b7844237e72ab551149f46bfb
> CLOUDSTACK-6617: [Automation] detach / resize volume test cases failing
> with permission error.
>
>
>
> Commit: a7dd5aae55c1f6059aea324760f2800537f5d294
> CLOUDSTACK-6628:[Automation] Create PF rulw API failing with error
> "database id can only provided by VO objects".
>
>
> Commit: be73571c74084a31819c150dfca2ca28bd13e64b
> CLOUDSTACK-6628: Fix IpAddress import typo.
>
> Thanks.
> -min
>



-- 
Daan

[ACS44]Cherry-pick CLOUDSTACK-6476

[Prachi Damle]

Hi Daan,

Can you please cherry-pick the following commit  to 4.4:

Commit 3448ab7f1c5c15949855788b029028ddac01327b
CLOUDSTACK-6476 Basic 
Zone with Multiple Pods Setup: DHCP server doesnt get deployed in the pod where 
the VM gets deployed
Thanks
Prachi

[ACS44]cherry-pick commit 8bcd2546ac159bbfa778c7a023065a1efc7edd5e

[Murali Reddy]

Daan,

Please cherry pick commit 8bcd2546ac159bbfa778c7a023065a1efc7edd5e in
4.4-forward for CLOUDSTACK-6672 into 4.4

Thanks,
Murali

[ACS44] cherry-pick commit 497f5e53725c30442040805a3ad42a81ee926f50

[Murali Reddy]

Daan,

Please pull-in commit 497f5e53725c30442040805a3ad42a81ee926f50 from
4.4-forward to 4.4

CLOUDSTACK-6712: NPE in findJobInstanceUuid() in ApiDBUtils
Branch: refs/heads/4.4-forward
Commit: 497f5e53725c30442040805a3ad42a81ee926f50

[ACS44] Cherry pick CLOUDSTACK-6599

[Nitin Mehta]

Hello Daan,

Can you please cherry-pick the following commit from 4.4-forward to 4.4 ?

commit 48ea9e0b5e87fee067b711890cd5a5d7c9079bf1
CLOUDSTACK-6599:
1. Adding the missing Template/Volume URLs expiration functionality
2. Improvement - While deleting the volume during expiration use rm -rf as 
vmware now contains directoy
3. Improvement - Use standard Answer so that the error gets logged in case 
deletion of expiration link didnt work fine.
4. Improvement - In case of domain change, expire the old urls

Thanks,
-Nitin

RE: [ACS44]cherry-pick: dfb59cd6cc0292a88cb619e53f34cdb713879ffd

[Edison Su]

Need to cherry pick it into 4.3.1 also.

> -Original Message-
> From: Edison Su [mailto:edison...@citrix.com]
> Sent: Tuesday, June 03, 2014 1:37 PM
> To: dev@cloudstack.apache.org
> Subject: [ACS44]cherry-pick: dfb59cd6cc0292a88cb619e53f34cdb713879ffd
> 
> CLOUDSTACK-6464:
> The root cause is that, in 3.0.x, if guest network is "vlan://untagged", then
> kvm agent will use whatever value in "private.network.device", while in 4.x,
> kvm agent will use "guest.network.device". So if both value are not the same
> in the agent.properties, then kvm agent will use incorrect bridge to create 
> vif.
> The fix will be, kvm agent code needs to honor traffic type passed down
> from mgt server in startcommand, in case of "vlan://untagged".

Re: [ACS44]cherry-pick: dfb59cd6cc0292a88cb619e53f34cdb713879ffd

[Marcus]

I don't think that's the root cause, but it shouldn't hurt. The root cause
seems to be that we're telling the agent that the broadcastUri for the vlan
is 'vlan://100' (as reported by Anders), but the IpAssocCmd passes
broadcast URI as just '100'. This is a bit messy to workaround the mgmt
server inconsistency in the agent, but it won't hurt. Fixing the
inconsistency would be better, and Daan has applied a patch that should
blanket fix that during the 4.4 upgrade.


On Tue, Jun 3, 2014 at 2:44 PM, Edison Su  wrote:

> Need to cherry pick it into 4.3.1 also.
>
> > -Original Message-
> > From: Edison Su [mailto:edison...@citrix.com]
> > Sent: Tuesday, June 03, 2014 1:37 PM
> > To: dev@cloudstack.apache.org
> > Subject: [ACS44]cherry-pick: dfb59cd6cc0292a88cb619e53f34cdb713879ffd
> >
> > CLOUDSTACK-6464:
> > The root cause is that, in 3.0.x, if guest network is "vlan://untagged",
> then
> > kvm agent will use whatever value in "private.network.device", while in
> 4.x,
> > kvm agent will use "guest.network.device". So if both value are not the
> same
> > in the agent.properties, then kvm agent will use incorrect bridge to
> create vif.
> > The fix will be, kvm agent code needs to honor traffic type passed down
> > from mgt server in startcommand, in case of "vlan://untagged".
>

Re: [ACS44]cherry-pick: dfb59cd6cc0292a88cb619e53f34cdb713879ffd

[Marcus]

Your commit 5e80e5d33d9a295b91cdba9377f52d9d963d802a actually does the fix
mgmt server side and makes this patch irrelevant, as we are now passing a
proper vlan:// in this command. However, Daan's fix will make the data in
the db consistent for upgraders and fresh installers, which will fix this
and all other bugs like it.


On Tue, Jun 3, 2014 at 3:26 PM, Marcus  wrote:

> I don't think that's the root cause, but it shouldn't hurt. The root cause
> seems to be that we're telling the agent that the broadcastUri for the vlan
> is 'vlan://100' (as reported by Anders), but the IpAssocCmd passes
> broadcast URI as just '100'. This is a bit messy to workaround the mgmt
> server inconsistency in the agent, but it won't hurt. Fixing the
> inconsistency would be better, and Daan has applied a patch that should
> blanket fix that during the 4.4 upgrade.
>
>
> On Tue, Jun 3, 2014 at 2:44 PM, Edison Su  wrote:
>
>> Need to cherry pick it into 4.3.1 also.
>>
>> > -Original Message-
>> > From: Edison Su [mailto:edison...@citrix.com]
>> > Sent: Tuesday, June 03, 2014 1:37 PM
>> > To: dev@cloudstack.apache.org
>> > Subject: [ACS44]cherry-pick: dfb59cd6cc0292a88cb619e53f34cdb713879ffd
>> >
>> > CLOUDSTACK-6464:
>> > The root cause is that, in 3.0.x, if guest network is
>> "vlan://untagged", then
>> > kvm agent will use whatever value in "private.network.device", while in
>> 4.x,
>> > kvm agent will use "guest.network.device". So if both value are not the
>> same
>> > in the agent.properties, then kvm agent will use incorrect bridge to
>> create vif.
>> > The fix will be, kvm agent code needs to honor traffic type passed down
>> > from mgt server in startcommand, in case of "vlan://untagged".
>>
>
>

Re: [ACS44] Cherry pick 73330167228d14ea8494c9c1893627b6936626a7

[Daan Hoogland]

On Tue, Jun 3, 2014 at 8:02 PM, Nitin Mehta  wrote:
> 73330167228d14ea8494c9c1893627b6936626a7


is in

-- 
Daan

Re: [ACS44] cherry pick 5e80e5d33d9a295b91cdba9377f52d9d963d802a

[Daan Hoogland]

is in

On Tue, Jun 3, 2014 at 8:19 PM, Edison Su  wrote:
> If Vpc public network with snat enabled, mgt server will send down "vlan-id" 
> instead of "vlan://vlan-id" in ipassoccommand, which will cause issue on the 
> hypervisor resource to program VR.



-- 
Daan

Re: [ACS44]cherry-pick: dfb59cd6cc0292a88cb619e53f34cdb713879ffd

[Daan Hoogland]

I read here that this commit is not needed. Can we think of scenarios
where it is?

On Tue, Jun 3, 2014 at 11:29 PM, Marcus  wrote:
> Your commit 5e80e5d33d9a295b91cdba9377f52d9d963d802a actually does the fix
> mgmt server side and makes this patch irrelevant, as we are now passing a
> proper vlan:// in this command. However, Daan's fix will make the data in
> the db consistent for upgraders and fresh installers, which will fix this
> and all other bugs like it.
>
>
> On Tue, Jun 3, 2014 at 3:26 PM, Marcus  wrote:
>
>> I don't think that's the root cause, but it shouldn't hurt. The root cause
>> seems to be that we're telling the agent that the broadcastUri for the vlan
>> is 'vlan://100' (as reported by Anders), but the IpAssocCmd passes
>> broadcast URI as just '100'. This is a bit messy to workaround the mgmt
>> server inconsistency in the agent, but it won't hurt. Fixing the
>> inconsistency would be better, and Daan has applied a patch that should
>> blanket fix that during the 4.4 upgrade.
>>
>>
>> On Tue, Jun 3, 2014 at 2:44 PM, Edison Su  wrote:
>>
>>> Need to cherry pick it into 4.3.1 also.
>>>
>>> > -Original Message-
>>> > From: Edison Su [mailto:edison...@citrix.com]
>>> > Sent: Tuesday, June 03, 2014 1:37 PM
>>> > To: dev@cloudstack.apache.org
>>> > Subject: [ACS44]cherry-pick: dfb59cd6cc0292a88cb619e53f34cdb713879ffd
>>> >
>>> > CLOUDSTACK-6464:
>>> > The root cause is that, in 3.0.x, if guest network is
>>> "vlan://untagged", then
>>> > kvm agent will use whatever value in "private.network.device", while in
>>> 4.x,
>>> > kvm agent will use "guest.network.device". So if both value are not the
>>> same
>>> > in the agent.properties, then kvm agent will use incorrect bridge to
>>> create vif.
>>> > The fix will be, kvm agent code needs to honor traffic type passed down
>>> > from mgt server in startcommand, in case of "vlan://untagged".
>>>
>>
>>



-- 
Daan

Re: [ACS44]cherry-pick: dfb59cd6cc0292a88cb619e53f34cdb713879ffd

[Marcus]

actually this specific commit isn't the one I thought it was. This one is a
relatively innocuous catch-all that forces things to the guest bridge if
all else fails. I'm not sure it will configure things 'right', but it will
help from things going on a protected network like mgmt if things fail.


On Wed, Jun 4, 2014 at 1:32 AM, Daan Hoogland 
wrote:

> I read here that this commit is not needed. Can we think of scenarios
> where it is?
>
> On Tue, Jun 3, 2014 at 11:29 PM, Marcus  wrote:
> > Your commit 5e80e5d33d9a295b91cdba9377f52d9d963d802a actually does the
> fix
> > mgmt server side and makes this patch irrelevant, as we are now passing a
> > proper vlan:// in this command. However, Daan's fix will make the data in
> > the db consistent for upgraders and fresh installers, which will fix this
> > and all other bugs like it.
> >
> >
> > On Tue, Jun 3, 2014 at 3:26 PM, Marcus  wrote:
> >
> >> I don't think that's the root cause, but it shouldn't hurt. The root
> cause
> >> seems to be that we're telling the agent that the broadcastUri for the
> vlan
> >> is 'vlan://100' (as reported by Anders), but the IpAssocCmd passes
> >> broadcast URI as just '100'. This is a bit messy to workaround the mgmt
> >> server inconsistency in the agent, but it won't hurt. Fixing the
> >> inconsistency would be better, and Daan has applied a patch that should
> >> blanket fix that during the 4.4 upgrade.
> >>
> >>
> >> On Tue, Jun 3, 2014 at 2:44 PM, Edison Su  wrote:
> >>
> >>> Need to cherry pick it into 4.3.1 also.
> >>>
> >>> > -Original Message-
> >>> > From: Edison Su [mailto:edison...@citrix.com]
> >>> > Sent: Tuesday, June 03, 2014 1:37 PM
> >>> > To: dev@cloudstack.apache.org
> >>> > Subject: [ACS44]cherry-pick: dfb59cd6cc0292a88cb619e53f34cdb713879ffd
> >>> >
> >>> > CLOUDSTACK-6464:
> >>> > The root cause is that, in 3.0.x, if guest network is
> >>> "vlan://untagged", then
> >>> > kvm agent will use whatever value in "private.network.device", while
> in
> >>> 4.x,
> >>> > kvm agent will use "guest.network.device". So if both value are not
> the
> >>> same
> >>> > in the agent.properties, then kvm agent will use incorrect bridge to
> >>> create vif.
> >>> > The fix will be, kvm agent code needs to honor traffic type passed
> down
> >>> > from mgt server in startcommand, in case of "vlan://untagged".
> >>>
> >>
> >>
>
>
>
> --
> Daan
>

Re: [ACS44]cherry-pick: dfb59cd6cc0292a88cb619e53f34cdb713879ffd

[Marcus]

I see. My confusion lies in the fact that this commit is associated with
https://reviews.apache.org/r/21908/, which is not the right fix, but the
commit does not contain the review patch provided.

In fact, we *really* don't want to apply review 21908 now that we've
applied other fixes, as it is functionally incompatible with some of the
other commits, but these commits should be ok.


On Wed, Jun 4, 2014 at 8:13 AM, Marcus  wrote:

> actually this specific commit isn't the one I thought it was. This one is
> a relatively innocuous catch-all that forces things to the guest bridge if
> all else fails. I'm not sure it will configure things 'right', but it will
> help from things going on a protected network like mgmt if things fail.
>
>
> On Wed, Jun 4, 2014 at 1:32 AM, Daan Hoogland 
> wrote:
>
>> I read here that this commit is not needed. Can we think of scenarios
>> where it is?
>>
>> On Tue, Jun 3, 2014 at 11:29 PM, Marcus  wrote:
>> > Your commit 5e80e5d33d9a295b91cdba9377f52d9d963d802a actually does the
>> fix
>> > mgmt server side and makes this patch irrelevant, as we are now passing
>> a
>> > proper vlan:// in this command. However, Daan's fix will make the data
>> in
>> > the db consistent for upgraders and fresh installers, which will fix
>> this
>> > and all other bugs like it.
>> >
>> >
>> > On Tue, Jun 3, 2014 at 3:26 PM, Marcus  wrote:
>> >
>> >> I don't think that's the root cause, but it shouldn't hurt. The root
>> cause
>> >> seems to be that we're telling the agent that the broadcastUri for the
>> vlan
>> >> is 'vlan://100' (as reported by Anders), but the IpAssocCmd passes
>> >> broadcast URI as just '100'. This is a bit messy to workaround the mgmt
>> >> server inconsistency in the agent, but it won't hurt. Fixing the
>> >> inconsistency would be better, and Daan has applied a patch that should
>> >> blanket fix that during the 4.4 upgrade.
>> >>
>> >>
>> >> On Tue, Jun 3, 2014 at 2:44 PM, Edison Su 
>> wrote:
>> >>
>> >>> Need to cherry pick it into 4.3.1 also.
>> >>>
>> >>> > -Original Message-
>> >>> > From: Edison Su [mailto:edison...@citrix.com]
>> >>> > Sent: Tuesday, June 03, 2014 1:37 PM
>> >>> > To: dev@cloudstack.apache.org
>> >>> > Subject: [ACS44]cherry-pick:
>> dfb59cd6cc0292a88cb619e53f34cdb713879ffd
>> >>> >
>> >>> > CLOUDSTACK-6464:
>> >>> > The root cause is that, in 3.0.x, if guest network is
>> >>> "vlan://untagged", then
>> >>> > kvm agent will use whatever value in "private.network.device",
>> while in
>> >>> 4.x,
>> >>> > kvm agent will use "guest.network.device". So if both value are not
>> the
>> >>> same
>> >>> > in the agent.properties, then kvm agent will use incorrect bridge to
>> >>> create vif.
>> >>> > The fix will be, kvm agent code needs to honor traffic type passed
>> down
>> >>> > from mgt server in startcommand, in case of "vlan://untagged".
>> >>>
>> >>
>> >>
>>
>>
>>
>> --
>> Daan
>>
>
>

Re: [ACS44]cherry-pick: dfb59cd6cc0292a88cb619e53f34cdb713879ffd

[Daan Hoogland]

I had the same confusion as I inspected this id (from subject)
it is pulled in now.

On Wed, Jun 4, 2014 at 4:22 PM, Marcus  wrote:
> I see. My confusion lies in the fact that this commit is associated with
> https://reviews.apache.org/r/21908/, which is not the right fix, but the
> commit does not contain the review patch provided.
>
> In fact, we *really* don't want to apply review 21908 now that we've
> applied other fixes, as it is functionally incompatible with some of the
> other commits, but these commits should be ok.
>
>
> On Wed, Jun 4, 2014 at 8:13 AM, Marcus  wrote:
>
>> actually this specific commit isn't the one I thought it was. This one is
>> a relatively innocuous catch-all that forces things to the guest bridge if
>> all else fails. I'm not sure it will configure things 'right', but it will
>> help from things going on a protected network like mgmt if things fail.
>>
>>
>> On Wed, Jun 4, 2014 at 1:32 AM, Daan Hoogland 
>> wrote:
>>
>>> I read here that this commit is not needed. Can we think of scenarios
>>> where it is?
>>>
>>> On Tue, Jun 3, 2014 at 11:29 PM, Marcus  wrote:
>>> > Your commit 5e80e5d33d9a295b91cdba9377f52d9d963d802a actually does the
>>> fix
>>> > mgmt server side and makes this patch irrelevant, as we are now passing
>>> a
>>> > proper vlan:// in this command. However, Daan's fix will make the data
>>> in
>>> > the db consistent for upgraders and fresh installers, which will fix
>>> this
>>> > and all other bugs like it.
>>> >
>>> >
>>> > On Tue, Jun 3, 2014 at 3:26 PM, Marcus  wrote:
>>> >
>>> >> I don't think that's the root cause, but it shouldn't hurt. The root
>>> cause
>>> >> seems to be that we're telling the agent that the broadcastUri for the
>>> vlan
>>> >> is 'vlan://100' (as reported by Anders), but the IpAssocCmd passes
>>> >> broadcast URI as just '100'. This is a bit messy to workaround the mgmt
>>> >> server inconsistency in the agent, but it won't hurt. Fixing the
>>> >> inconsistency would be better, and Daan has applied a patch that should
>>> >> blanket fix that during the 4.4 upgrade.
>>> >>
>>> >>
>>> >> On Tue, Jun 3, 2014 at 2:44 PM, Edison Su 
>>> wrote:
>>> >>
>>> >>> Need to cherry pick it into 4.3.1 also.
>>> >>>
>>> >>> > -Original Message-
>>> >>> > From: Edison Su [mailto:edison...@citrix.com]
>>> >>> > Sent: Tuesday, June 03, 2014 1:37 PM
>>> >>> > To: dev@cloudstack.apache.org
>>> >>> > Subject: [ACS44]cherry-pick:
>>> dfb59cd6cc0292a88cb619e53f34cdb713879ffd
>>> >>> >
>>> >>> > CLOUDSTACK-6464:
>>> >>> > The root cause is that, in 3.0.x, if guest network is
>>> >>> "vlan://untagged", then
>>> >>> > kvm agent will use whatever value in "private.network.device",
>>> while in
>>> >>> 4.x,
>>> >>> > kvm agent will use "guest.network.device". So if both value are not
>>> the
>>> >>> same
>>> >>> > in the agent.properties, then kvm agent will use incorrect bridge to
>>> >>> create vif.
>>> >>> > The fix will be, kvm agent code needs to honor traffic type passed
>>> down
>>> >>> > from mgt server in startcommand, in case of "vlan://untagged".
>>> >>>
>>> >>
>>> >>
>>>
>>>
>>>
>>> --
>>> Daan
>>>
>>
>>



-- 
Daan

Re: [ACS44] Cherry pick request

[Daan Hoogland]

2 picked

On Tue, Jun 10, 2014 at 2:09 AM, Amogh Vasekar  wrote:
> Hi Daan,
>
> Request you to please cherry-pick the following two commits to 4.4 branch :
>
> 1. ac92b3690304ff224e7e2530ea7d8e39f28a05c3 for CLOUDSTACK-6710
> 2. a4b401f29f83f2f0b467a9d05b509f951b5a3bca for CLOUDSTACK-6358
>
> Thanks,
> Amogh
>



-- 
Daan

Re: [ACS44] Cherry pick request

[Daan Hoogland]

3 in

On Thu, Jun 12, 2014 at 6:58 AM, Saksham Srivastava
 wrote:
> Hi Daan,
>
> Request you to cherry-pick the following commits to 4.4:
>
> c5ee5ad5c828d9f0b128e3d7280a30dcf717e045   -   CLOUDSTACK-6864
> 5bcd017de6f421a6125406120b39fb8602276dc7   -CLOUDSTACK-6654
> f14f36170e94c0184ade28a50226b17d25ecf57c-CLOUDSTACK-6812
>
> Thanks,
> Saksham



-- 
Daan

Re: [ACS44] cherry-pick request

[Daan Hoogland]

both pulled

On Fri, Jun 13, 2014 at 1:53 PM, Murali Reddy  wrote:
> Daan,
>
> Please cherry-pick below commits in 4.4-forward into 4.4
>
> commit be937a08213f06a801cf07d19867d48dad35d19f
> CLOUDSTACK-6832: [OVS]vnet is not released even the network is deleted
>
> fix ensures allocated VNET is released during network shutdown
>
> commit 9dfbdb5ffd2f0981651bc98f1c5d71718a24a29f
> CLOUDSTACK-6749: [OVS] xe network-param-get with
> param-key=is-ovs-vpc-distributed-vr-network alway returns error
>
> fixing unnecessary errors in the logs
>
>
> Thanks.
>



-- 
Daan

Re: [ACS44] Cherry Pick Request

[Daan Hoogland]

On Mon, Jun 16, 2014 at 4:28 PM, Santhosh Edukulla
 wrote:
> Daan,
>
> Please pick up the below fixes for resource leaks and other Coverity issues.
>
> 4ba3aae2ea0290ca012623083e13625e08a9dde5
was in already?

> 3c5f64c97ab071451aee7f232d8f2cec6d89044d
in

> dbfce8b11e25855a8cb21ec2bbbfe20940bb788d
had conflicts

>
>
> As well, please check the below commit, its fix for CLOUDSTACK-6793
>
> 91d054cb00f6a5818f2be1c7e4d3f44a2c58bfcc
was in already?

>
> Thanks!
> Santhosh



-- 
Daan

Re: [ACS44] Cherry pick request

[Daan Hoogland]

On Mon, Jun 16, 2014 at 11:31 PM, Amogh Vasekar
 wrote:
> de04881da177b28d7cb3efc09adb2d8069f0fdd3


is in

-- 
Daan

RE: [ACS44] Cherry Pick Request

[Santhosh Edukulla]

Resolved the conflicts for the mentioned commit.

https://reviews.apache.org/r/22677/

Santhosh

From: Daan Hoogland [daan.hoogl...@gmail.com]
Sent: Monday, June 16, 2014 12:09 PM
To: dev
Subject: Re: [ACS44] Cherry Pick Request

On Mon, Jun 16, 2014 at 4:28 PM, Santhosh Edukulla
 wrote:
> Daan,
>
> Please pick up the below fixes for resource leaks and other Coverity issues.
>
> 4ba3aae2ea0290ca012623083e13625e08a9dde5
was in already?

> 3c5f64c97ab071451aee7f232d8f2cec6d89044d
in

> dbfce8b11e25855a8cb21ec2bbbfe20940bb788d
had conflicts

>
>
> As well, please check the below commit, its fix for CLOUDSTACK-6793
>
> 91d054cb00f6a5818f2be1c7e4d3f44a2c58bfcc
was in already?

>
> Thanks!
> Santhosh



--
Daan

Re: [ACS44] Cherry Pick Request

[Daan Hoogland]

applied and pushed,

I have one remark; when fixing issues I would like to see a ref to the
issue (in this case no jira issue but 'coverity:') and a description
of what was solved. your style of commit comments requires a lot of
contextual knowledge. Can you try to make sure someone reading your
commit comment doesn't need to know the contents of the related issues
to get it?

thanks,
Daan

On Tue, Jun 17, 2014 at 1:26 PM, Santhosh Edukulla
 wrote:
> Resolved the conflicts for the mentioned commit.
>
> https://reviews.apache.org/r/22677/
>
> Santhosh
> 
> From: Daan Hoogland [daan.hoogl...@gmail.com]
> Sent: Monday, June 16, 2014 12:09 PM
> To: dev
> Subject: Re: [ACS44] Cherry Pick Request
>
> On Mon, Jun 16, 2014 at 4:28 PM, Santhosh Edukulla
>  wrote:
>> Daan,
>>
>> Please pick up the below fixes for resource leaks and other Coverity issues.
>>
>> 4ba3aae2ea0290ca012623083e13625e08a9dde5
> was in already?
>
>> 3c5f64c97ab071451aee7f232d8f2cec6d89044d
> in
>
>> dbfce8b11e25855a8cb21ec2bbbfe20940bb788d
> had conflicts
>
>>
>>
>> As well, please check the below commit, its fix for CLOUDSTACK-6793
>>
>> 91d054cb00f6a5818f2be1c7e4d3f44a2c58bfcc
> was in already?
>
>>
>> Thanks!
>> Santhosh
>
>
>
> --
> Daan



-- 
Daan

RE: [ACS44] Cherry Pick Request

[Santhosh Edukulla]

Sure.

From: Daan Hoogland [daan.hoogl...@gmail.com]
Sent: Tuesday, June 17, 2014 7:55 AM
To: dev
Subject: Re: [ACS44] Cherry Pick Request

applied and pushed,

I have one remark; when fixing issues I would like to see a ref to the
issue (in this case no jira issue but 'coverity:') and a description
of what was solved. your style of commit comments requires a lot of
contextual knowledge. Can you try to make sure someone reading your
commit comment doesn't need to know the contents of the related issues
to get it?

thanks,
Daan

On Tue, Jun 17, 2014 at 1:26 PM, Santhosh Edukulla
 wrote:
> Resolved the conflicts for the mentioned commit.
>
> https://reviews.apache.org/r/22677/
>
> Santhosh
> 
> From: Daan Hoogland [daan.hoogl...@gmail.com]
> Sent: Monday, June 16, 2014 12:09 PM
> To: dev
> Subject: Re: [ACS44] Cherry Pick Request
>
> On Mon, Jun 16, 2014 at 4:28 PM, Santhosh Edukulla
>  wrote:
>> Daan,
>>
>> Please pick up the below fixes for resource leaks and other Coverity issues.
>>
>> 4ba3aae2ea0290ca012623083e13625e08a9dde5
> was in already?
>
>> 3c5f64c97ab071451aee7f232d8f2cec6d89044d
> in
>
>> dbfce8b11e25855a8cb21ec2bbbfe20940bb788d
> had conflicts
>
>>
>>
>> As well, please check the below commit, its fix for CLOUDSTACK-6793
>>
>> 91d054cb00f6a5818f2be1c7e4d3f44a2c58bfcc
> was in already?
>
>>
>> Thanks!
>> Santhosh
>
>
>
> --
> Daan



--
Daan

Re: [ACS44] cherry-pick request

[Daan Hoogland]

On Tue, Jun 17, 2014 at 2:26 PM, Murali Reddy  wrote:
> 8ca8a7217ec155a37b24e3d9cfc3d5fc67adef2d


is in

-- 
Daan

Re: [ACS44] cherry-pick request

[Daan Hoogland]

On Thu, Jun 19, 2014 at 2:22 PM, Murali Reddy  wrote:
> d8cbba1bc616d43e218229a2807915c1b21569dc


is in

-- 
Daan

Re: [ACS44] Cherry pick Request

[Daan Hoogland]

On Mon, Jun 23, 2014 at 9:43 AM, Anshul Gangwar
 wrote:
...
> commit ef45f06f88c955dcf47f1fb69a3a0e87eb817e1d
is in

> commit e7ba46b5f7da21c4fc13dc3284aa802d177045f2
is in

> commit 64153a43711420224655bfbe248b4b87474a1f23
conflicts, will have a look in a minute

Re: [ACS44] Cherry pick Request

[Daan Hoogland]

On Mon, Jun 23, 2014 at 9:52 AM, Daan Hoogland  wrote:
>> commit 64153a43711420224655bfbe248b4b87474a1f23
> conflicts, will have a look in a minute


seemed simple, please check

-- 
Daan

RE: [ACS44] Cherry pick Request

[Anshul Gangwar]

Looks good 

-Original Message-
From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] 
Sent: Monday, June 23, 2014 1:27 PM
To: Anshul Gangwar
Cc: dev@cloudstack.apache.org
Subject: Re: [ACS44] Cherry pick Request

On Mon, Jun 23, 2014 at 9:52 AM, Daan Hoogland  wrote:
>> commit 64153a43711420224655bfbe248b4b87474a1f23
> conflicts, will have a look in a minute


seemed simple, please check

-- 
Daan

Re: [ACS44] Cherry pick Request

[Daan Hoogland]

except that it doesn't build :( this seems to be related to the
libvirt pom again, not your commit :)

On Mon, Jun 23, 2014 at 10:16 AM, Anshul Gangwar
 wrote:
> Looks good
>
> -Original Message-
> From: Daan Hoogland [mailto:daan.hoogl...@gmail.com]
> Sent: Monday, June 23, 2014 1:27 PM
> To: Anshul Gangwar
> Cc: dev@cloudstack.apache.org
> Subject: Re: [ACS44] Cherry pick Request
>
> On Mon, Jun 23, 2014 at 9:52 AM, Daan Hoogland  
> wrote:
>>> commit 64153a43711420224655bfbe248b4b87474a1f23
>> conflicts, will have a look in a minute
>
>
> seemed simple, please check
>
> --
> Daan



-- 
Daan

Re: [ACS44] cherry pick CLOUDSTACK-6474

[Daan Hoogland]

On Wed, Apr 23, 2014 at 3:45 AM, Prachi Damle  wrote:
> be10b32b273bed1a1492f02b943b168195e762c0


done

-- 
Daan

[ACS44] cherry pick 3 bug fixes

[Min Chen]

Hi Hugo/Daan,

Could you please cherry-pick the following 3 bug fixes from 4.4-forward
to 4.4?


1. Commit 5728ed33e9dd09d0d3ac42b5d82da42b37641519
   CLOUDSTACK-6501:IAM - DomainAdmin - When listVirtualMachines is used
with listall=true and account and domainId , Vms owned by the account
account is not listed.

2. Commit 4f2a20f7b35c2a250614b7cf32879d7bb87b7a62
   CLOUDSTACK-6502:IAMGroup.list and IAMPolicy.list in marvin base.py are
not working.  (This is needed to write IAM marvin test)

3. Commit f3e9c84cddbc0ab7b89f8000dd0db42ba1570d28
   CLOUDSTACK-6478: Failed to download Template when having 3 SSVM's in one
zone on Vmware.  (I requested this two days back, you have some questions
about commit, and I have answered)

Thanks
-min

Re: [ACS44] cherry pick CLOUDSTACK-6477

[Daan Hoogland]

On Thu, Apr 24, 2014 at 12:16 AM, Jessica Wang  wrote:
> 62cac4f645205d590cbdd7c1102cace46034834c


pulled in

-- 
Daan

Re: [ACS44] cherry pick CLOUDSTACK-6458

[Daan Hoogland]

On Thu, Apr 24, 2014 at 9:50 PM, Prachi Damle  wrote:
> Commit bc3a8378d0e58ad53f862b6102c0dfa39d97a06a
> Commit 81adee346cd5135234207717d0243d174e0f116c


pulled

-- 
Daan

Re: [ACS44] cherry pick bug fix

[Daan Hoogland]

On Fri, Apr 25, 2014 at 4:39 AM, Nitin Mehta  wrote:
> b8a1cbe81a03580a25cb473b59f8702734d665dc


is in

-- 
Daan

Re: [ACS44] cherry pick bug fix

[Nitin Mehta]

Thanks Daan.

On 25/04/14 1:28 PM, "Daan Hoogland"  wrote:

>On Fri, Apr 25, 2014 at 4:39 AM, Nitin Mehta 
>wrote:
>> b8a1cbe81a03580a25cb473b59f8702734d665dc
>
>
>is in
>
>-- 
>Daan

Re: [ACS44] cherry pick CLOUDSTACK-6255

[Daan Hoogland]

On Mon, Apr 28, 2014 at 5:49 PM, Gabor Apati-Nagy
 wrote:
> 83e5ea9812cb57eb214ec9548671b0404914ae9b


ok

-- 
Daan

Re: [ACS44]cherry pick CLOUDSTACK-6517

[Daan Hoogland]

On Wed, Apr 30, 2014 at 9:00 PM, Prachi Damle  wrote:
> e14c2ec7241ec2333ea3ac3d56a0e938fe1bf131


Prachi, your commit contains dos line endings:
-IAMPolicyPermissionVO permit =
_policyPermissionDao.findByPolicyAndEntity(iamPolicyId, entityType,
scope, scopeId, action, perm);
+IAMPolicyPermissionVO permit =
_policyPermissionDao.findByPolicyAndEntity(iamPolicyId, entityType,
scope,^M
+scopeId, action, perm, accessType);^M

Since I only saw them in java files I will let it pass but please
adjust your work environment to prevent the line endings to enter the
system. When they end up in configuration files or scripts things
might break inexplicably.

-- 
Daan

RE: [ACS44]cherry pick CLOUDSTACK-6517

[Prachi Damle]

Yes, I will check my work environment again for this.

Prachi
-Original Message-
From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] 
Sent: Wednesday, April 30, 2014 11:37 PM
To: dev
Subject: Re: [ACS44]cherry pick CLOUDSTACK-6517

On Wed, Apr 30, 2014 at 9:00 PM, Prachi Damle  wrote:
> e14c2ec7241ec2333ea3ac3d56a0e938fe1bf131


Prachi, your commit contains dos line endings:
-IAMPolicyPermissionVO permit =
_policyPermissionDao.findByPolicyAndEntity(iamPolicyId, entityType, scope, 
scopeId, action, perm);
+IAMPolicyPermissionVO permit =
_policyPermissionDao.findByPolicyAndEntity(iamPolicyId, entityType, scope,^M
+scopeId, action, perm, accessType);^M

Since I only saw them in java files I will let it pass but please adjust your 
work environment to prevent the line endings to enter the system. When they end 
up in configuration files or scripts things might break inexplicably.

--
Daan

[ACS44] Cherry-pick for CLOUDSTACK-4549

[Wido den Hollander]

Hi Daan,

Could you please cherry-pick 355f1a2a7599f25771f390f7dba2f8659dbe8fa6 
for me into the 4.4 branch?


This fixes CLOUDSTACK-4549 [0] where users couldn't create a new volume 
from a RBD snapshot.


I tested it on my local environment where the agents run the code from 
4.4-forward with my patch and it works.


Wido

[0]: https://issues.apache.org/jira/browse/CLOUDSTACK-4549

[ACS44]cherry pick 2 IAM bugs

[Prachi Damle]

Hi Daan/Hugo,

Can you please cherry-pick following 2 commits to 4.4 branch:


  1.  CLOUDSTACK-6558 
IAM - Admin user is able to deploy VM in a regular user's Security Group.

Commit hash:e89c628843692c9e7046192f5b6d4893b7a45ec6





  1.  CLOUDSTACK-6560 
IAM - Admin user is denied permission to create Egress rule for a user's network

Commit hash:2e5b5291574417e31b4e81a6cc170e77a0cd7f65

Contained in branches: 4.4-forward



Thanks,
Prachi

Re: [ACS44]cherry pick CLOUDSTACK-6443

[Daan Hoogland]

On Thu, May 1, 2014 at 7:16 PM, Min Chen  wrote:
> ef2616bfda1b37887312a93068937f5ecfaa36b4


done

-- 
Daan

[ACS44] Cherry pick for cloudstack-6472

[Sebastien Goasguen]

Daan,

Can you cherry pick from 4.4-forward:

f328f6157b682abc5bce007400f1cdf476097745

and

fe84b674c14b6494770b489100e92a116b3b1f49

thanks

-sebastien

[ACS44] Cherry pick for CLOUDSTACK-6585

[Alena Prokharchyk]

Daan,

Can you please cherry pick the commit 8ffb2c11485c178a97dd30f620458684c79d186a, 
to 4.4 branch?

Thanks,
Alena.

Re: [ACS44]cherry pick CLOUDSTACK-6581

[Daan Hoogland]

On Wed, May 7, 2014 at 3:21 AM, Prachi Damle  wrote:
> eb28f77d1a07e902577a38194196b463ba5aef42




-- 
Daan

[ACS44] Cherry pick for CLOUDSTACK-6399

[Anshul Gangwar]

Hi Daan/Hugo,



Can you please cherry-pick following from 4.4-forward to 4.4:

commit 704f6d8279c314a165199804ee43eaac4b0d482a
Author: Anshul Gangwar 
Date:   Fri May 9 14:32:36 2014 +0530

CLOUDSTACK-6399: When there are no vms running on hyperv host, then agent 
was returning null. In
that case cloudstack was not doing anything and not updating the state of 
the vms to stopped.
Now the agent returns empty list of hostvmstatereport. Management server 
will then update the
vm state to stopped (instead of not acting upon the return state).

Thanks,
Anshul

[ACS44] Cherry pick for CLOUDSTACK-6399

[Nitin Mehta]

Hi Daan,


Can you please cherry-pick following from 4.4-forward to 4.4 ?


commit c12b28fc37b76fff6854f4f6bc068a634f1710bc
CLOUDSTACK-6633: listVolumes should return template/iso info for root
volumes




Thanks,
-Nitin

[ACS44] Cherry pick for CLOUDSTACK-6647

[Kelven Yang]

Hi Daan,

Please cherry pick the fix for CLOUDSTACK-6647 to 4.4.


commit 7e6390d3c845d9a0c918aa525b5cbfb2aa7fb3c5
Author: Kelven Yang 
Date:   Thu May 1 15:40:04 2014 -0700

CLOUDSTACK-6647: appending instance name with custom supplied info
that contains - character can break vmsync.


Thanks
Kelven

Re: [ACS44] cherry pick CLOUDSTACK-6606

[Daan Hoogland]

On Tue, May 13, 2014 at 12:43 AM, Jessica Wang  wrote:
> 0d7ddc4337568939f47de875f1a03f39b54e3b30




-- 
Daan

Re: [ACS44] cherry pick CLOUDSTACK-6379

[Daan Hoogland]

On Tue, May 13, 2014 at 12:41 AM, Jessica Wang  wrote:
> f4c726d7b842636e665ba4ca3616688e2b26192b




-- 
Daan

[ACS44] Cherry pick for CLOUDSTACK-6652

[Sateesh Chodapuneedi]

Hi Daan,
Please cherry-pick following commit to 4.4 branch.

commit 3af2abecb44b2ca2c53ac25ffe72cb13f2668158
Author: Sateesh Chodapuneedi 
Date:   Tue May 13 15:00:29 2014 +0530
CLOUDSTACK-6652 CLONE - [Automation] Vmware-  System's StartCommand failed with 
"NumberFormatException" while using VMware DVS
vlan id format was like "vlan://" instead of just "". This causes 
numberformatexception while converting the vlan id to integer form from string 
form. this was fixed for standard vswitch in bug Cloudstack-5046. now fixed for 
other 2 cases of dvswitch as well as pvlan.

Regards,
Sateesh

[ACS44] Cherry pick for CLOUDSTACK-6519

[Rajesh Battala]

Hi Daan,

Please cherry-pick to 4.4
260e06d64c07c6e5f3c133d8bdc2779fad62c672
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=260e06d

Thanks
Rajesh Battala

[ACS44] Cherry pick for CLOUDSTACK-6659

[Alena Prokharchyk]

Daan, can you please cherry pick the commit below:

commit 2334d9a1f3bd5ecc51cdeeff0512e95c93b7ead1
Author: Alena Prokharchyk 
Date:   Tue May 13 14:08:16 2014 -0700

CLOUDSTACK-6659: fixed the name for the updateIpAddress API command

Thanks,
Alena.

[ACS44] Cherry pick for CLOUDSTACK-6519

[Rajesh Battala]

Hi Daan,

Please cherry-pick to 4.4
260e06d64c07c6e5f3c133d8bdc2779fad62c672
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=260e06d

Thanks
Rajesh Battala

[ACS44] Cherry pick for CLOUDSTACK-6595

[Alena Prokharchyk]

Daan, can you please cherry-pick the commit to 4.4 branch:

commit b9284db857cd001e75926cb7c49b6aff4ab63695
Author: Alena Prokharchyk 
Date:   Wed May 7 13:44:26 2014 -0700

CLOUDSTACK-6595: call expunge method marked with @ActionEvent from expunge 
thread context. So the action even EXPUNGE.VM is generated when vm is expunged 
by the thread.

Thank you,
Alena.

[ACS44] Cherry pick for CLOUDSTACK-6241

[Sheng Yang]

Hi Daan,

Could you help to cherry pick the following commit to 4.4 branch?

commit d32f5c70d26ce82561bbdce962fd881a644ab81c
Author: Sheng Yang 
Date:   Fri Mar 14 13:36:43 2014 -0700

CLOUDSTACK-6241: Fix default route for IPv6 network when IPv4 not used
(cherry picked from commit e406adc0810b22ded0964080946f019be1337b52)

Thanks!

--Sheng

[ACS44] Cherry pick for CLOUDSTACK-6596

[Alena Prokharchyk]

Daan, can you please cherry-pick the commit below to 4.4 branch:

ommit 515fa261ba13d825864eb2d93ed33bb0d8c88328
Author: Alena Prokharchyk 
Date:   Wed May 7 15:16:47 2014 -0700

CLOUDSTACK-6596: UUID and display flag update support for 
LBStickinessPolicy and LBHealthCheckPolicy

Thank you,
Alena.

[ACS44] Cherry pick for CLOUDSTACK-6675

[Alena Prokharchyk]

Daan, can you please cherry-pick:

commit d91edcec560014f7a065e8f709c9321d87f18820
Author: Alena Prokharchyk 
Date:   Wed May 14 12:26:25 2014 -0700

CLOUDSTACK-6675: updatePFRule - retrieve network sync object based on the 
PF rule id that is passed in to the call; not the public ip address


Thank you!
Alena.

[ACS44] Cherry pick for CLOUDSTACK-6601

[Alena Prokharchyk]

Daan, can you please cherry-pick the request below:

commit cadefb1aeb2e1d973c9dcf38e7f793adc50599d6
Author: Alena Prokharchyk 
Date:   Wed May 7 16:57:10 2014 -0700

CLOUDSTACK-6601: added "forDisplay" parameter to listLoadBalancerRules API

Thank you!
-Alena.

[ACS44] Cherry pick for CLOUDSTACK-6575

[Saksham Srivastava]

Hi Daan/Hugo,



Can you please cherry-pick following to 4.4:



Commit hash:  84135cd302ab5fb944a28e73b394d02a8d1c17e2



CLOUDSTACK-6575: Deploy VM failed with NPE while using custom compute offering



Contained in branches: 4.4-forward, master



Thanks,

Saksham

Re: [ACS44]Cherry-pick CLOUDSTACK-6476

[Daan Hoogland]

Prachi,

It seems to me that this is only a refactor/rename of a function. What
has functionally changed/am I missing?

regards,
Daan (all for the refactor but it doesn't pertain to the comment of the commit)

On Sat, May 17, 2014 at 2:21 AM, Prachi Damle  wrote:
> Hi Daan,
>
>
>
> Can you please cherry-pick the following commit  to 4.4:
>
>
>
> Commit 3448ab7f1c5c15949855788b029028ddac01327b
>
> CLOUDSTACK-6476 Basic Zone with Multiple Pods Setup: DHCP server doesnt get
> deployed in the pod where the VM gets deployed
>
> Thanks
>
> Prachi



-- 
Daan

Re: [ACS44]Cherry-pick CLOUDSTACK-6476

[Daan Hoogland]

Sorry Prachi, I didn't read though the whole of the message, it being
longer then the code change. It is pulled.

On Sat, May 17, 2014 at 11:02 AM, Daan Hoogland  wrote:
> Prachi,
>
> It seems to me that this is only a refactor/rename of a function. What
> has functionally changed/am I missing?
>
> regards,
> Daan (all for the refactor but it doesn't pertain to the comment of the 
> commit)
>
> On Sat, May 17, 2014 at 2:21 AM, Prachi Damle  wrote:
>> Hi Daan,
>>
>>
>>
>> Can you please cherry-pick the following commit  to 4.4:
>>
>>
>>
>> Commit 3448ab7f1c5c15949855788b029028ddac01327b
>>
>> CLOUDSTACK-6476 Basic Zone with Multiple Pods Setup: DHCP server doesnt get
>> deployed in the pod where the VM gets deployed
>>
>> Thanks
>>
>> Prachi
>
>
>
> --
> Daan



-- 
Daan

Re: [ACS44]Cherry-pick CLOUDSTACK-6476

[Prachi Damle]

Thanks Daan.

-Prachi

> On May 17, 2014, at 2:25 AM, "Daan Hoogland"  wrote:
> 
> Sorry Prachi, I didn't read though the whole of the message, it being
> longer then the code change. It is pulled.
> 
>> On Sat, May 17, 2014 at 11:02 AM, Daan Hoogland  
>> wrote:
>> Prachi,
>> 
>> It seems to me that this is only a refactor/rename of a function. What
>> has functionally changed/am I missing?
>> 
>> regards,
>> Daan (all for the refactor but it doesn't pertain to the comment of the 
>> commit)
>> 
>>> On Sat, May 17, 2014 at 2:21 AM, Prachi Damle  
>>> wrote:
>>> Hi Daan,
>>> 
>>> 
>>> 
>>> Can you please cherry-pick the following commit  to 4.4:
>>> 
>>> 
>>> 
>>> Commit 3448ab7f1c5c15949855788b029028ddac01327b
>>> 
>>> CLOUDSTACK-6476 Basic Zone with Multiple Pods Setup: DHCP server doesnt get
>>> deployed in the pod where the VM gets deployed
>>> 
>>> Thanks
>>> 
>>> Prachi
>> 
>> 
>> 
>> --
>> Daan
> 
> 
> 
> -- 
> Daan