[ACS44] merge of forward branch

2014-07-28 Thread Daan Hoogland
H,

I tried merging 4.4-forward back into 4.4. This leaves us with a grand
big conflict. I have calculated that the number of not cherry-picked
not reverted commits is 185. I will start cherry-picking them at
moments $dayjob allows. and then send a mail again.

don't forget to read up on the proces git-flow is based upon. We will
need to start working with a branch-merge per fix instead cherry-picks
in the very near future.

kind regards,
-- 
Daan


Re: Review Request 23805: Added "state" parameter to the "listPublicIpAddresses" API call

2014-07-28 Thread Ilia Shakitko

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23805/
---

(Updated July 28, 2014, 10:11 a.m.)


Review request for cloudstack, Alena Prokharchyk, Alex Huang, Harikrishna 
Patnala, Kishan Kavala, Prachi Damle, Rohit Yadav, Ilia Shakitko, and Wei Zhou.


Bugs: CLOUDSTACK-7159
https://issues.apache.org/jira/browse/CLOUDSTACK-7159


Repository: cloudstack-git


Description
---

This improvement is introducing a new parameter for the "listPublicIpAddresses" 
API call - "state".

Few times we've faced an impedemence of having a list of "Free" 
publicIpAddresses. You have to go thru all the IPs with (allocatedonly = false) 
and filter out the "Free" once. It's not a big deal, but it's an extra time and 
traffic between CloudStack and an API consumer.

I also moved few methods out of the 'API Implementation' and put them above as 
a minor refactoring.
Method "getForLoadBalancing" has been removed because it's not being used in 
code anywhere else.

This patch is done for "master" branch.


Diffs
-

  
api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
 07ccfe9 
  server/src/com/cloud/server/ManagementServerImpl.java 99b12732 

Diff: https://reviews.apache.org/r/23805/diff/


Testing
---

1) Build successfull
2) No tests broken
3) Tested few different calls with cloudmonkey:

list publicipaddresses forvirtualnetwork=false listall=true page=1 pagesize=0
count = 10

list publicipaddresses forvirtualnetwork=false listall=true allocatedonly=false 
page=1 pagesize=0
count = 100

list publicipaddresses forvirtualnetwork=false listall=true state=free page=1 
pagesize=0
count = 90


Thanks,

Ilia Shakitko



Re: Review Request 23805: Added "state" parameter to the "listPublicIpAddresses" API call

2014-07-28 Thread Ilia Shakitko

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23805/
---

(Updated July 28, 2014, 10:12 a.m.)


Review request for cloudstack, Alena Prokharchyk, Alex Huang, Harikrishna 
Patnala, Kishan Kavala, Prachi Damle, Rohit Yadav, Ilia Shakitko, Wei Zhou, and 
Wido den Hollander.


Bugs: CLOUDSTACK-7159
https://issues.apache.org/jira/browse/CLOUDSTACK-7159


Repository: cloudstack-git


Description
---

This improvement is introducing a new parameter for the "listPublicIpAddresses" 
API call - "state".

Few times we've faced an impedemence of having a list of "Free" 
publicIpAddresses. You have to go thru all the IPs with (allocatedonly = false) 
and filter out the "Free" once. It's not a big deal, but it's an extra time and 
traffic between CloudStack and an API consumer.

I also moved few methods out of the 'API Implementation' and put them above as 
a minor refactoring.
Method "getForLoadBalancing" has been removed because it's not being used in 
code anywhere else.

This patch is done for "master" branch.


Diffs
-

  
api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
 07ccfe9 
  server/src/com/cloud/server/ManagementServerImpl.java 99b12732 

Diff: https://reviews.apache.org/r/23805/diff/


Testing
---

1) Build successfull
2) No tests broken
3) Tested few different calls with cloudmonkey:

list publicipaddresses forvirtualnetwork=false listall=true page=1 pagesize=0
count = 10

list publicipaddresses forvirtualnetwork=false listall=true allocatedonly=false 
page=1 pagesize=0
count = 100

list publicipaddresses forvirtualnetwork=false listall=true state=free page=1 
pagesize=0
count = 90


Thanks,

Ilia Shakitko



Review Request 23976: CLOUDSTACK-7190: Fix Hyper-V issue when attempting SSH to System VMs

2014-07-28 Thread John Dilley

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23976/
---

Review request for cloudstack and Santhosh Edukulla.


Bugs: CLOUDSTACK-7190
https://issues.apache.org/jira/browse/CLOUDSTACK-7190


Repository: cloudstack-git


Description
---

Hyper-V system VMs need to be accessed in the same way as VMWare system VMs - 
i.e. via the management server to the private IP rather than via the hypervisor 
host to the link-local IP. This patch makes Hyper-V and VMWare behave in the 
same way.


Diffs
-

  test/integration/component/maint/test_redundant_router.py 66bb477 
  test/integration/component/test_VirtualRouter_alerts.py e6f0a82 
  test/integration/component/test_deploy_vm_userdata_reg.py 1c9f35c 
  test/integration/component/test_persistent_networks.py b90d621 
  test/integration/smoke/test_routers.py f77d11a 
  test/integration/smoke/test_ssvm.py 9b8d19d 

Diff: https://reviews.apache.org/r/23976/diff/


Testing
---


Thanks,

John Dilley



Re: Review Request 23976: CLOUDSTACK-7190: Fix Hyper-V issue when attempting SSH to System VMs

2014-07-28 Thread sanjeev n

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23976/#review48837
---

Ship it!


Ship It!

- sanjeev n


On July 28, 2014, 10:34 a.m., John Dilley wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23976/
> ---
> 
> (Updated July 28, 2014, 10:34 a.m.)
> 
> 
> Review request for cloudstack and Santhosh Edukulla.
> 
> 
> Bugs: CLOUDSTACK-7190
> https://issues.apache.org/jira/browse/CLOUDSTACK-7190
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> Hyper-V system VMs need to be accessed in the same way as VMWare system VMs - 
> i.e. via the management server to the private IP rather than via the 
> hypervisor host to the link-local IP. This patch makes Hyper-V and VMWare 
> behave in the same way.
> 
> 
> Diffs
> -
> 
>   test/integration/component/maint/test_redundant_router.py 66bb477 
>   test/integration/component/test_VirtualRouter_alerts.py e6f0a82 
>   test/integration/component/test_deploy_vm_userdata_reg.py 1c9f35c 
>   test/integration/component/test_persistent_networks.py b90d621 
>   test/integration/smoke/test_routers.py f77d11a 
>   test/integration/smoke/test_ssvm.py 9b8d19d 
> 
> Diff: https://reviews.apache.org/r/23976/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> John Dilley
> 
>



[DISCUSS] git commit proces

2014-07-28 Thread Daan Hoogland
H,

I see a lot of commits happening directly on the master branch. Yet
there were no counter arguments against the proposed gitflow and the
discussion around it. This leaves me with the idea that the thread is
largely ignored by the community. It is my understanding that we
agreed never to commit anything to master anymore that hasn't been
first committed to a branch and is merged back to master (instead of
cherry-picked). What mistake in thinking am I making here?

thanks,
-- 
Daan


Re: Review Request 23976: CLOUDSTACK-7190: Fix Hyper-V issue when attempting SSH to System VMs

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23976/#review48839
---


Commit 57ee142dede5be035a4501dcfb0816c9bfb8ddaa in cloudstack's branch 
refs/heads/master from John Dilley
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=57ee142 ]

CLOUDSTACK-7190: Fix Hyper-V issue when attempting SSH to System VMs


- ASF Subversion and Git Services


On July 28, 2014, 10:34 a.m., John Dilley wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23976/
> ---
> 
> (Updated July 28, 2014, 10:34 a.m.)
> 
> 
> Review request for cloudstack and Santhosh Edukulla.
> 
> 
> Bugs: CLOUDSTACK-7190
> https://issues.apache.org/jira/browse/CLOUDSTACK-7190
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> Hyper-V system VMs need to be accessed in the same way as VMWare system VMs - 
> i.e. via the management server to the private IP rather than via the 
> hypervisor host to the link-local IP. This patch makes Hyper-V and VMWare 
> behave in the same way.
> 
> 
> Diffs
> -
> 
>   test/integration/component/maint/test_redundant_router.py 66bb477 
>   test/integration/component/test_VirtualRouter_alerts.py e6f0a82 
>   test/integration/component/test_deploy_vm_userdata_reg.py 1c9f35c 
>   test/integration/component/test_persistent_networks.py b90d621 
>   test/integration/smoke/test_routers.py f77d11a 
>   test/integration/smoke/test_ssvm.py 9b8d19d 
> 
> Diff: https://reviews.apache.org/r/23976/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> John Dilley
> 
>



Re: Error while installing Virtualbox

2014-07-28 Thread Ian Duffy
Please see virtualbox forums for support with this.

https://forums.virtualbox.org/viewtopic.php?f=6&t=62615&start=75


On 28 July 2014 04:48, Priyanka Deepala 
wrote:

> Hello
>I'm trying to install virtualbox in windows7 but while running the
> virtualbox it is displaying a error as
> Fialed to install NtCreateSection monitor:e9 bb ff 9a 88 000 f 5 c 3 f 1 f
> 4 4 0 0(rc= -8)
> Could someone please help out regarding this issue?
>


Re: [DISCUSS] git commit proces

2014-07-28 Thread Erik Weber
On Mon, Jul 28, 2014 at 1:22 PM, Daan Hoogland 
wrote:

> H,
>
> I see a lot of commits happening directly on the master branch. Yet
> there were no counter arguments against the proposed gitflow and the
> discussion around it. This leaves me with the idea that the thread is
> largely ignored by the community. It is my understanding that we
> agreed never to commit anything to master anymore that hasn't been
> first committed to a branch and is merged back to master (instead of
> cherry-picked). What mistake in thinking am I making here?
>
>

Not familiar with bylaws and the such, but wouldn't a change like this
require some sort of voting and potentially a more formal information?

Requiring everyone to read through a 50+ replies mail thread and comprehend
it could be a bit much.

I would suggest an updated document that explain the expected workflow.

-- 
Erik


Re: Marvin Package?

2014-07-28 Thread Ian Duffy
> I believe no, atleast the latest changes under master or 4.4-forward.

Alright, Thanks. I believe all changes for it within 4.4-forward should now
be in 4.4?

@Prasanna since you hold the account on pypi holding the name
"cloudstack-marvin" can you make the upload?
Tar at: http://jenkins.buildacloud.org/view/4.4/job/cloudstack-4.4-marvin/

Thanks,

Ian


On 28 July 2014 01:52, Santhosh Edukulla 
wrote:

> I believe no, atleast the latest changes under master or 4.4-forward.
>
> Santhosh
> 
> From: Ian Duffy [i...@ianduffy.ie]
> Sent: Sunday, July 27, 2014 4:47 PM
> To: CloudStack Dev; Santhosh Edukulla; Prasanna Santhanam
> Subject: Marvin Package?
>
> Hi,
>
> Do we have a binary of marvin that users can download independent to the
> management server rpms? Other than grabbing the tar.gz from jenkins.
>
> I was hoping it would be published on pypi. Prasanna seems to have a page
> for it there but there are no uploads:
> https://pypi.python.org/pypi/cloudstack-marvin/0.1.0
>
> Ideally I want pip install cloudstack-marvin or easy_install
> cloudstack-marvin.
>
> Thanks,
>
> Ian
>


Re: [DISCUSS] git commit proces

2014-07-28 Thread Ian Duffy
+1 to what Erik said.


On 28 July 2014 13:04, Erik Weber  wrote:

> On Mon, Jul 28, 2014 at 1:22 PM, Daan Hoogland 
> wrote:
>
> > H,
> >
> > I see a lot of commits happening directly on the master branch. Yet
> > there were no counter arguments against the proposed gitflow and the
> > discussion around it. This leaves me with the idea that the thread is
> > largely ignored by the community. It is my understanding that we
> > agreed never to commit anything to master anymore that hasn't been
> > first committed to a branch and is merged back to master (instead of
> > cherry-picked). What mistake in thinking am I making here?
> >
> >
>
> Not familiar with bylaws and the such, but wouldn't a change like this
> require some sort of voting and potentially a more formal information?
>
> Requiring everyone to read through a 50+ replies mail thread and comprehend
> it could be a bit much.
>
> I would suggest an updated document that explain the expected workflow.
>
> --
> Erik
>


Re: Marvin Package?

2014-07-28 Thread Daan Hoogland
Don't be to sure Ian,

There is about 180 changes in 4.4-forward that did not go in 4.4 yet

On Mon, Jul 28, 2014 at 2:05 PM, Ian Duffy  wrote:
>> I believe no, atleast the latest changes under master or 4.4-forward.
>
> Alright, Thanks. I believe all changes for it within 4.4-forward should now
> be in 4.4?
>
> @Prasanna since you hold the account on pypi holding the name
> "cloudstack-marvin" can you make the upload?
> Tar at: http://jenkins.buildacloud.org/view/4.4/job/cloudstack-4.4-marvin/
>
> Thanks,
>
> Ian
>
>
> On 28 July 2014 01:52, Santhosh Edukulla 
> wrote:
>
>> I believe no, atleast the latest changes under master or 4.4-forward.
>>
>> Santhosh
>> 
>> From: Ian Duffy [i...@ianduffy.ie]
>> Sent: Sunday, July 27, 2014 4:47 PM
>> To: CloudStack Dev; Santhosh Edukulla; Prasanna Santhanam
>> Subject: Marvin Package?
>>
>> Hi,
>>
>> Do we have a binary of marvin that users can download independent to the
>> management server rpms? Other than grabbing the tar.gz from jenkins.
>>
>> I was hoping it would be published on pypi. Prasanna seems to have a page
>> for it there but there are no uploads:
>> https://pypi.python.org/pypi/cloudstack-marvin/0.1.0
>>
>> Ideally I want pip install cloudstack-marvin or easy_install
>> cloudstack-marvin.
>>
>> Thanks,
>>
>> Ian
>>



-- 
Daan


Re: Marvin Package?

2014-07-28 Thread David Nalley
I wonder if we need to move this to its own release as we did with cloudmonkey?

--David

On Mon, Jul 28, 2014 at 8:05 AM, Ian Duffy  wrote:
>> I believe no, atleast the latest changes under master or 4.4-forward.
>
> Alright, Thanks. I believe all changes for it within 4.4-forward should now
> be in 4.4?
>
> @Prasanna since you hold the account on pypi holding the name
> "cloudstack-marvin" can you make the upload?
> Tar at: http://jenkins.buildacloud.org/view/4.4/job/cloudstack-4.4-marvin/
>
> Thanks,
>
> Ian
>
>
> On 28 July 2014 01:52, Santhosh Edukulla 
> wrote:
>
>> I believe no, atleast the latest changes under master or 4.4-forward.
>>
>> Santhosh
>> 
>> From: Ian Duffy [i...@ianduffy.ie]
>> Sent: Sunday, July 27, 2014 4:47 PM
>> To: CloudStack Dev; Santhosh Edukulla; Prasanna Santhanam
>> Subject: Marvin Package?
>>
>> Hi,
>>
>> Do we have a binary of marvin that users can download independent to the
>> management server rpms? Other than grabbing the tar.gz from jenkins.
>>
>> I was hoping it would be published on pypi. Prasanna seems to have a page
>> for it there but there are no uploads:
>> https://pypi.python.org/pypi/cloudstack-marvin/0.1.0
>>
>> Ideally I want pip install cloudstack-marvin or easy_install
>> cloudstack-marvin.
>>
>> Thanks,
>>
>> Ian
>>


Re: Marvin Package?

2014-07-28 Thread Rohit Yadav

Hi,

I think since the Marvin package tightly depends on CloudStack, it's
release can happen along with CloudStack release.

@Prasanna -- Can you add couple of people as owner/admins to the
cloudstack-marvin pypi package?

Regards.

David Nalley wrote:

I wonder if we need to move this to its own release as we did with cloudmonkey?

--David

On Mon, Jul 28, 2014 at 8:05 AM, Ian Duffy  wrote:

I believe no, atleast the latest changes under master or 4.4-forward.

Alright, Thanks. I believe all changes for it within 4.4-forward should now
be in 4.4?

@Prasanna since you hold the account on pypi holding the name
"cloudstack-marvin" can you make the upload?
Tar at: http://jenkins.buildacloud.org/view/4.4/job/cloudstack-4.4-marvin/

Thanks,

Ian


On 28 July 2014 01:52, Santhosh Edukulla
wrote:


I believe no, atleast the latest changes under master or 4.4-forward.

Santhosh

From: Ian Duffy [i...@ianduffy.ie]
Sent: Sunday, July 27, 2014 4:47 PM
To: CloudStack Dev; Santhosh Edukulla; Prasanna Santhanam
Subject: Marvin Package?

Hi,

Do we have a binary of marvin that users can download independent to the
management server rpms? Other than grabbing the tar.gz from jenkins.

I was hoping it would be published on pypi. Prasanna seems to have a page
for it there but there are no uploads:
https://pypi.python.org/pypi/cloudstack-marvin/0.1.0

Ideally I want pip install cloudstack-marvin or easy_install
cloudstack-marvin.

Thanks,

Ian



--
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.ya...@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab


Find out more about ShapeBlue and our range of CloudStack related services

IaaS Cloud Design & Build
CSForge – rapid IaaS deployment framework
CloudStack Consulting
CloudStack Infrastructure 
Support
CloudStack Bootcamp Training Courses

This email and any attachments to it may be confidential and are intended solely 
for the use of the individual to whom it is addressed. Any views or opinions 
expressed are solely those of the author and do not necessarily represent those of 
Shape Blue Ltd or related companies. If you are not the intended recipient of this 
email, you must neither take any action based upon its contents, nor copy or show 
it to anyone. Please contact the sender if you believe you have received this email 
in error. Shape Blue Ltd is a company incorporated in England & Wales. 
ShapeBlue Services India LLP is a company incorporated in India and is operated 
under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company 
incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue 
SA Pty Ltd is a company registered by The Republic of South Africa and is traded 
under license from Shape Blue Ltd. ShapeBlue is a registered trademark.


Re: Marvin Package?

2014-07-28 Thread Hugo Trippaers
Before we start with Marvin releases we should discuss versioning i think.

At the moment all marvin packages are shipped with version 1.0, if we want to 
take marvin releases serious we need to start with versions whenever the 
something in marvin changes.


Cheers.

Hugo


On 28 jul. 2014, at 14:20, Rohit Yadav  wrote:

> Hi,
> 
> I think since the Marvin package tightly depends on CloudStack, it's
> release can happen along with CloudStack release.
> 
> @Prasanna -- Can you add couple of people as owner/admins to the
> cloudstack-marvin pypi package?
> 
> Regards.
> 
> David Nalley wrote:
>> I wonder if we need to move this to its own release as we did with 
>> cloudmonkey?
>> 
>> --David
>> 
>> On Mon, Jul 28, 2014 at 8:05 AM, Ian Duffy  wrote:
 I believe no, atleast the latest changes under master or 4.4-forward.
>>> Alright, Thanks. I believe all changes for it within 4.4-forward should now
>>> be in 4.4?
>>> 
>>> @Prasanna since you hold the account on pypi holding the name
>>> "cloudstack-marvin" can you make the upload?
>>> Tar at: http://jenkins.buildacloud.org/view/4.4/job/cloudstack-4.4-marvin/
>>> 
>>> Thanks,
>>> 
>>> Ian
>>> 
>>> 
>>> On 28 July 2014 01:52, Santhosh Edukulla
>>> wrote:
>>> 
 I believe no, atleast the latest changes under master or 4.4-forward.
 
 Santhosh
 
 From: Ian Duffy [i...@ianduffy.ie]
 Sent: Sunday, July 27, 2014 4:47 PM
 To: CloudStack Dev; Santhosh Edukulla; Prasanna Santhanam
 Subject: Marvin Package?
 
 Hi,
 
 Do we have a binary of marvin that users can download independent to the
 management server rpms? Other than grabbing the tar.gz from jenkins.
 
 I was hoping it would be published on pypi. Prasanna seems to have a page
 for it there but there are no uploads:
 https://pypi.python.org/pypi/cloudstack-marvin/0.1.0
 
 Ideally I want pip install cloudstack-marvin or easy_install
 cloudstack-marvin.
 
 Thanks,
 
 Ian
 
> 
> --
> Rohit Yadav
> Software Architect, ShapeBlue
> M. +41 779015219 | rohit.ya...@shapeblue.com
> Blog: bhaisaab.org | Twitter: @_bhaisaab
> 
> 
> Find out more about ShapeBlue and our range of CloudStack related services
> 
> IaaS Cloud Design & Build
> CSForge – rapid IaaS deployment framework
> CloudStack Consulting
> CloudStack Infrastructure 
> Support
> CloudStack Bootcamp Training 
> Courses
> 
> This email and any attachments to it may be confidential and are intended 
> solely for the use of the individual to whom it is addressed. Any views or 
> opinions expressed are solely those of the author and do not necessarily 
> represent those of Shape Blue Ltd or related companies. If you are not the 
> intended recipient of this email, you must neither take any action based upon 
> its contents, nor copy or show it to anyone. Please contact the sender if you 
> believe you have received this email in error. Shape Blue Ltd is a company 
> incorporated in England & Wales. ShapeBlue Services India LLP is a company 
> incorporated in India and is operated under license from Shape Blue Ltd. 
> Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is 
> operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company 
> registered by The Republic of South Africa and is traded under license from 
> Shape Blue Ltd. ShapeBlue is a registered trademark.



Re: [DISCUSS] git commit proces

2014-07-28 Thread Hugo Trippaers
Agreed,  this kind of important decisions should be made by a vote.

Sebastien, Daan, can one of you kick of the vote thread? Preferably with a 
condensed summary of the thread?

Cheers,

Hugo


On 28 jul. 2014, at 14:07, Ian Duffy  wrote:

> +1 to what Erik said.
> 
> 
> On 28 July 2014 13:04, Erik Weber  wrote:
> 
>> On Mon, Jul 28, 2014 at 1:22 PM, Daan Hoogland 
>> wrote:
>> 
>>> H,
>>> 
>>> I see a lot of commits happening directly on the master branch. Yet
>>> there were no counter arguments against the proposed gitflow and the
>>> discussion around it. This leaves me with the idea that the thread is
>>> largely ignored by the community. It is my understanding that we
>>> agreed never to commit anything to master anymore that hasn't been
>>> first committed to a branch and is merged back to master (instead of
>>> cherry-picked). What mistake in thinking am I making here?
>>> 
>>> 
>> 
>> Not familiar with bylaws and the such, but wouldn't a change like this
>> require some sort of voting and potentially a more formal information?
>> 
>> Requiring everyone to read through a 50+ replies mail thread and comprehend
>> it could be a bit much.
>> 
>> I would suggest an updated document that explain the expected workflow.
>> 
>> --
>> Erik
>> 



Re: Marvin Package?

2014-07-28 Thread Rohit Yadav

Hi Hugo,

Does it make sense to simply use the same version as CloudStack from
next Marvin releases? This is because with each CloudStack release and
possible API changes, the Marvin cloudstackAPI python module will
change. Other than that there are couple of API marshaling/unmarshaling,
signature logic and HTTP stuff but that too changes with CloudStack.

Regards.

Hugo Trippaers wrote:

Before we start with Marvin releases we should discuss versioning i think.

At the moment all marvin packages are shipped with version 1.0, if we want to 
take marvin releases serious we need to start with versions whenever the 
something in marvin changes.


Cheers.

Hugo


On 28 jul. 2014, at 14:20, Rohit Yadav  wrote:


Hi,

I think since the Marvin package tightly depends on CloudStack, it's
release can happen along with CloudStack release.

@Prasanna -- Can you add couple of people as owner/admins to the
cloudstack-marvin pypi package?

Regards.

David Nalley wrote:

I wonder if we need to move this to its own release as we did with cloudmonkey?

--David

On Mon, Jul 28, 2014 at 8:05 AM, Ian Duffy   wrote:

I believe no, atleast the latest changes under master or 4.4-forward.

Alright, Thanks. I believe all changes for it within 4.4-forward should now
be in 4.4?

@Prasanna since you hold the account on pypi holding the name
"cloudstack-marvin" can you make the upload?
Tar at: http://jenkins.buildacloud.org/view/4.4/job/cloudstack-4.4-marvin/

Thanks,

Ian


On 28 July 2014 01:52, Santhosh Edukulla
wrote:


I believe no, atleast the latest changes under master or 4.4-forward.

Santhosh

From: Ian Duffy [i...@ianduffy.ie]
Sent: Sunday, July 27, 2014 4:47 PM
To: CloudStack Dev; Santhosh Edukulla; Prasanna Santhanam
Subject: Marvin Package?

Hi,

Do we have a binary of marvin that users can download independent to the
management server rpms? Other than grabbing the tar.gz from jenkins.

I was hoping it would be published on pypi. Prasanna seems to have a page
for it there but there are no uploads:
https://pypi.python.org/pypi/cloudstack-marvin/0.1.0

Ideally I want pip install cloudstack-marvin or easy_install
cloudstack-marvin.

Thanks,

Ian


--
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.ya...@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab


Find out more about ShapeBlue and our range of CloudStack related services

IaaS Cloud Design&  Build
CSForge – rapid IaaS deployment framework
CloudStack Consulting
CloudStack Infrastructure 
Support
CloudStack Bootcamp Training Courses

This email and any attachments to it may be confidential and are intended solely 
for the use of the individual to whom it is addressed. Any views or opinions 
expressed are solely those of the author and do not necessarily represent those of 
Shape Blue Ltd or related companies. If you are not the intended recipient of this 
email, you must neither take any action based upon its contents, nor copy or show 
it to anyone. Please contact the sender if you believe you have received this email 
in error. Shape Blue Ltd is a company incorporated in England&  Wales. 
ShapeBlue Services India LLP is a company incorporated in India and is operated 
under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company 
incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue 
SA Pty Ltd is a company registered by The Republic of South Africa and is traded 
under license from Shape Blue Ltd. ShapeBlue is a registered trademark.




--
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.ya...@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab


Find out more about ShapeBlue and our range of CloudStack related services

IaaS Cloud Design & Build
CSForge – rapid IaaS deployment framework
CloudStack Consulting
CloudStack Infrastructure 
Support
CloudStack Bootcamp Training Courses

This email and any attachments to it may be confidential and are intended solely 
for the use of the individual to whom it is addressed. Any views or opinions 
expressed are solely those of the author and do not necessarily represent those of 
Shape Blue Ltd or related companies. If you are not the intended recipient of this 
email, you must neither take any action based upon its contents, nor copy or show 
it to anyone. Please contact the sender if you believe you have received this email 
in error. Shape Blue Ltd is a company incorporated in England & Wales. 
ShapeBlue Services India LLP is a company in

Re: Review Request 23805: Added "state" parameter to the "listPublicIpAddresses" API call

2014-07-28 Thread Rohit Yadav

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23805/#review48842
---


Looks good, let me get my office lab to work and then I can test. Meanwhile if 
others may want to test it?

Pardon my ignorance but does this change involve any db table/column change 
since I see state filter added in publicIpAddressDao?


api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java


I guess moving it above was a cosmetic change. Please fix that you don't 
remove/change anything in the move refactor.



api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java


I guess the move refactor was a cosmetic change, but it removed 
getAllocatedOnly() method. Please fix it, or explain why we need to remove it?



api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java


This was removed.


- Rohit Yadav


On July 28, 2014, 10:12 a.m., Ilia Shakitko wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23805/
> ---
> 
> (Updated July 28, 2014, 10:12 a.m.)
> 
> 
> Review request for cloudstack, Alena Prokharchyk, Alex Huang, Harikrishna 
> Patnala, Kishan Kavala, Prachi Damle, Rohit Yadav, Ilia Shakitko, Wei Zhou, 
> and Wido den Hollander.
> 
> 
> Bugs: CLOUDSTACK-7159
> https://issues.apache.org/jira/browse/CLOUDSTACK-7159
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> This improvement is introducing a new parameter for the 
> "listPublicIpAddresses" API call - "state".
> 
> Few times we've faced an impedemence of having a list of "Free" 
> publicIpAddresses. You have to go thru all the IPs with (allocatedonly = 
> false) and filter out the "Free" once. It's not a big deal, but it's an extra 
> time and traffic between CloudStack and an API consumer.
> 
> I also moved few methods out of the 'API Implementation' and put them above 
> as a minor refactoring.
> Method "getForLoadBalancing" has been removed because it's not being used in 
> code anywhere else.
> 
> This patch is done for "master" branch.
> 
> 
> Diffs
> -
> 
>   
> api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
>  07ccfe9 
>   server/src/com/cloud/server/ManagementServerImpl.java 99b12732 
> 
> Diff: https://reviews.apache.org/r/23805/diff/
> 
> 
> Testing
> ---
> 
> 1) Build successfull
> 2) No tests broken
> 3) Tested few different calls with cloudmonkey:
> 
> list publicipaddresses forvirtualnetwork=false listall=true page=1 pagesize=0
> count = 10
> 
> list publicipaddresses forvirtualnetwork=false listall=true 
> allocatedonly=false page=1 pagesize=0
> count = 100
> 
> list publicipaddresses forvirtualnetwork=false listall=true state=free page=1 
> pagesize=0
> count = 90
> 
> 
> Thanks,
> 
> Ilia Shakitko
> 
>



RE: Marvin Package?

2014-07-28 Thread Sudha Ponnaganti
+1 to use same version number for Marvin package as Cloudstack release.

-Original Message-
From: Rohit Yadav [mailto:rohit.ya...@shapeblue.com] 
Sent: Monday, July 28, 2014 5:34 AM
To: dev@cloudstack.apache.org
Cc: Prasanna Santhanam
Subject: Re: Marvin Package?

Hi Hugo,

Does it make sense to simply use the same version as CloudStack from next 
Marvin releases? This is because with each CloudStack release and possible API 
changes, the Marvin cloudstackAPI python module will change. Other than that 
there are couple of API marshaling/unmarshaling, signature logic and HTTP stuff 
but that too changes with CloudStack.

Regards.

Hugo Trippaers wrote:
> Before we start with Marvin releases we should discuss versioning i think.
>
> At the moment all marvin packages are shipped with version 1.0, if we want to 
> take marvin releases serious we need to start with versions whenever the 
> something in marvin changes.
>
>
> Cheers.
>
> Hugo
>
>
> On 28 jul. 2014, at 14:20, Rohit Yadav  wrote:
>
>> Hi,
>>
>> I think since the Marvin package tightly depends on CloudStack, it's 
>> release can happen along with CloudStack release.
>>
>> @Prasanna -- Can you add couple of people as owner/admins to the 
>> cloudstack-marvin pypi package?
>>
>> Regards.
>>
>> David Nalley wrote:
>>> I wonder if we need to move this to its own release as we did with 
>>> cloudmonkey?
>>>
>>> --David
>>>
>>> On Mon, Jul 28, 2014 at 8:05 AM, Ian Duffy   wrote:
> I believe no, atleast the latest changes under master or 4.4-forward.
 Alright, Thanks. I believe all changes for it within 4.4-forward 
 should now be in 4.4?

 @Prasanna since you hold the account on pypi holding the name 
 "cloudstack-marvin" can you make the upload?
 Tar at: 
 http://jenkins.buildacloud.org/view/4.4/job/cloudstack-4.4-marvin/

 Thanks,

 Ian


 On 28 July 2014 01:52, Santhosh 
 Edukulla
 wrote:

> I believe no, atleast the latest changes under master or 4.4-forward.
>
> Santhosh
> 
> From: Ian Duffy [i...@ianduffy.ie]
> Sent: Sunday, July 27, 2014 4:47 PM
> To: CloudStack Dev; Santhosh Edukulla; Prasanna Santhanam
> Subject: Marvin Package?
>
> Hi,
>
> Do we have a binary of marvin that users can download independent 
> to the management server rpms? Other than grabbing the tar.gz from 
> jenkins.
>
> I was hoping it would be published on pypi. Prasanna seems to have 
> a page for it there but there are no uploads:
> https://pypi.python.org/pypi/cloudstack-marvin/0.1.0
>
> Ideally I want pip install cloudstack-marvin or easy_install 
> cloudstack-marvin.
>
> Thanks,
>
> Ian
>
>> --
>> Rohit Yadav
>> Software Architect, ShapeBlue
>> M. +41 779015219 | rohit.ya...@shapeblue.com
>> Blog: bhaisaab.org | Twitter: @_bhaisaab
>>
>>
>> Find out more about ShapeBlue and our range of CloudStack related 
>> services
>>
>> IaaS Cloud Design&  
>> Build
>> CSForge – rapid IaaS deployment 
>> framework
>> CloudStack Consulting
>> CloudStack Infrastructure 
>> Support
>> CloudStack Bootcamp Training 
>> Courses
>>
>> This email and any attachments to it may be confidential and are intended 
>> solely for the use of the individual to whom it is addressed. Any views or 
>> opinions expressed are solely those of the author and do not necessarily 
>> represent those of Shape Blue Ltd or related companies. If you are not the 
>> intended recipient of this email, you must neither take any action based 
>> upon its contents, nor copy or show it to anyone. Please contact the sender 
>> if you believe you have received this email in error. Shape Blue Ltd is a 
>> company incorporated in England&  Wales. ShapeBlue Services India LLP is a 
>> company incorporated in India and is operated under license from Shape Blue 
>> Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil 
>> and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a 
>> company registered by The Republic of South Africa and is traded under 
>> license from Shape Blue Ltd. ShapeBlue is a registered trademark.
>

--
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.ya...@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab


Find out more about ShapeBlue and our range of CloudStack related services

IaaS Cloud Design & Build
CSForge – rapid IaaS deployment framework
CloudStack Consulting
CloudStack Infrastructure 
Support
CloudStac

Re: Marvin Package?

2014-07-28 Thread Hugo Trippaers

Sounds good to me.

Cheers,

Hugo

On 28 jul. 2014, at 14:33, Rohit Yadav  wrote:

> Hi Hugo,
> 
> Does it make sense to simply use the same version as CloudStack from
> next Marvin releases? This is because with each CloudStack release and
> possible API changes, the Marvin cloudstackAPI python module will
> change. Other than that there are couple of API marshaling/unmarshaling,
> signature logic and HTTP stuff but that too changes with CloudStack.
> 
> Regards.
> 
> Hugo Trippaers wrote:
>> Before we start with Marvin releases we should discuss versioning i think.
>> 
>> At the moment all marvin packages are shipped with version 1.0, if we want 
>> to take marvin releases serious we need to start with versions whenever the 
>> something in marvin changes.
>> 
>> 
>> Cheers.
>> 
>> Hugo
>> 
>> 
>> On 28 jul. 2014, at 14:20, Rohit Yadav  wrote:
>> 
>>> Hi,
>>> 
>>> I think since the Marvin package tightly depends on CloudStack, it's
>>> release can happen along with CloudStack release.
>>> 
>>> @Prasanna -- Can you add couple of people as owner/admins to the
>>> cloudstack-marvin pypi package?
>>> 
>>> Regards.
>>> 
>>> David Nalley wrote:
 I wonder if we need to move this to its own release as we did with 
 cloudmonkey?
 
 --David
 
 On Mon, Jul 28, 2014 at 8:05 AM, Ian Duffy   wrote:
>> I believe no, atleast the latest changes under master or 4.4-forward.
> Alright, Thanks. I believe all changes for it within 4.4-forward should 
> now
> be in 4.4?
> 
> @Prasanna since you hold the account on pypi holding the name
> "cloudstack-marvin" can you make the upload?
> Tar at: http://jenkins.buildacloud.org/view/4.4/job/cloudstack-4.4-marvin/
> 
> Thanks,
> 
> Ian
> 
> 
> On 28 July 2014 01:52, Santhosh Edukulla
> wrote:
> 
>> I believe no, atleast the latest changes under master or 4.4-forward.
>> 
>> Santhosh
>> 
>> From: Ian Duffy [i...@ianduffy.ie]
>> Sent: Sunday, July 27, 2014 4:47 PM
>> To: CloudStack Dev; Santhosh Edukulla; Prasanna Santhanam
>> Subject: Marvin Package?
>> 
>> Hi,
>> 
>> Do we have a binary of marvin that users can download independent to the
>> management server rpms? Other than grabbing the tar.gz from jenkins.
>> 
>> I was hoping it would be published on pypi. Prasanna seems to have a page
>> for it there but there are no uploads:
>> https://pypi.python.org/pypi/cloudstack-marvin/0.1.0
>> 
>> Ideally I want pip install cloudstack-marvin or easy_install
>> cloudstack-marvin.
>> 
>> Thanks,
>> 
>> Ian
>> 
>>> --
>>> Rohit Yadav
>>> Software Architect, ShapeBlue
>>> M. +41 779015219 | rohit.ya...@shapeblue.com
>>> Blog: bhaisaab.org | Twitter: @_bhaisaab
>>> 
>>> 
>>> Find out more about ShapeBlue and our range of CloudStack related services
>>> 
>>> IaaS Cloud Design&  
>>> Build
>>> CSForge – rapid IaaS deployment framework
>>> CloudStack Consulting
>>> CloudStack Infrastructure 
>>> Support
>>> CloudStack Bootcamp Training 
>>> Courses
>>> 
>>> This email and any attachments to it may be confidential and are intended 
>>> solely for the use of the individual to whom it is addressed. Any views or 
>>> opinions expressed are solely those of the author and do not necessarily 
>>> represent those of Shape Blue Ltd or related companies. If you are not the 
>>> intended recipient of this email, you must neither take any action based 
>>> upon its contents, nor copy or show it to anyone. Please contact the sender 
>>> if you believe you have received this email in error. Shape Blue Ltd is a 
>>> company incorporated in England&  Wales. ShapeBlue Services India LLP is a 
>>> company incorporated in India and is operated under license from Shape Blue 
>>> Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil 
>>> and is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is 
>>> a company registered by The Republic of South Africa and is traded under 
>>> license from Shape Blue Ltd. ShapeBlue is a registered trademark.
>> 
> 
> --
> Rohit Yadav
> Software Architect, ShapeBlue
> M. +41 779015219 | rohit.ya...@shapeblue.com
> Blog: bhaisaab.org | Twitter: @_bhaisaab
> 
> 
> Find out more about ShapeBlue and our range of CloudStack related services
> 
> IaaS Cloud Design & Build
> CSForge – rapid IaaS deployment framework
> CloudStack Consulting
> CloudStack Infrastructure 
> Support
> CloudStack Bootcamp Training 
> Courses

[GitHub] cloudstack-docs-install pull request: Updated systemvm template pa...

2014-07-28 Thread terbolous
GitHub user terbolous opened a pull request:

https://github.com/apache/cloudstack-docs-install/pull/18

Updated systemvm template paths

The referenced systemvm paths are old, and contain heartbleed. 

Updated with newer, but still 4.3, templates.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/terbolous/cloudstack-docs-install patch-1

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/cloudstack-docs-install/pull/18.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 #18


commit ec7301efcec7a6c53263e00201414b434d930aeb
Author: Erik Weber 
Date:   2014-07-28T13:05:40Z

Updated systemvm template paths

The referenced systemvm paths are old, and contain heartbleed. Updated with 
newer, but still 4.3, templates.

commit ac03a4f589e5d2c157bc006d5c878fadc4736ce2
Author: Erik Weber 
Date:   2014-07-28T13:07:25Z

Fixed spaces




---
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.
---


Re: Review Request 23805: Added "state" parameter to the "listPublicIpAddresses" API call

2014-07-28 Thread Ilia Shakitko


> On July 28, 2014, 12:43 p.m., Rohit Yadav wrote:
> > api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java,
> >  lines 205-207
> > 
> >
> > This was removed.

I deleted it because it's not being used in the code. There is a second method: 
"public Boolean isAllocatedOnly()" this one is used instead.


> On July 28, 2014, 12:43 p.m., Rohit Yadav wrote:
> > api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java,
> >  lines 156-166
> > 
> >
> > I guess moving it above was a cosmetic change. Please fix that you 
> > don't remove/change anything in the move refactor.

Is this still the case according to the written comments below?


> On July 28, 2014, 12:43 p.m., Rohit Yadav wrote:
> > api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java,
> >  lines 156-167
> > 
> >
> > I guess the move refactor was a cosmetic change, but it removed 
> > getAllocatedOnly() method. Please fix it, or explain why we need to remove 
> > it?

Because it's a duplicated method, isn't it? As well is "isForLoadBalancing" and 
"getForLoadBalancing" (just noticed, I'll check for these methods usages as 
well later)


- Ilia


---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23805/#review48842
---


On July 28, 2014, 10:12 a.m., Ilia Shakitko wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23805/
> ---
> 
> (Updated July 28, 2014, 10:12 a.m.)
> 
> 
> Review request for cloudstack, Alena Prokharchyk, Alex Huang, Harikrishna 
> Patnala, Kishan Kavala, Prachi Damle, Rohit Yadav, Ilia Shakitko, Wei Zhou, 
> and Wido den Hollander.
> 
> 
> Bugs: CLOUDSTACK-7159
> https://issues.apache.org/jira/browse/CLOUDSTACK-7159
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> This improvement is introducing a new parameter for the 
> "listPublicIpAddresses" API call - "state".
> 
> Few times we've faced an impedemence of having a list of "Free" 
> publicIpAddresses. You have to go thru all the IPs with (allocatedonly = 
> false) and filter out the "Free" once. It's not a big deal, but it's an extra 
> time and traffic between CloudStack and an API consumer.
> 
> I also moved few methods out of the 'API Implementation' and put them above 
> as a minor refactoring.
> Method "getForLoadBalancing" has been removed because it's not being used in 
> code anywhere else.
> 
> This patch is done for "master" branch.
> 
> 
> Diffs
> -
> 
>   
> api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
>  07ccfe9 
>   server/src/com/cloud/server/ManagementServerImpl.java 99b12732 
> 
> Diff: https://reviews.apache.org/r/23805/diff/
> 
> 
> Testing
> ---
> 
> 1) Build successfull
> 2) No tests broken
> 3) Tested few different calls with cloudmonkey:
> 
> list publicipaddresses forvirtualnetwork=false listall=true page=1 pagesize=0
> count = 10
> 
> list publicipaddresses forvirtualnetwork=false listall=true 
> allocatedonly=false page=1 pagesize=0
> count = 100
> 
> list publicipaddresses forvirtualnetwork=false listall=true state=free page=1 
> pagesize=0
> count = 90
> 
> 
> Thanks,
> 
> Ilia Shakitko
> 
>



Re: Review Request 23879: CLOUDSTACK-7127: Fix for addRegion failure, avoiding regionid 1 while creating new region through test case

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23879/#review48850
---


Commit d5220a88a085385ebc4b783a40f27d128ea7d28f in cloudstack's branch 
refs/heads/4.4 from Gaurav Aradhye
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=d5220a8 ]

CLOUDSTACK-7127: Fix for addRegion failure, avoiding regionid 1 while creating 
new region through test case

(cherry picked from commit ca59f01602823a6d6fe84233f3a3d3ea499efa06)


- ASF Subversion and Git Services


On July 24, 2014, 2:44 p.m., Gaurav Aradhye wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23879/
> ---
> 
> (Updated July 24, 2014, 2:44 p.m.)
> 
> 
> Review request for cloudstack and Girish Shilamkar.
> 
> 
> Bugs: CLOUDSTACK-7127
> https://issues.apache.org/jira/browse/CLOUDSTACK-7127
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> We are choosing random region id while passing it to addRegion test case. The 
> test case failed when region id 1 was passed because the region id was 
> already in use.
> It is better to start the range from 2, as 1 will most likely be used in 
> existing setup.
> 
> 
> Diffs
> -
> 
>   test/integration/component/test_regions.py 7b7c4a4 
> 
> Diff: https://reviews.apache.org/r/23879/diff/
> 
> 
> Testing
> ---
> 
> Yes.
> Log:
> Test for duplicate checks on region id ... === TestName: 
> test_createRegionWithExistingRegionId | Status : SUCCESS ===
> ok
> Test for duplicate checks on region name ... === TestName: 
> test_createRegionWithExistingRegionName | Status : SUCCESS ===
> ok
> Test for update Region ... === TestName: test_updateRegion | Status : SUCCESS 
> ===
> ok
> 
> --
> Ran 3 tests in 2.845s
> 
> OK
> 
> 
> Thanks,
> 
> Gaurav Aradhye
> 
>



Re: Review Request 23606: CLOUDSTACK-7025: Resolving test script issue

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23606/#review48847
---


Commit 843e60475798a2cb06daeaa00708c816fb819650 in cloudstack's branch 
refs/heads/4.4 from Ashutosh K
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=843e604 ]

CLOUDSTACK-7025: Resolving test script issue

(cherry picked from commit 33fdfbc83407037b45624ca84ca436fab72e59ab)


- ASF Subversion and Git Services


On July 17, 2014, 8:53 a.m., Ashutosh Kelkar wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23606/
> ---
> 
> (Updated July 17, 2014, 8:53 a.m.)
> 
> 
> Review request for cloudstack and Girish Shilamkar.
> 
> 
> Bugs: CLOUDSTACK-7025
> https://issues.apache.org/jira/browse/CLOUDSTACK-7025
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> defaultNetworkId was not specified. Specified it in the setupClass.
> 
> 
> Diffs
> -
> 
>   test/integration/component/test_add_remove_network.py 4222f7a 
> 
> Diff: https://reviews.apache.org/r/23606/diff/
> 
> 
> Testing
> ---
> 
> 4 Test cases fixed by this.
> 
> Log:
> Add network to running VM ... SKIP: skip
> Add network to running VM ... SKIP: skip
> Add network to stopped VM ... SKIP: skip
> Add network to stopped VM ... SKIP: skip
> Add same network multiple times to running VM ... === TestName: 
> test_03_add_nw_multiple_times_1_isolated | Status : SUCCESS ===
> ok
> Add same network multiple times to running VM ... === TestName: 
> test_03_add_nw_multiple_times_2_shared | Status : SUCCESS ===
> ok
> Add VPC network to running VM belonging to isolated network ... === TestName: 
> test_04_vpc_nw_running_vm_1_isolated | Status : SUCCESS ===
> ok
> Add VPC network to stopped VM belonging to isolated network ... SKIP: skip
> Add network and ip address to running VM ... === TestName: 
> test_06_add_nw_ipaddress_running_vm | Status : SUCCESS ===
> ok
> Add network with invalid ip address to running VM ... SKIP: skip
> Add network to running VM ... SKIP: skip
> Add network to running VM ... SKIP: skip
> Add network to running VM ... SKIP: skip
> Add network to VM with maximum network limit reached ... SKIP: skip
> 
> --
> Ran 14 tests in 1523.655s
> 
> OK (SKIP=10)
> 
> 
> Thanks,
> 
> Ashutosh Kelkar
> 
>



Re: [DISCUSS] git commit proces

2014-07-28 Thread Mike Tutkowski
Yeah, I was under the impression this decision would require a vote and
formal announcement, if it passes.

On Monday, July 28, 2014, Hugo Trippaers  wrote:

> Agreed,  this kind of important decisions should be made by a vote.
>
> Sebastien, Daan, can one of you kick of the vote thread? Preferably with a
> condensed summary of the thread?
>
> Cheers,
>
> Hugo
>
>
> On 28 jul. 2014, at 14:07, Ian Duffy >
> wrote:
>
> > +1 to what Erik said.
> >
> >
> > On 28 July 2014 13:04, Erik Weber >
> wrote:
> >
> >> On Mon, Jul 28, 2014 at 1:22 PM, Daan Hoogland  >
> >> wrote:
> >>
> >>> H,
> >>>
> >>> I see a lot of commits happening directly on the master branch. Yet
> >>> there were no counter arguments against the proposed gitflow and the
> >>> discussion around it. This leaves me with the idea that the thread is
> >>> largely ignored by the community. It is my understanding that we
> >>> agreed never to commit anything to master anymore that hasn't been
> >>> first committed to a branch and is merged back to master (instead of
> >>> cherry-picked). What mistake in thinking am I making here?
> >>>
> >>>
> >>
> >> Not familiar with bylaws and the such, but wouldn't a change like this
> >> require some sort of voting and potentially a more formal information?
> >>
> >> Requiring everyone to read through a 50+ replies mail thread and
> comprehend
> >> it could be a bit much.
> >>
> >> I would suggest an updated document that explain the expected workflow.
> >>
> >> --
> >> Erik
> >>
>
>

-- 
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkow...@solidfire.com
o: 303.746.7302
Advancing the way the world uses the cloud
*™*


Re: Review Request 23882: CLOUDSTACK-7125: Fixed test_blocker_bugs.py, added code to wait for snapshots to be in 'BackedUp' state

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23882/#review48849
---


Commit 724c8dc7c98574dcdf669c0c2d7549981667ab77 in cloudstack's branch 
refs/heads/4.4 from Gaurav Aradhye
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=724c8dc ]

CLOUDSTACK-7125: Fixed test_blocker_bugs.py, added code to wait for snapshots 
to be in 'BackedU' state

(cherry picked from commit 4395308bd8b469fb02fc71d1e22f25c7d89b6dff)


- ASF Subversion and Git Services


On July 24, 2014, 2:43 p.m., Gaurav Aradhye wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23882/
> ---
> 
> (Updated July 24, 2014, 2:43 p.m.)
> 
> 
> Review request for cloudstack and Girish Shilamkar.
> 
> 
> Bugs: CLOUDSTACK-7125
> https://issues.apache.org/jira/browse/CLOUDSTACK-7125
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> After creating snapshot, added check if the snapshot is in backed up state or 
> not using the library function already availble in base.py.
> Earlier this check was not done and directly template was created from 
> snapshot. When snapshot is not backedup state, then template creation will 
> fail.
> 
> 
> Diffs
> -
> 
>   test/integration/component/test_blocker_bugs.py ba15b18 
> 
> Diff: https://reviews.apache.org/r/23882/diff/
> 
> 
> Testing
> ---
> 
> Did not run the test cases as already existing library function is used.
> Checked for sytax/import errors using pyflakes and python command.
> 
> 
> Thanks,
> 
> Gaurav Aradhye
> 
>



Re: Review Request 23608: CLOUDSTACK-7014: Resolving test script related to affinity groups tests

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23608/#review48848
---


Commit e9d658e16edbe55a380aefa779c89d690b368d24 in cloudstack's branch 
refs/heads/4.4 from Ashutosh K
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=e9d658e ]

CLOUDSTACK-7014: Resolving test script related to affinity groups tests

(cherry picked from commit 1cc6317b5e744afb74b63af6600af32bdfedb888)


- ASF Subversion and Git Services


On July 17, 2014, 9:23 a.m., Ashutosh Kelkar wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23608/
> ---
> 
> (Updated July 17, 2014, 9:23 a.m.)
> 
> 
> Review request for cloudstack and Girish Shilamkar.
> 
> 
> Bugs: CLOUDSTACK-7014
> https://issues.apache.org/jira/browse/CLOUDSTACK-7014
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> Changing __cleanup to _cleanup
> 
> 
> Diffs
> -
> 
>   test/integration/component/test_affinity_groups.py de5f007 
> 
> Diff: https://reviews.apache.org/r/23608/diff/
> 
> 
> Testing
> ---
> 
> Yes
> 
> 
> Thanks,
> 
> Ashutosh Kelkar
> 
>



[ACS44] cherry picking from 4.4-forward

2014-07-28 Thread Daan Hoogland
104 commits did not pick cleanly after applying the folowing:

for i in $(<../commitsToPick.lst)
do
  git cherry-pick -x --allow-empty $i || ( echo $i >>../failed.picks
&& git cherry-pick --abort )
done

4a85e2226436c62e781db3449d262cb385b977c1
66f8e0e1b5c81cbfde926c0c65c4d5969767cab9
404ac549bfd84e97c756009f214e74cdb73548de
4f1f182cba5579da2fc7ce1f02019a0afa00efeb
dcd3ce5ce03eeb0675776622e757e6e638cb433d
db153062dbe356021924d9b3441b9d2561d06283
80121f6be736283c5a485595bcb54c41b28787fa
486ee69ef47fe675921ee255eea112675e20418c
9bba24812e4f58e6c503010823533b8e0047ea2a
948b81fb51206b516caf1ff92a1a3dddc9f67a9b
18367b3a8614d39d6323f140fc50875230bb060a
cf41ccaa5b6475dace0bddbe6681c98cc5149189
87205f955523556a1aad5da72360c67f0b8ba697
6598167bedb1f00e9d1efc12b82999f8e822d5d6
648a724dfc49222873124089464ccda92278fa9f
7a0fa6b4581dda692ad276d21ce4c7bb106381cb
ff1c4beec10dc53ede860fb9a36e458b7cef0458
081ab7852505b46a6bb52b88dd89998f50ca54b6
c013813426874ae0cc1ac2b23238415652955901
7734ece8f1455c6ad39546b4f204257223036716
da0545ff869682181cf3a6d54d9459d70fe8e93d
0c40adfc4a9620ed29604f7aedbde0e1a077a68f
4466ed1ce18fd5391b2b96fa551c171ae7e09723
afd9d4e7567007604e15761a33ce9314149f7e21
900415b1d847ab4f2ccca75452adc1db009bb261
149cd4b5646b37d1649c86a3428d4c89d03003a8
14968daeaa454f872a6271172041596c208ce3f1
77460e9556f7d1b9d6cac6c8ece199bf3b83cd9c
8eca37056f5bb1eee10f0bedee785142d7c3437a
4e10b80293493d7bc78d75a43a00b6646acb52de
f2ebfe019e1ead6172712ec804b241cf0dc5a800
378e1da42c235d310df3d39d3d82270ef00546df
f748a552e9546e91e18c574b375f3ea6c8d7e043
f278c537d527aa0a9cf0e20cf80dd48e1d85ec82
02f769c4d564ef8540e3fd5e704879adc7c9a845
c7f5077ab18031e5601eb04f1ff7010b214861fe
e5de1cb7c2ad98307edf4983ffe7b23be5f12d3b
751f0ac5185c832b30e65d271af8d08469202329
6f3ff068270f48e00531c462de4f7d76395658ff
d9066f8d2931acc44ae66fc33f9eaa87b572de6a
7dc0fca2e90822014d3d6e3a01d2592e7caae5d2
c3c809647667229c4e46096a85dbbf75eec4d005
2cf16e5147d654216b0948950cd7fca058a5a1f2
30bd9b8fe03a7162d67ec16b94846b0afb77fc2b
2ab7bcade2f37cb17e071a6154fdae1d80e4ff99
3125ae5c6a7a286a4891755e0d8d57bfc6e7ce97
50d4963d5366f1c13c58b58ac3a4bac6f99973e6
24ef79aef82b69015c6e552258c4829d5a15a9d8
18c6ae07961f0cf787fe695da4b25b8d8f955acc
be765ce8680564b743a73dd360c590c0e495c204
d511847cfedad5478d1b4087c8f97be2c5bf3cc8
0329bebac5aa7dd68d7d9350d3a2cc609ce5e4a9
81bf37f33853d95e7c4137d57a60e719963913c4
fc52e641d8f69d8c0b552119203b0a2bc58e488f
89a03c7099fb5f0d6a3a892b036d064bfc2acb71
390e498dc58a89f0b060c50e5b796061bc97342e
0190c936689fc252e51b7c412283c128b5386b24
280d167316d92a8d24d0917f8945b408b87677a8
8a9092c3cd4e3c034f9f4d0a7491875dc080e9dc
3ce28f447998ac35307887e3f51425e5539313df
49467f295410f1f0e265e7ce5ee6dd849207c3e8
b849b7ee3d9b4a141c2eb3fd689d197ed20c4581
89c35abb4db0f362f9159ea39a6eb70ad4351921
54e4c075287957821e57368f1baf401761f7bda2
dbfce8b11e25855a8cb21ec2bbbfe20940bb788d
2214bd2502a34ee8e671eb6b4efe8cd26e29ac5a
a5415d93eb791bac52c40b9ede6a433a0d7f1dca
b0d726a872e2859a56ee677c15079cc3a59ab894
a0f19d4bd5d7bec6613aa8130b3da9ecffc71d0b
588e3e37afdd5740816d1225d449164ed2024c03
095be48314c96b74ed18280a95d710071482d2d6
21e452ff4f0459422f0612f2ddf7033a963b0a19
7e4303821570d58ad962c85a1a3bd6dbf32f8d73
9563db7a6d9d89558abc09e4ff786accfc0a9513
64153a43711420224655bfbe248b4b87474a1f23
ba270efd4b842480482953ec2c4f7641e8ad04ca
c7d00d52b2b7e375008f3fabbd1ec96c1e6e7238
8de18f144c680287c762a4b5db1b6e1d596f5723
5cf8edd7ec22095e70d72486a2380228fb3728af
5863ab826ea6ac2533171f5445bd40512074
5749abc23af90f6563d42647044031e7428b9eed
2498f65683bd529b2b03bac9a6cfd2fdbf65aca2
96412e3e58fd1ced9d269e4552aaa6410bedf556
defed59b97324ff51360a24edc470b5e6efda7ac
039878b49a821cd1fd52e0ead0f528c3e9371a0c
a18a4ea9e8b5c6a9c4935570af5d2eb9a2c1b753
fce21439facea267d958d8939059ba65afb3578a
f7417d622a15c9ff6a5d6e5e7284bd220bc647ee
bfba6d4a1e0ec9866aeebd45c3173264160c89f5
a34faae919b280fe6009e2608c95f59eafdfac48
a28d65fc4a535b85d3f04e7f2dcccf6ec8092c8f
63c4f028971f80a9dfa32125a3eed71468209497
f5139f78395146ee99b9e0fdc376351b28c34063
a83212afdc5558582d2aa60727bb28648472d95d
252e58381aae6f321c972d00a3bb8dd7c89d97c0
5e181acbdb0865c0d26307c4e5359ec9c615f615
b7d445873c36d523571896ea1c51a49f65024445
f99a96f38a1f2433cb01bd7af25890789716e070
967b82f16b93bf1df4473b7ce8dd314f015098e8
c8ca15b95a57a3d79b71c76c913e295f6490f05d
ec49669f1cf525b207889ae13a8a2b01a0271933
8d8190ea4e00edb0f7ce9665535adcc7a5b5097d
dd138ceec5faa5d5b0fcdfe5cc655199b8f9187b
4e45b296891f71fc7991dc507dc7ae9cec6f5496

-- 
Daan


Review Request 23982: CLOUDSTACK-7192: Skip tests on Hyper-V which don't apply

2014-07-28 Thread John Dilley

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23982/
---

Review request for cloudstack, sanjeev n and Santhosh Edukulla.


Bugs: CLOUDSTACK-7192
https://issues.apache.org/jira/browse/CLOUDSTACK-7192


Repository: cloudstack-git


Description
---

A number of tests in the following files don't apply to Hyper-V. This patch 
means they are skipped if an attempt is made to run them.

test_nic.py
test_primary_storage.py 
test_scale_vm.py
test_snapshots.py
test_vm_snapshots.py
test_volumes.py(test7 and test8 only)


Diffs
-

  test/integration/smoke/test_nic.py dd6de96 
  test/integration/smoke/test_primary_storage.py 66aec59 
  test/integration/smoke/test_scale_vm.py b5c89be 
  test/integration/smoke/test_snapshots.py 8b6fdd1 
  test/integration/smoke/test_vm_snapshots.py 01626f5 
  test/integration/smoke/test_volumes.py 6e9ea75 

Diff: https://reviews.apache.org/r/23982/diff/


Testing
---


Thanks,

John Dilley



Re: [DISCUSS] git commit proces

2014-07-28 Thread Daan Hoogland
I am not for a grand proposal but ok, I can live with it.

It would be easiest to just vote for using the gitflow model.
Leo is preparing a page on how to do it. I don't know what the status
is on it. The vote for my part would be on the contents of that page.

On Mon, Jul 28, 2014 at 4:03 PM, Mike Tutkowski
 wrote:
> Yeah, I was under the impression this decision would require a vote and
> formal announcement, if it passes.
>
> On Monday, July 28, 2014, Hugo Trippaers  wrote:
>
>> Agreed,  this kind of important decisions should be made by a vote.
>>
>> Sebastien, Daan, can one of you kick of the vote thread? Preferably with a
>> condensed summary of the thread?
>>
>> Cheers,
>>
>> Hugo
>>
>>
>> On 28 jul. 2014, at 14:07, Ian Duffy >
>> wrote:
>>
>> > +1 to what Erik said.
>> >
>> >
>> > On 28 July 2014 13:04, Erik Weber >
>> wrote:
>> >
>> >> On Mon, Jul 28, 2014 at 1:22 PM, Daan Hoogland > >
>> >> wrote:
>> >>
>> >>> H,
>> >>>
>> >>> I see a lot of commits happening directly on the master branch. Yet
>> >>> there were no counter arguments against the proposed gitflow and the
>> >>> discussion around it. This leaves me with the idea that the thread is
>> >>> largely ignored by the community. It is my understanding that we
>> >>> agreed never to commit anything to master anymore that hasn't been
>> >>> first committed to a branch and is merged back to master (instead of
>> >>> cherry-picked). What mistake in thinking am I making here?
>> >>>
>> >>>
>> >>
>> >> Not familiar with bylaws and the such, but wouldn't a change like this
>> >> require some sort of voting and potentially a more formal information?
>> >>
>> >> Requiring everyone to read through a 50+ replies mail thread and
>> comprehend
>> >> it could be a bit much.
>> >>
>> >> I would suggest an updated document that explain the expected workflow.
>> >>
>> >> --
>> >> Erik
>> >>
>>
>>
>
> --
> *Mike Tutkowski*
> *Senior CloudStack Developer, SolidFire Inc.*
> e: mike.tutkow...@solidfire.com
> o: 303.746.7302
> Advancing the way the world uses the cloud
> *™*



-- 
Daan


Re: [DISCUSS] git commit proces

2014-07-28 Thread Daan Hoogland
Let me explain a little more about this lat mail of mine.
I was assuming a lot of context that most people may not have.
We want to start working differently with respect to our release
procedure and branching habits. The proposals that are out there and
about to be voted for are going to require a lot of work of a few
people and a lot of discipline from all of us.

My idea was to first vote for some of the habits that are part of the
gitflow discipline, but I am not strong opinionated about that.

I do want to prevent that we go for a grand proposal to completely
change our way of moving forward (not just the way we move forward)
while there are potentially people opposing to this way of working.

So please give a +1/0/-1 to the general idea now, so we fell
comfortable spending the time in devising a new release
schedule/mechanism.

some of the highlights are:

it will start with 4.5 (4.4.x will be done with the old manual
cherry-pick process)
it will require everybody to create a branch for every fix or feature
they will contribute.
it will require devs to work mainly on a new branch call 'develop'
it will be every bodies responsibility to ensure that 'master' is at
all times releasable

thanks,
Daan

On Mon, Jul 28, 2014 at 4:39 PM, Daan Hoogland  wrote:
> I am not for a grand proposal but ok, I can live with it.
>
> It would be easiest to just vote for using the gitflow model.
> Leo is preparing a page on how to do it. I don't know what the status
> is on it. The vote for my part would be on the contents of that page.
>
> On Mon, Jul 28, 2014 at 4:03 PM, Mike Tutkowski
>  wrote:
>> Yeah, I was under the impression this decision would require a vote and
>> formal announcement, if it passes.
>>
>> On Monday, July 28, 2014, Hugo Trippaers  wrote:
>>
>>> Agreed,  this kind of important decisions should be made by a vote.
>>>
>>> Sebastien, Daan, can one of you kick of the vote thread? Preferably with a
>>> condensed summary of the thread?
>>>
>>> Cheers,
>>>
>>> Hugo
>>>
>>>
>>> On 28 jul. 2014, at 14:07, Ian Duffy >
>>> wrote:
>>>
>>> > +1 to what Erik said.
>>> >
>>> >
>>> > On 28 July 2014 13:04, Erik Weber >
>>> wrote:
>>> >
>>> >> On Mon, Jul 28, 2014 at 1:22 PM, Daan Hoogland >> >
>>> >> wrote:
>>> >>
>>> >>> H,
>>> >>>
>>> >>> I see a lot of commits happening directly on the master branch. Yet
>>> >>> there were no counter arguments against the proposed gitflow and the
>>> >>> discussion around it. This leaves me with the idea that the thread is
>>> >>> largely ignored by the community. It is my understanding that we
>>> >>> agreed never to commit anything to master anymore that hasn't been
>>> >>> first committed to a branch and is merged back to master (instead of
>>> >>> cherry-picked). What mistake in thinking am I making here?
>>> >>>
>>> >>>
>>> >>
>>> >> Not familiar with bylaws and the such, but wouldn't a change like this
>>> >> require some sort of voting and potentially a more formal information?
>>> >>
>>> >> Requiring everyone to read through a 50+ replies mail thread and
>>> comprehend
>>> >> it could be a bit much.
>>> >>
>>> >> I would suggest an updated document that explain the expected workflow.
>>> >>
>>> >> --
>>> >> Erik
>>> >>
>>>
>>>
>>
>> --
>> *Mike Tutkowski*
>> *Senior CloudStack Developer, SolidFire Inc.*
>> e: mike.tutkow...@solidfire.com
>> o: 303.746.7302
>> Advancing the way the world uses the cloud
>> *™*
>
>
>
> --
> Daan



-- 
Daan


Re: Review Request 20651: CLOUDSTACK-6470: fixed while stopping vm hyper-v agent, vm is now gracefully shutting down

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/20651/#review48854
---


Commit 48f9453a74c0dea9e3c57ab61515e29121c4d2d7 in cloudstack's branch 
refs/heads/4.4 from Anshul Gangwar
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=48f9453 ]

CLOUDSTACK-6470: while stopping vm in hyper-v, now we are first trying to 
shutdown it gracefully before turning it off forcefully

(cherry picked from commit 4a85e2226436c62e781db3449d262cb385b977c1)

Conflicts:

plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs


- ASF Subversion and Git Services


On April 25, 2014, 8:28 a.m., Anshul Gangwar wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/20651/
> ---
> 
> (Updated April 25, 2014, 8:28 a.m.)
> 
> 
> Review request for cloudstack, Devdeep Singh and Rajesh Battala.
> 
> 
> Bugs: CLOUDSTACK-6470
> https://issues.apache.org/jira/browse/CLOUDSTACK-6470
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> When we stop VM in case of hyper-v, then it is always force shut downed i.e. 
> turn off. Even if the integration services are installed in hyper-v. Directly 
> turning of VM may result in corruption of disk. This patch fixes this issue. 
> I have used new management class ShutdownComponent to achieve this.
> 
> 
> Diffs
> -
> 
>   
> plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs 
> 4795073 
>   
> plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_ShutdownComponent.cs
>  PRE-CREATION 
>   
> plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/WmiWrappers.csproj
>  70ae8e8 
> 
> Diff: https://reviews.apache.org/r/20651/diff/
> 
> 
> Testing
> ---
> 
> verified on my local setup by looking into the console of VM. When stopping 
> the VM it shows that the shutdown process is initiated.
> 
> 
> Thanks,
> 
> Anshul Gangwar
> 
>



Re: Review Request 20701: CLOUDSTACK-6504: removed the warnings coming in building hyper-v agent code

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/20701/#review48855
---


Commit 8fb89cdc8e2dff60d49fecd3e51a9bf997061035 in cloudstack's branch 
refs/heads/4.4 from Anshul Gangwar
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=8fb89cd ]

CLOUDSTACK-6504: removed warnings coming in building hyper-v agent code

(cherry picked from commit 66f8e0e1b5c81cbfde926c0c65c4d5969767cab9)

Conflicts:

plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs

plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs


- ASF Subversion and Git Services


On April 25, 2014, 6:14 a.m., Anshul Gangwar wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/20701/
> ---
> 
> (Updated April 25, 2014, 6:14 a.m.)
> 
> 
> Review request for cloudstack, Devdeep Singh and Rajesh Battala.
> 
> 
> Bugs: CLOUDSTACK-6504
> https://issues.apache.org/jira/browse/CLOUDSTACK-6504
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
>  removed the warnings coming in building hyper-v agent code. One warning 
> related to System.Net.Http dependency is still there. All other warnings have 
> been removed.
> 
> 
> Diffs
> -
> 
>   
> plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
>  c222102 
>   
> plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
>  0f084db 
>   plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/Utils.cs 
> d0d3d83 
>   
> plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs 
> 4795073 
> 
> Diff: https://reviews.apache.org/r/20701/diff/
> 
> 
> Testing
> ---
> 
> tested by creating the fresh setup after the removal of warnings.
> 
> 
> Thanks,
> 
> Anshul Gangwar
> 
>



Re: Review Request 23195: CLOUDSTACK-6873: Moving the tests using SimulatorMock to different folder so that they can be run separately and serially

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23195/#review48856
---


Commit 75d2a331ee5876c3c456c8a3c12258c3b8f07f00 in cloudstack's branch 
refs/heads/4.4 from Koushik Das
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=75d2a33 ]

CLOUDSTACK-6873: Tagged tests based on the limitation described in the bug

(cherry picked from commit 89a03c7099fb5f0d6a3a892b036d064bfc2acb71)


- ASF Subversion and Git Services


On July 3, 2014, 1:32 p.m., Gaurav Aradhye wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23195/
> ---
> 
> (Updated July 3, 2014, 1:32 p.m.)
> 
> 
> Review request for cloudstack, Koushik Das and Santhosh Edukulla.
> 
> 
> Bugs: CLOUDSTACK-6873
> https://issues.apache.org/jira/browse/CLOUDSTACK-6873
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> Moving tests using SimulatorMock into maint folder. Also removed duplicate 
> test cases from test_deploy_vm.py. These tests are already covered in 
> test_vm_life_cycle.py
> 
> 
> Diffs
> -
> 
>   test/integration/smoke/misc/__init__.py PRE-CREATION 
>   test/integration/smoke/misc/test_deploy_vm.py PRE-CREATION 
>   test/integration/smoke/misc/test_vm_ha.py PRE-CREATION 
>   test/integration/smoke/test_deploy_vm.py ed5dfaf 
>   test/integration/smoke/test_vm_ha.py 1d9021c 
>   test/integration/smoke/test_vm_life_cycle.py 240ab68 
> 
> Diff: https://reviews.apache.org/r/23195/diff/
> 
> 
> Testing
> ---
> 
> 
> File Attachments
> 
> 
> Patch for master
>   
> https://reviews.apache.org/media/uploaded/files/2014/07/03/1fba76b3-3eab-4281-afa9-7a3f38dc2c0d__0001-CLOUDSTACK-6873-Moving-the-tests-using-SimulatorMock.patch
> 
> 
> Thanks,
> 
> Gaurav Aradhye
> 
>



Re: Review Request 22614: CLOUDSTACK-6887: Code enhancement to ensure better cleanup

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22614/#review48857
---


Commit 8c37e46807b92ac32c63cd36d33ca5d68bb75f30 in cloudstack's branch 
refs/heads/4.4 from Gaurav Aradhye
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=8c37e46 ]

CLOUDSTACK-6887: Fixing account cleanup issue across multiple test cases

(cherry picked from commit b849b7ee3d9b4a141c2eb3fd689d197ed20c4581)


- ASF Subversion and Git Services


On June 18, 2014, 3:22 a.m., Gaurav Aradhye wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/22614/
> ---
> 
> (Updated June 18, 2014, 3:22 a.m.)
> 
> 
> Review request for cloudstack and Girish Shilamkar.
> 
> 
> Bugs: CLOUDSTACK-6887
> https://issues.apache.org/jira/browse/CLOUDSTACK-6887
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> Adding patch fixing few more test suites for better cleanup.
> 
> 
> Diffs
> -
> 
>   test/integration/component/test_accounts.py f71dea5 
>   test/integration/component/test_add_remove_network.py 7479cee 
>   test/integration/component/test_affinity_groups.py d0fa2f7 
>   test/integration/component/test_portable_ip.py 538318d 
>   test/integration/component/test_vpc_network.py a449948 
> 
> Diff: https://reviews.apache.org/r/22614/diff/
> 
> 
> Testing
> ---
> 
> Tested with python command.
> 
> 
> Thanks,
> 
> Gaurav Aradhye
> 
>



Re: Review Request 22554: CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22554/#review48858
---


Commit 2fdf789a28ce01571eabd5ccb8edfea72624ea3c in cloudstack's branch 
refs/heads/4.4 from John Dilley
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=2fdf789 ]

CLOUDSTACK-6909 - fix marvin's handling of SMB credentials for storage

Signed-off-by: Daan Hoogland 
(cherry picked from commit 477a812a6f7aaab74122c11488713f417dfe4d89)
(cherry picked from commit 2498f65683bd529b2b03bac9a6cfd2fdbf65aca2)


- ASF Subversion and Git Services


On June 23, 2014, 3:53 p.m., John Dilley wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/22554/
> ---
> 
> (Updated June 23, 2014, 3:53 p.m.)
> 
> 
> Review request for cloudstack and Santhosh Edukulla.
> 
> 
> Bugs: CLOUDSTACK-6909
> https://issues.apache.org/jira/browse/CLOUDSTACK-6909
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> Fix marvin's handling of details field for primary and secondary storage to 
> cope with SMB credentials. This allows Hyper-V to work.
> 
> 
> Diffs
> -
> 
>   tools/marvin/marvin/configGenerator.py 191f08e 
>   tools/marvin/marvin/deployDataCenter.py 22b78ab 
> 
> Diff: https://reviews.apache.org/r/22554/diff/
> 
> 
> Testing
> ---
> 
> Tested deploydataCenter with this JSON:
> 
> {
>"dbSvr":{
>   "dbSvr":"10.220.137.39",
>   "passwd":"cloud",
>   "db":"cloud",
>   "port":3306,
>   "user":"cloud"
>},
>"zones":[
>   {
>  "name":"XenRT-Zone-0",
>  "guestcidraddress":"192.168.200.0/24",
>  "dns1":"10.220.160.11",
>  "physical_networks":[
> {
>"XRT_VLANRangeSize":10,
>"name":"AdvPhyNetwork",
>"providers":[
>   {
>  "broadcastdomainrange":"ZONE",
>  "name":"VirtualRouter"
>   },
>   {
>  "broadcastdomainrange":"ZONE",
>  "name":"VpcVirtualRouter"
>   },
>   {
>  "broadcastdomainrange":"ZONE",
>  "name":"InternalLbVm"
>   }
>],
>"broadcastdomainrange":"Zone",
>"vlan":"3000-3009",
>"traffictypes":[
>   {
>  "typ":"Guest"
>   },
>   {
>  "typ":"Management"
>   },
>   {
>  "typ":"Public"
>   }
>],
>"isolationmethods":[
>   "VLAN"
>]
> }
>  ],
>  "ipranges":[
> {
>"startip":"10.220.164.0",
>"endip":"10.220.164.9",
>"netmask":"255.255.240.0",
>"XRT_GuestIPRangeSize":10,
>"gateway":"10.220.160.1"
> }
>  ],
>  "networktype":"Advanced",
>  "pods":[
> {
>"XRT_PodIPRangeSize":10,
>"name":"XenRT-Zone-0-Pod-0",
>"endip":"10.220.164.39",
>"startip":"10.220.164.30",
>"netmask":"255.255.240.0",
>"clusters":[
>   {
>  "XRT_HyperVHostIds":"0",
>  "clustername":"XenRT-Zone-0-Pod-0-Cluster-0",
>  "hypervisor":"hyperv",
>  "primaryStorages":[
> {
>"url":"cifs://10.220.163.45/storage/primary",
>"name":"XenRT-Zone-0-Pod-0-Primary-Store",
>"details":{
>   "user":"Administrator",
>   "password":"xenroot01T",
>   "domain":"XSQA"
>}
> }
>  ],
>  "clustertype":"CloudManaged",
>  "hosts":[
> {
>"url":"http://10.220.163.45";,
>"username":"root",
>"password":"xenroot"
> }
>  ],
>  "XRT_Hosts":1
>   }
>],
>"gateway":"10.220.160.1"
> }
>  ],
>  "internaldns1":"10.220.160.11",
>  "secondaryStorages":[
> {
>"url":"cifs://10.220.163.45/storage/secondary",
>"details":{
>  

Re: Review Request 23613: CLOUDSTACK-7022: Fixed typo

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23613/#review48859
---


Commit e33d4a5732e81f590489f37b7fbcc947d2929de6 in cloudstack's branch 
refs/heads/4.4 from Ashutosh K
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=e33d4a5 ]

CLOUDSTACK-7022: Fixed typo

(cherry picked from commit 967b82f16b93bf1df4473b7ce8dd314f015098e8)


- ASF Subversion and Git Services


On July 17, 2014, 11:03 a.m., Ashutosh Kelkar wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23613/
> ---
> 
> (Updated July 17, 2014, 11:03 a.m.)
> 
> 
> Review request for cloudstack and Girish Shilamkar.
> 
> 
> Bugs: CLOUDSTACK-7022
> https://issues.apache.org/jira/browse/CLOUDSTACK-7022
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> Fixed typo.
> 
> 
> Diffs
> -
> 
>   test/integration/component/test_usage.py 4f9d1d7 
> 
> Diff: https://reviews.apache.org/r/23613/diff/
> 
> 
> Testing
> ---
> 
> 
> Thanks,
> 
> Ashutosh Kelkar
> 
>



Re: [ACS44] cherry picking from 4.4-forward

2014-07-28 Thread Daan Hoogland
commited three or so by hand and ran my script again.
now 77 are still missing from 4.4

will do some more later this week.

4f1f182cba5579da2fc7ce1f02019a0afa00efeb
9bba24812e4f58e6c503010823533b8e0047ea2a
948b81fb51206b516caf1ff92a1a3dddc9f67a9b
18367b3a8614d39d6323f140fc50875230bb060a
cf41ccaa5b6475dace0bddbe6681c98cc5149189
87205f955523556a1aad5da72360c67f0b8ba697
648a724dfc49222873124089464ccda92278fa9f
7a0fa6b4581dda692ad276d21ce4c7bb106381cb
ff1c4beec10dc53ede860fb9a36e458b7cef0458
da0545ff869682181cf3a6d54d9459d70fe8e93d
0c40adfc4a9620ed29604f7aedbde0e1a077a68f
900415b1d847ab4f2ccca75452adc1db009bb261
14968daeaa454f872a6271172041596c208ce3f1
77460e9556f7d1b9d6cac6c8ece199bf3b83cd9c
8eca37056f5bb1eee10f0bedee785142d7c3437a
4e10b80293493d7bc78d75a43a00b6646acb52de
378e1da42c235d310df3d39d3d82270ef00546df
f748a552e9546e91e18c574b375f3ea6c8d7e043
02f769c4d564ef8540e3fd5e704879adc7c9a845
e5de1cb7c2ad98307edf4983ffe7b23be5f12d3b
751f0ac5185c832b30e65d271af8d08469202329
6f3ff068270f48e00531c462de4f7d76395658ff
d9066f8d2931acc44ae66fc33f9eaa87b572de6a
7dc0fca2e90822014d3d6e3a01d2592e7caae5d2
2cf16e5147d654216b0948950cd7fca058a5a1f2
2ab7bcade2f37cb17e071a6154fdae1d80e4ff99
50d4963d5366f1c13c58b58ac3a4bac6f99973e6
18c6ae07961f0cf787fe695da4b25b8d8f955acc
be765ce8680564b743a73dd360c590c0e495c204
d511847cfedad5478d1b4087c8f97be2c5bf3cc8
0329bebac5aa7dd68d7d9350d3a2cc609ce5e4a9
fc52e641d8f69d8c0b552119203b0a2bc58e488f
390e498dc58a89f0b060c50e5b796061bc97342e
0190c936689fc252e51b7c412283c128b5386b24
280d167316d92a8d24d0917f8945b408b87677a8
8a9092c3cd4e3c034f9f4d0a7491875dc080e9dc
3ce28f447998ac35307887e3f51425e5539313df
49467f295410f1f0e265e7ce5ee6dd849207c3e8
89c35abb4db0f362f9159ea39a6eb70ad4351921
54e4c075287957821e57368f1baf401761f7bda2
dbfce8b11e25855a8cb21ec2bbbfe20940bb788d
2214bd2502a34ee8e671eb6b4efe8cd26e29ac5a
a5415d93eb791bac52c40b9ede6a433a0d7f1dca
b0d726a872e2859a56ee677c15079cc3a59ab894
a0f19d4bd5d7bec6613aa8130b3da9ecffc71d0b
588e3e37afdd5740816d1225d449164ed2024c03
095be48314c96b74ed18280a95d710071482d2d6
21e452ff4f0459422f0612f2ddf7033a963b0a19
7e4303821570d58ad962c85a1a3bd6dbf32f8d73
64153a43711420224655bfbe248b4b87474a1f23
ba270efd4b842480482953ec2c4f7641e8ad04ca
c7d00d52b2b7e375008f3fabbd1ec96c1e6e7238
8de18f144c680287c762a4b5db1b6e1d596f5723
5cf8edd7ec22095e70d72486a2380228fb3728af
5863ab826ea6ac2533171f5445bd40512074
5749abc23af90f6563d42647044031e7428b9eed
96412e3e58fd1ced9d269e4552aaa6410bedf556
defed59b97324ff51360a24edc470b5e6efda7ac
039878b49a821cd1fd52e0ead0f528c3e9371a0c
a18a4ea9e8b5c6a9c4935570af5d2eb9a2c1b753
fce21439facea267d958d8939059ba65afb3578a
f7417d622a15c9ff6a5d6e5e7284bd220bc647ee
bfba6d4a1e0ec9866aeebd45c3173264160c89f5
a34faae919b280fe6009e2608c95f59eafdfac48
a28d65fc4a535b85d3f04e7f2dcccf6ec8092c8f
63c4f028971f80a9dfa32125a3eed71468209497
f5139f78395146ee99b9e0fdc376351b28c34063
a83212afdc5558582d2aa60727bb28648472d95d
252e58381aae6f321c972d00a3bb8dd7c89d97c0
5e181acbdb0865c0d26307c4e5359ec9c615f615
b7d445873c36d523571896ea1c51a49f65024445
f99a96f38a1f2433cb01bd7af25890789716e070
c8ca15b95a57a3d79b71c76c913e295f6490f05d
ec49669f1cf525b207889ae13a8a2b01a0271933
8d8190ea4e00edb0f7ce9665535adcc7a5b5097d
dd138ceec5faa5d5b0fcdfe5cc655199b8f9187b
4e45b296891f71fc7991dc507dc7ae9cec6f5496

On Mon, Jul 28, 2014 at 4:14 PM, Daan Hoogland  wrote:
> 104 commits did not pick cleanly after applying the folowing:
>
> for i in $(<../commitsToPick.lst)
> do
>   git cherry-pick -x --allow-empty $i || ( echo $i >>../failed.picks
> && git cherry-pick --abort )
> done
>



-- 
Daan


[ACS44] systemvm templates

2014-07-28 Thread Pierre-Luc Dion
Hi

I've had it wrong in the release-notes for system vm templates. used and
old outdated ones.
Also the Install guide point to outdated templates. I'll fix documentations
today hopefully, although, Which one should I used ?

Should we refer to those ones: http://cloudstack.apt-get.eu/systemvm/4.4/  ?




*Pierre-Luc DION*
Architecte de Solution Cloud | Cloud Solutions Architect
t 855.652.5683

*CloudOps* Votre partenaire infonuagique* | *Cloud Solutions Experts
420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6
w cloudops.com *|* tw @CloudOps_


Re: [DISCUSS][PROPOSAL] git workflow

2014-07-28 Thread Rohit Yadav

Hi,

It took me sometime to go through all the 58 emails on this thread.
I suggest we need to adapt "gitflow" to our git workflow. I liked the
summary Rajani suggested here: http://markmail.org/message/2642ilfajkpshnfn

Let's continue the discussion in the new thread now:
http://markmail.org/message/zf5yt47jqq3auswo

Regards.


Rajani Karuturi wrote:

branches will be deleted after the release or hotfix if you use the git-flow 
commands.

This would be the flow for a hotfix:
1. branch off from the release tag on master. in this case it would be 
release/4.4.0
2. commit the fixes in hotfix/4.4.1
3. do the release
4. merge to develop
5. merge to master and update tags
6. delete hotfix branch

But, I agree that there can be a problem when we wish to do 4.4.2 if we delete 
the hotfix branch

may be we should use git-flow support instead of hotfix which doesn’t delete 
the branch
http://stackoverflow.com/a/16866118/201514

~Rajani



On 25-Jul-2014, at 12:31 pm, Daan Hoogland  wrote:


Rightful question Erik,

Rajani mentioned that release branches will be deleted. This will only
happen once the release is no longer supported. Any hotfix branch will
still have to merged on that (and master possibly) until we stop
supporting that branch.

On the other hand you can branch from any commit.

btw 4.4.1 is a bad example of you as we will still maintain that
without gitflow. But it is valid for for instance 4.5.2 or 5.0.1.

On Fri, Jul 25, 2014 at 8:04 AM, Erik Weber  wrote:

This is out of my git league, but how do you handle minor versions that way?

Assuming 4.8.0 is the latest stable release and HEAD on master.

Then you want to release 4.4.1.

First of all can you develop bugfixes for 4.4 along the way, when both
develop and master HEAD might be hugely different?

Second, can you commit  behind HEAD? You don't want the 4.4.1 release
instead of 4.8.0 to be HEAD

Someone might have good solutions to this, but if not I would propose to
keep the release branches for future bugfixes.

Erik
25. juli 2014 06:02 skrev "Rajani Karuturi"
følgende:


On 24-Jul-2014, at 10:25 pm, Mike Tutkowski
wrote:


I believe I agree with these steps.

A couple questions:

Is 'master' simply always going to be equal to what's the most recent
version of the code that's in production?

I think so. master will always be at the latest release and all the
previous releases properly tagged. The release branches would be deleted
once release is done.


Also, would 'develop' be for 4.6 code then and 4.5 code would go directly
into RELEASE-4.5?


Yes. 4.6 work should be done on develop branch and any 4.5 bug fixes
should be done on the 4.5 branch.



~Rajani



On Thu, Jul 24, 2014 at 12:39 AM, Rajani Karuturi<
rajani.karut...@citrix.com>  wrote:


Hi Daan,
here is what i propose:

1. rename 'master' to 'develop’
2. branch a new 'master' from '4.4’
3. branch 'RELEASE-4.5' from the develop
4. merge 'RELEASE-4.5' to master once the release voting is done.

RELEASE-4.6 branch should be off develop as all the feature branches

would

be merged there before freeze for 4.6 and would be merged to master when
the release is voted.

The other question I have is in the step:4. how are we going to manage
fixes to 4.5 post branch cut?  ( assuming no features as the freeze is

done)

~Rajani



On 24-Jul-2014, at 11:52 am, Daan Hoogland
wrote:


Mike, Rajani,

Sebastien's point was that the current 4.4 is the closest we have to a
releasable branch. I don't mind enting on master but it will require
more fixing. In general all of this will require some RM work of all
committers. Please ammend my little proposal if you will.

On Thu, Jul 24, 2014 at 6:27 AM, Rajani Karuturi
  wrote:

I agree with mike. I think we should start 4.5 from where master is

now

Also create a develop branch from master and continue future work for

4.6 there.

I am not clear on how the release branches are going to be maintained.
Are we saying we would create 4.5-RELEASE branch which is essentially

same as our current -FORWARD branch and continue cherry-picking?

I would prefer merges to cherry-picks.
Also, I think we should allow committers to commit to the RELEASE

branch after discussing about it on dev@ and have RM closely monitor

them.

Any commit intended for 4.5 RELEASE should be checked in after

discussion in the 4.5 Release branch and then merged to develop branch.


~Rajani



On 24-Jul-2014, at 1:14 am, Mike Tutkowski<

mike.tutkow...@solidfire.com>  wrote:

Per earlier e-mails, I don't think we want to start 4.5 where 4.4

left

off

and then merge features from develop into 4.5.

Why don't we instead start 4.5 where master is now with the

assumption

that

since we are past Feature Freeze for 4.5 that master is stable

enough?


On Wed, Jul 23, 2014 at 12:56 PM, Daan Hoogland<

daan.hoogl...@gmail.com>

wrote:


so to start formulate a proposal:

all work shall be done in a new branch (it is advisable to prefix

your

branches with your id)
when working, features wil

Review Request 23985: CLOUDSTACK-7193: handle domain ID being an int

2014-07-28 Thread Vincent Bernat

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23985/
---

Review request for cloudstack.


Repository: cloudstack-git


Description
---

CLOUDSTACK-7193: handle domain ID being an int

Recent versions of libvirt (at least 0.9.8) will return an int when
queried for the ID of a domain, not a string. This breaks some parts of
the `security_group.py` script which expects a string containing an
int. Notably, this breaks the part handling VM reboots which is
therefore not executed.


Diffs
-

  scripts/vm/network/security_group.py 704b27982021 

Diff: https://reviews.apache.org/r/23985/diff/


Testing
---


Thanks,

Vincent Bernat



Re: [DISCUSS] git commit proces

2014-07-28 Thread Rohit Yadav

Hi,

This thread summarizes gitflow and the git process talk Rajani shared
with us in the other thread:

http://markmail.org/message/4hk2jwvxt4lcpqig

This is what Rajani shared during the end of the thread:

http://markmail.org/message/2642ilfajkpshnfn

After reading 58 emails on the original thread, here what I've to
suggest and discuss:

- adapt the "gitflow" to our workflow, we don't need to enforce it or
its esoteric concepts
- have a stable master because everyone ends up using master including
the new contributors

Feature development and bug fixes:
- work on a branch checked out from master or release branches
- don't commit on master by default, only if you're sure and have passed
by success builds and tests

Backporting changes: (from one branch to other branch/release)
- don't cherry pick if there are too many commits (say 50+) instead I
recommend using branching & merging
- in case of feature work/refactoring and work that results in a lot of
conflict, use squash merging that results in few revert-able commits

Open ended questions:
- How do we have a workflow that supports backporting changes/features
to old releases say 4.0, 4.1 etc.
- How do we insure this is well communicated to everyone and everyone
follows what we'll agree by vote or scout's honor
- For merging any feature work or branch or cherry-picking commits to
master do we need to have a review requirement using reviewboard etc?

Regards.

Daan Hoogland wrote:

Let me explain a little more about this lat mail of mine.
I was assuming a lot of context that most people may not have.
We want to start working differently with respect to our release
procedure and branching habits. The proposals that are out there and
about to be voted for are going to require a lot of work of a few
people and a lot of discipline from all of us.

My idea was to first vote for some of the habits that are part of the
gitflow discipline, but I am not strong opinionated about that.

I do want to prevent that we go for a grand proposal to completely
change our way of moving forward (not just the way we move forward)
while there are potentially people opposing to this way of working.

So please give a +1/0/-1 to the general idea now, so we fell
comfortable spending the time in devising a new release
schedule/mechanism.

some of the highlights are:

it will start with 4.5 (4.4.x will be done with the old manual
cherry-pick process)
it will require everybody to create a branch for every fix or feature
they will contribute.
it will require devs to work mainly on a new branch call 'develop'
it will be every bodies responsibility to ensure that 'master' is at
all times releasable

thanks,
Daan

On Mon, Jul 28, 2014 at 4:39 PM, Daan Hoogland  wrote:

I am not for a grand proposal but ok, I can live with it.

It would be easiest to just vote for using the gitflow model.
Leo is preparing a page on how to do it. I don't know what the status
is on it. The vote for my part would be on the contents of that page.

On Mon, Jul 28, 2014 at 4:03 PM, Mike Tutkowski
  wrote:

Yeah, I was under the impression this decision would require a vote and
formal announcement, if it passes.

On Monday, July 28, 2014, Hugo Trippaers  wrote:


Agreed,  this kind of important decisions should be made by a vote.

Sebastien, Daan, can one of you kick of the vote thread? Preferably with a
condensed summary of the thread?

Cheers,

Hugo


On 28 jul. 2014, at 14:07, Ian Duffy>
wrote:


+1 to what Erik said.


On 28 July 2014 13:04, Erik Weber>

wrote:

On Mon, Jul 28, 2014 at 1:22 PM, Daan Hoogland
>

wrote:


H,

I see a lot of commits happening directly on the master branch. Yet
there were no counter arguments against the proposed gitflow and the
discussion around it. This leaves me with the idea that the thread is
largely ignored by the community. It is my understanding that we
agreed never to commit anything to master anymore that hasn't been
first committed to a branch and is merged back to master (instead of
cherry-picked). What mistake in thinking am I making here?



Not familiar with bylaws and the such, but wouldn't a change like this
require some sort of voting and potentially a more formal information?

Requiring everyone to read through a 50+ replies mail thread and

comprehend

it could be a bit much.

I would suggest an updated document that explain the expected workflow.

--
Erik




--
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkow...@solidfire.com
o: 303.746.7302
Advancing the way the world uses the cloud
*™*



--
Daan






--
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.ya...@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab


Find out more about ShapeBlue and our range of CloudStack related services

IaaS Cloud Design & Build
CSForge – rapid IaaS deployment framework
CloudStack

Re: [DISCUSS] git commit proces

2014-07-28 Thread Rohit Yadav

Hi Daan,

We've a page on Git [1] and recommended workflow for committers and
non-committers, should we update the workflow we want for committers
there and start a separate vote thread?

[1] https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git

Regards.

Daan Hoogland wrote:

Let me explain a little more about this lat mail of mine.
I was assuming a lot of context that most people may not have.
We want to start working differently with respect to our release
procedure and branching habits. The proposals that are out there and
about to be voted for are going to require a lot of work of a few
people and a lot of discipline from all of us.

My idea was to first vote for some of the habits that are part of the
gitflow discipline, but I am not strong opinionated about that.

I do want to prevent that we go for a grand proposal to completely
change our way of moving forward (not just the way we move forward)
while there are potentially people opposing to this way of working.

So please give a +1/0/-1 to the general idea now, so we fell
comfortable spending the time in devising a new release
schedule/mechanism.

some of the highlights are:

it will start with 4.5 (4.4.x will be done with the old manual
cherry-pick process)
it will require everybody to create a branch for every fix or feature
they will contribute.
it will require devs to work mainly on a new branch call 'develop'
it will be every bodies responsibility to ensure that 'master' is at
all times releasable

thanks,
Daan

On Mon, Jul 28, 2014 at 4:39 PM, Daan Hoogland  wrote:

I am not for a grand proposal but ok, I can live with it.

It would be easiest to just vote for using the gitflow model.
Leo is preparing a page on how to do it. I don't know what the status
is on it. The vote for my part would be on the contents of that page.

On Mon, Jul 28, 2014 at 4:03 PM, Mike Tutkowski
  wrote:

Yeah, I was under the impression this decision would require a vote and
formal announcement, if it passes.

On Monday, July 28, 2014, Hugo Trippaers  wrote:


Agreed,  this kind of important decisions should be made by a vote.

Sebastien, Daan, can one of you kick of the vote thread? Preferably with a
condensed summary of the thread?

Cheers,

Hugo


On 28 jul. 2014, at 14:07, Ian Duffy>
wrote:


+1 to what Erik said.


On 28 July 2014 13:04, Erik Weber>

wrote:

On Mon, Jul 28, 2014 at 1:22 PM, Daan Hoogland
>

wrote:


H,

I see a lot of commits happening directly on the master branch. Yet
there were no counter arguments against the proposed gitflow and the
discussion around it. This leaves me with the idea that the thread is
largely ignored by the community. It is my understanding that we
agreed never to commit anything to master anymore that hasn't been
first committed to a branch and is merged back to master (instead of
cherry-picked). What mistake in thinking am I making here?



Not familiar with bylaws and the such, but wouldn't a change like this
require some sort of voting and potentially a more formal information?

Requiring everyone to read through a 50+ replies mail thread and

comprehend

it could be a bit much.

I would suggest an updated document that explain the expected workflow.

--
Erik




--
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkow...@solidfire.com
o: 303.746.7302
Advancing the way the world uses the cloud
*™*



--
Daan






--
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.ya...@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab


Find out more about ShapeBlue and our range of CloudStack related services

IaaS Cloud Design & Build
CSForge – rapid IaaS deployment framework
CloudStack Consulting
CloudStack Infrastructure 
Support
CloudStack Bootcamp Training Courses

This email and any attachments to it may be confidential and are intended solely 
for the use of the individual to whom it is addressed. Any views or opinions 
expressed are solely those of the author and do not necessarily represent those of 
Shape Blue Ltd or related companies. If you are not the intended recipient of this 
email, you must neither take any action based upon its contents, nor copy or show 
it to anyone. Please contact the sender if you believe you have received this email 
in error. Shape Blue Ltd is a company incorporated in England & Wales. 
ShapeBlue Services India LLP is a company incorporated in India and is operated 
under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company 
incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue 
SA Pty Ltd is a company registered by The Republic of South Africa and is traded 
under license from Shape Blue Ltd. ShapeBlue is a re

Review Request 23986: Fixed 18 Test Case failures in test_egress_fw_rules.py

2014-07-28 Thread Chandan Purushothama

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23986/
---

Review request for cloudstack, Doug Clark, Raja Pullela, Rayees Namathponnan, 
sanjeev n, Santhosh Edukulla, sudha ponnaganti, and SrikanteswaraRao Talluri.


Repository: cloudstack-git


Description
---

18 Test cases in the "test_egress_fw_rules.py" script fails if the guest 
network is any network other than 10.1.1.0/24 network. The script assumes the 
guest network to be 10.1.1.0/24 network. Added code to the test suite so that 
the test cases will work for isolated guest network with any network cidr.


Diffs
-

  test/integration/component/test_egress_fw_rules.py 4b4b6ee 

Diff: https://reviews.apache.org/r/23986/diff/


Testing
---

Test By-default the communication from guest n/w to public n/w is NOT allowed. 
... === TestName: test_01_1_egress_fr1 | Status : SUCCESS ===
ok
Test By-default the communication from guest n/w to public n/w is allowed. ... 
=== TestName: test_01_egress_fr1 | Status : SUCCESS ===
ok
Test Allow Communication using Egress rule with CIDR + Port Range + Protocol. 
... === TestName: test_02_1_egress_fr2 | Status : SUCCESS ===
ok
Test Allow Communication using Egress rule with CIDR + Port Range + Protocol. 
... === TestName: test_02_egress_fr2 | Status : SUCCESS ===
ok
Test Communication blocked with network that is other than specified ... === 
TestName: test_03_1_egress_fr3 | Status : SUCCESS ===
ok
Test Communication blocked with network that is other than specified ... === 
TestName: test_03_egress_fr3 | Status : SUCCESS ===
ok
Test Create Egress rule and check the Firewall_Rules DB table ... === TestName: 
test_04_1_egress_fr4 | Status : SUCCESS ===
ok
Test Create Egress rule and check the Firewall_Rules DB table ... === TestName: 
test_04_egress_fr4 | Status : SUCCESS ===
ok
Test Create Egress rule and check the IP tables ... SKIP: Skip
Test Create Egress rule and check the IP tables ... SKIP: Skip
Test Create Egress rule without CIDR ... === TestName: test_06_1_egress_fr6 | 
Status : SUCCESS ===
ok
Test Create Egress rule without CIDR ... === TestName: test_06_egress_fr6 | 
Status : SUCCESS ===
ok
Test Create Egress rule without End Port ... === TestName: test_07_1_egress_fr7 
| Status : SUCCESS ===
ok
Test Create Egress rule without End Port ... === TestName: test_07_egress_fr7 | 
Status : SUCCESS ===
ok
Test Port Forwarding and Egress Conflict ... SKIP: Skip
Test Port Forwarding and Egress Conflict ... SKIP: Skip
Test Delete Egress rule ... === TestName: test_09_1_egress_fr9 | Status : 
SUCCESS ===
ok
Test Delete Egress rule ... === TestName: test_09_egress_fr9 | Status : SUCCESS 
===
ok
Test Invalid CIDR and Invalid Port ranges ... === TestName: 
test_10_1_egress_fr10 | Status : SUCCESS ===
ok
Test Invalid CIDR and Invalid Port ranges ... === TestName: test_10_egress_fr10 
| Status : SUCCESS ===
ok
Test Regression on Firewall + PF + LB + SNAT ... === TestName: 
test_11_1_egress_fr11 | Status : SUCCESS ===
ok
Test Regression on Firewall + PF + LB + SNAT ... === TestName: 
test_11_egress_fr11 | Status : SUCCESS ===
ok
Test Reboot Router ... === TestName: test_12_1_egress_fr12 | Status : SUCCESS 
===
ok
Test Reboot Router ... === TestName: test_12_egress_fr12 | Status : SUCCESS ===
ok
Test Redundant Router : Master failover ... === TestName: test_13_1_egress_fr13 
| Status : SUCCESS ===
ok
Test Redundant Router : Master failover ... === TestName: test_13_egress_fr13 | 
Status : SUCCESS ===
ok

--
Ran 26 tests in 35867.164s

OK (SKIP=4)


Thanks,

Chandan Purushothama



RE: [DISCUSS] git commit proces

2014-07-28 Thread Stephen Turner
I am +1 on the principle.

-- 
Stephen Turner


-Original Message-
From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] 
Sent: 28 July 2014 16:08
To: dev
Subject: Re: [DISCUSS] git commit proces

Let me explain a little more about this lat mail of mine.
I was assuming a lot of context that most people may not have.
We want to start working differently with respect to our release procedure and 
branching habits. The proposals that are out there and about to be voted for 
are going to require a lot of work of a few people and a lot of discipline from 
all of us.

My idea was to first vote for some of the habits that are part of the gitflow 
discipline, but I am not strong opinionated about that.

I do want to prevent that we go for a grand proposal to completely change our 
way of moving forward (not just the way we move forward) while there are 
potentially people opposing to this way of working.

So please give a +1/0/-1 to the general idea now, so we fell comfortable 
spending the time in devising a new release schedule/mechanism.

some of the highlights are:

it will start with 4.5 (4.4.x will be done with the old manual cherry-pick 
process) it will require everybody to create a branch for every fix or feature 
they will contribute.
it will require devs to work mainly on a new branch call 'develop'
it will be every bodies responsibility to ensure that 'master' is at all times 
releasable

thanks,
Daan

On Mon, Jul 28, 2014 at 4:39 PM, Daan Hoogland  wrote:
> I am not for a grand proposal but ok, I can live with it.
>
> It would be easiest to just vote for using the gitflow model.
> Leo is preparing a page on how to do it. I don't know what the status 
> is on it. The vote for my part would be on the contents of that page.
>
> On Mon, Jul 28, 2014 at 4:03 PM, Mike Tutkowski 
>  wrote:
>> Yeah, I was under the impression this decision would require a vote 
>> and formal announcement, if it passes.
>>
>> On Monday, July 28, 2014, Hugo Trippaers  wrote:
>>
>>> Agreed,  this kind of important decisions should be made by a vote.
>>>
>>> Sebastien, Daan, can one of you kick of the vote thread? Preferably 
>>> with a condensed summary of the thread?
>>>
>>> Cheers,
>>>
>>> Hugo
>>>
>>>
>>> On 28 jul. 2014, at 14:07, Ian Duffy >> >
>>> wrote:
>>>
>>> > +1 to what Erik said.
>>> >
>>> >
>>> > On 28 July 2014 13:04, Erik Weber >> > >
>>> wrote:
>>> >
>>> >> On Mon, Jul 28, 2014 at 1:22 PM, Daan Hoogland 
>>> >> >> >
>>> >> wrote:
>>> >>
>>> >>> H,
>>> >>>
>>> >>> I see a lot of commits happening directly on the master branch. 
>>> >>> Yet there were no counter arguments against the proposed gitflow 
>>> >>> and the discussion around it. This leaves me with the idea that 
>>> >>> the thread is largely ignored by the community. It is my 
>>> >>> understanding that we agreed never to commit anything to master 
>>> >>> anymore that hasn't been first committed to a branch and is 
>>> >>> merged back to master (instead of cherry-picked). What mistake in 
>>> >>> thinking am I making here?
>>> >>>
>>> >>>
>>> >>
>>> >> Not familiar with bylaws and the such, but wouldn't a change like 
>>> >> this require some sort of voting and potentially a more formal 
>>> >> information?
>>> >>
>>> >> Requiring everyone to read through a 50+ replies mail thread and
>>> comprehend
>>> >> it could be a bit much.
>>> >>
>>> >> I would suggest an updated document that explain the expected workflow.
>>> >>
>>> >> --
>>> >> Erik
>>> >>
>>>
>>>
>>
>> --
>> *Mike Tutkowski*
>> *Senior CloudStack Developer, SolidFire Inc.*
>> e: mike.tutkow...@solidfire.com
>> o: 303.746.7302
>> Advancing the way the world uses the cloud
>> *™*
>
>
>
> --
> Daan



--
Daan


[GitHub] cloudstack-docs-install pull request: Updated systemvm template pa...

2014-07-28 Thread pdion891
Github user pdion891 commented on the pull request:


https://github.com/apache/cloudstack-docs-install/pull/18#issuecomment-50366346
  
We will update the 4.3 documentation to reflect these updated 
systemvm-template. Although systemvm templates might to be different for 4.4 
version. Still waiting confirmation about this...


---
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.
---


Re: Marvin Package?

2014-07-28 Thread Ian Duffy
+1 on same version, makes sense to me.


On 28 July 2014 13:55, Hugo Trippaers  wrote:

>
> Sounds good to me.
>
> Cheers,
>
> Hugo
>
> On 28 jul. 2014, at 14:33, Rohit Yadav  wrote:
>
> > Hi Hugo,
> >
> > Does it make sense to simply use the same version as CloudStack from
> > next Marvin releases? This is because with each CloudStack release and
> > possible API changes, the Marvin cloudstackAPI python module will
> > change. Other than that there are couple of API marshaling/unmarshaling,
> > signature logic and HTTP stuff but that too changes with CloudStack.
> >
> > Regards.
> >
> > Hugo Trippaers wrote:
> >> Before we start with Marvin releases we should discuss versioning i
> think.
> >>
> >> At the moment all marvin packages are shipped with version 1.0, if we
> want to take marvin releases serious we need to start with versions
> whenever the something in marvin changes.
> >>
> >>
> >> Cheers.
> >>
> >> Hugo
> >>
> >>
> >> On 28 jul. 2014, at 14:20, Rohit Yadav
>  wrote:
> >>
> >>> Hi,
> >>>
> >>> I think since the Marvin package tightly depends on CloudStack, it's
> >>> release can happen along with CloudStack release.
> >>>
> >>> @Prasanna -- Can you add couple of people as owner/admins to the
> >>> cloudstack-marvin pypi package?
> >>>
> >>> Regards.
> >>>
> >>> David Nalley wrote:
>  I wonder if we need to move this to its own release as we did with
> cloudmonkey?
> 
>  --David
> 
>  On Mon, Jul 28, 2014 at 8:05 AM, Ian Duffy   wrote:
> >> I believe no, atleast the latest changes under master or
> 4.4-forward.
> > Alright, Thanks. I believe all changes for it within 4.4-forward
> should now
> > be in 4.4?
> >
> > @Prasanna since you hold the account on pypi holding the name
> > "cloudstack-marvin" can you make the upload?
> > Tar at:
> http://jenkins.buildacloud.org/view/4.4/job/cloudstack-4.4-marvin/
> >
> > Thanks,
> >
> > Ian
> >
> >
> > On 28 July 2014 01:52, Santhosh Edukulla<
> santhosh.eduku...@citrix.com>
> > wrote:
> >
> >> I believe no, atleast the latest changes under master or
> 4.4-forward.
> >>
> >> Santhosh
> >> 
> >> From: Ian Duffy [i...@ianduffy.ie]
> >> Sent: Sunday, July 27, 2014 4:47 PM
> >> To: CloudStack Dev; Santhosh Edukulla; Prasanna Santhanam
> >> Subject: Marvin Package?
> >>
> >> Hi,
> >>
> >> Do we have a binary of marvin that users can download independent
> to the
> >> management server rpms? Other than grabbing the tar.gz from jenkins.
> >>
> >> I was hoping it would be published on pypi. Prasanna seems to have
> a page
> >> for it there but there are no uploads:
> >> https://pypi.python.org/pypi/cloudstack-marvin/0.1.0
> >>
> >> Ideally I want pip install cloudstack-marvin or easy_install
> >> cloudstack-marvin.
> >>
> >> Thanks,
> >>
> >> Ian
> >>
> >>> --
> >>> Rohit Yadav
> >>> Software Architect, ShapeBlue
> >>> M. +41 779015219 | rohit.ya...@shapeblue.com
> >>> Blog: bhaisaab.org | Twitter: @_bhaisaab
> >>>
> >>>
> >>> Find out more about ShapeBlue and our range of CloudStack related
> services
> >>>
> >>> IaaS Cloud Design&  Build<
> http://shapeblue.com/iaas-cloud-design-and-build//>
> >>> CSForge – rapid IaaS deployment framework<
> http://shapeblue.com/csforge/>
> >>> CloudStack Consulting
> >>> CloudStack Infrastructure Support<
> http://shapeblue.com/cloudstack-infrastructure-support/>
> >>> CloudStack Bootcamp Training Courses<
> http://shapeblue.com/cloudstack-training/>
> >>>
> >>> This email and any attachments to it may be confidential and are
> intended solely for the use of the individual to whom it is addressed. Any
> views or opinions expressed are solely those of the author and do not
> necessarily represent those of Shape Blue Ltd or related companies. If you
> are not the intended recipient of this email, you must neither take any
> action based upon its contents, nor copy or show it to anyone. Please
> contact the sender if you believe you have received this email in error.
> Shape Blue Ltd is a company incorporated in England&  Wales. ShapeBlue
> Services India LLP is a company incorporated in India and is operated under
> license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a
> company incorporated in Brasil and is operated under license from Shape
> Blue Ltd. ShapeBlue SA Pty Ltd is a company registered by The Republic of
> South Africa and is traded under license from Shape Blue Ltd. ShapeBlue is
> a registered trademark.
> >>
> >
> > --
> > Rohit Yadav
> > Software Architect, ShapeBlue
> > M. +41 779015219 | rohit.ya...@shapeblue.com
> > Blog: bhaisaab.org | Twitter: @_bhaisaab
> >
> >
> > Find out more about ShapeBlue and our range of CloudStack related
> services
> >
> > IaaS Cloud Design & Build<
> http://shapeblue.com/iaas-cloud-design-and-build//>

Re: Review Request 23884: Fixed CLOUDSTACK-5212: [UI]Need Support for the LXC for the Report sockets

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23884/#review48880
---


Commit f1039b782e5fdef8129088929c42fdf2f2909b5a in cloudstack's branch 
refs/heads/master from Rajani Karuturi
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=f1039b7 ]

Fixed CLOUDSTACK-5212: [UI]Need Support for the LXC for the Report sockets


- ASF Subversion and Git Services


On July 24, 2014, 11:51 a.m., Rajani Karuturi wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23884/
> ---
> 
> (Updated July 24, 2014, 11:51 a.m.)
> 
> 
> Review request for cloudstack and Jessica Wang.
> 
> 
> Bugs: CLOUDSTACK-5212
> https://issues.apache.org/jira/browse/CLOUDSTACK-5212
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> added LXC to the list of hypervisors in js.
> 
> 
> Diffs
> -
> 
>   ui/scripts/system.js 9012580 
> 
> Diff: https://reviews.apache.org/r/23884/diff/
> 
> 
> Testing
> ---
> 
> manually tested that it shows up in the sockets page
> 
> 
> Thanks,
> 
> Rajani Karuturi
> 
>



Re: Review Request 23884: Fixed CLOUDSTACK-5212: [UI]Need Support for the LXC for the Report sockets

2014-07-28 Thread Jessica Wang

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23884/#review48881
---

Ship it!


Ship It!

- Jessica Wang


On July 24, 2014, 11:51 a.m., Rajani Karuturi wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23884/
> ---
> 
> (Updated July 24, 2014, 11:51 a.m.)
> 
> 
> Review request for cloudstack and Jessica Wang.
> 
> 
> Bugs: CLOUDSTACK-5212
> https://issues.apache.org/jira/browse/CLOUDSTACK-5212
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> added LXC to the list of hypervisors in js.
> 
> 
> Diffs
> -
> 
>   ui/scripts/system.js 9012580 
> 
> Diff: https://reviews.apache.org/r/23884/diff/
> 
> 
> Testing
> ---
> 
> manually tested that it shows up in the sockets page
> 
> 
> Thanks,
> 
> Rajani Karuturi
> 
>



Review Request 23991: CLOUDSTACK-7195: log wide exceptions in security_group.py

2014-07-28 Thread Vincent Bernat

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23991/
---

Review request for cloudstack.


Bugs: CLOUDSTACK-7195
https://issues.apache.org/jira/browse/CLOUDSTACK-7195


Repository: cloudstack-git


Description
---

Some try/except in security_group.py catch a lot of exceptions. There
was already one fixed in CLOUDSTACK-1052. Here is another one. We use
logging.exception() to log those exceptions.


Diffs
-

  scripts/vm/network/security_group.py 704b27982021 

Diff: https://reviews.apache.org/r/23991/diff/


Testing
---


Thanks,

Vincent Bernat



Re: Review Request 23922: Fixed CLOUDSTACK-6980: UI for RegisterTemplate API does not expose requireshvm parameter

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23922/#review48886
---


Commit 32e8fda965252322eccda01e14f854051d665ed0 in cloudstack's branch 
refs/heads/master from Rajani Karuturi
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=32e8fda ]

Fixed CLOUDSTACK-6980: UI for RegisterTemplate API does not expose requireshvm 
parameter


- ASF Subversion and Git Services


On July 25, 2014, 9:58 a.m., Rajani Karuturi wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23922/
> ---
> 
> (Updated July 25, 2014, 9:58 a.m.)
> 
> 
> Review request for cloudstack and Jessica Wang.
> 
> 
> Bugs: CLOUDSTACK-6980
> https://issues.apache.org/jira/browse/CLOUDSTACK-6980
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> added requireshvm to the create form fields
> 
> 
> Diffs
> -
> 
>   client/WEB-INF/classes/resources/messages.properties 271ffec 
>   ui/dictionary.jsp beb082b 
>   ui/scripts/docs.js 2075e30 
>   ui/scripts/templates.js e12927c 
> 
> Diff: https://reviews.apache.org/r/23922/diff/
> 
> 
> Testing
> ---
> 
> manually tested register template
> 
> 
> Thanks,
> 
> Rajani Karuturi
> 
>



Re: Review Request 23922: Fixed CLOUDSTACK-6980: UI for RegisterTemplate API does not expose requireshvm parameter

2014-07-28 Thread Jessica Wang

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23922/#review48887
---

Ship it!


Ship It!

- Jessica Wang


On July 25, 2014, 9:58 a.m., Rajani Karuturi wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23922/
> ---
> 
> (Updated July 25, 2014, 9:58 a.m.)
> 
> 
> Review request for cloudstack and Jessica Wang.
> 
> 
> Bugs: CLOUDSTACK-6980
> https://issues.apache.org/jira/browse/CLOUDSTACK-6980
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> added requireshvm to the create form fields
> 
> 
> Diffs
> -
> 
>   client/WEB-INF/classes/resources/messages.properties 271ffec 
>   ui/dictionary.jsp beb082b 
>   ui/scripts/docs.js 2075e30 
>   ui/scripts/templates.js e12927c 
> 
> Diff: https://reviews.apache.org/r/23922/diff/
> 
> 
> Testing
> ---
> 
> manually tested register template
> 
> 
> Thanks,
> 
> Rajani Karuturi
> 
>



[BUG] upgrade path to 4.4.1

2014-07-28 Thread Will Stevens
I am guessing this is a bug, but I want to post it here before I create a
ticket.  I have pulled down the latest code from the 4.4 branch (which
results in the 4.4.1 release).

I am able to compile the code without any issues, but when I run the
following command to deploy my DB it fails.

$ mvn -P developer -pl developer,tools/devcloud -Ddeploydb

The error is:
[ERROR] Failed to execute goal
org.codehaus.mojo:exec-maven-plugin:1.2.1:java (create-schema) on project
cloud-developer: An exception occured while executing the Java class. null:
InvocationTargetException: The end upgrade version is actually at 4.4.0 but
our management server code version is at 4.4.1-SNAPSHOT -> [Help 1]

It looks like there is no upgrade path from 4.4.0 to 4.4.1, but I am just
taking that from the error.

I checked the './setup/db/db' directory and there is no file for
'schema-440to441.sql'.  Also, I looked in
'./engine/schema/src/com/cloud/upgrade/dao' and there is no
'Upgrade440to441.java' file.  Since this file does not exist, it is
obviously not included in the
'./engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java' file
either (which is where the error originates from).

I have included the entire output for completeness...

Listening for transport dt_socket at address: 8787
[INFO] Scanning for projects...
[INFO]

[INFO] Reactor Build Order:
[INFO]
[INFO] Apache CloudStack Developer Mode
[INFO] Apache CloudStack DevCloud
[INFO]

[INFO]

[INFO] Building Apache CloudStack Developer Mode 4.4.1-SNAPSHOT
[INFO]

[INFO]
[INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle) @
cloud-developer ---
[INFO] Starting audit...
Audit done.

[INFO]
[INFO] --- properties-maven-plugin:1.0-alpha-2:read-project-properties
(default) @ cloud-developer ---
[WARNING] Ignoring missing properties file:
/mnt/hgfs/cs/cloudstack/developer/../utils/conf/db.properties.override
[INFO]
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @
cloud-developer ---
[INFO]
[INFO] --- maven-antrun-plugin:1.7:run (default) @ cloud-developer ---
[INFO] Executing tasks

main:
[INFO] Executed tasks
[INFO]
[INFO] >>> exec-maven-plugin:1.2.1:java (create-schema) @ cloud-developer
>>>
[INFO]
[INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle) @
cloud-developer ---
[INFO] Starting audit...
Audit done.

[INFO]
[INFO] <<< exec-maven-plugin:1.2.1:java (create-schema) @ cloud-developer
<<<
[INFO]
[INFO] --- exec-maven-plugin:1.2.1:java (create-schema) @ cloud-developer
---
log4j:WARN No appenders could be found for logger
(org.springframework.core.env.StandardEnvironment).
log4j:WARN Please initialize the log4j system properly.
log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for
more info.
> WARNING: Provided file does not exist:
/mnt/hgfs/cs/cloudstack/developer/../utils/conf/db.properties.override
> WARNING: Provided file does not exist:
/mnt/hgfs/cs/cloudstack/developer/developer-prefill.sql.override
> Initializing database=cloud with host=localhost port=3306
username=cloud password=cloud
> Running query: drop database if exists `cloud`
> Running query: create database `cloud`
> Running query: GRANT ALL ON cloud.* to 'cloud'@`localhost`
identified by 'cloud'
> Running query: GRANT ALL ON cloud.* to 'cloud'@`%` identified
by 'cloud'
> Initializing database=cloud_usage with host=localhost port=3306
username=cloud password=cloud
> Running query: drop database if exists `cloud_usage`
> Running query: create database `cloud_usage`
> Running query: GRANT ALL ON cloud_usage.* to 'cloud'@`localhost`
identified by 'cloud'
> Running query: GRANT ALL ON cloud_usage.* to 'cloud'@`%`
identified by 'cloud'
> Initializing database=cloudbridge with host=localhost port=3306
username=cloud password=cloud
> Running query: drop database if exists `cloudbridge`
> Running query: create database `cloudbridge`
> Running query: GRANT ALL ON cloudbridge.* to 'cloud'@`localhost`
identified by 'cloud'
> Running query: GRANT ALL ON cloudbridge.* to 'cloud'@`%`
identified by 'cloud'
> Processing SQL file at
/mnt/hgfs/cs/cloudstack/developer/target/db/create-schema.sql
> Processing SQL file at
/mnt/hgfs/cs/cloudstack/developer/target/db/create-schema-premium.sql
> Processing SQL file at
/mnt/hgfs/cs/cloudstack/developer/target/db/templates.sql
> Processing SQL file at
/mnt/hgfs/cs/cloudstack/developer/target/db/cloudbridge_schema.sql
> Processing SQL file at
/mnt/hgfs/cs/cloudstack/developer/target/db/cloudbridge_multipart.sql
> Processing SQL file at
/mnt/hgfs/cs/cloudstack/developer/tar

building cloudstack

2014-07-28 Thread Elapavuluri, Jaya
Hello,



I had setup cloudstack 4.4 environment which was running fine.

I recently did a git pull to get the updates after which when I tried  to mvn 
-Pdeveloper -pl developer -Ddeploydb I was encountering with the following 
error.


[ERROR] Failed to execute goal org.codehaus.mojo:exec-maven-plugin:1.2.1:java 
(create-schema) on project cloud-developer: An exception occured while 
executing the Java class. null: InvocationTargetException: The end upgrade 
version is actually at 4.4.0 but our management server code version is at 
4.4.1-SNAPSHOT -> [Help 1]

However mvn -P developer,systemvm clean install gives a build success.

Can someone share their knowledge on this?


Build failed in Jenkins: build-master-noredist #3173

2014-07-28 Thread jenkins
See 

Changes:

[anthony.xu] completed the new vmsync TODOs in the code.

--
[...truncated 5892 lines...]
[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-plugin-network-vsp ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-plugin-network-vsp ---
[INFO] Compiling 43 source files to 

[INFO] 
[INFO] --- license-maven-plugin:2.5:check (cloudstack-checklicence) @ 
cloud-plugin-network-vsp ---
[INFO] Checking licenses...
[INFO] 
[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-plugin-network-vsp ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-plugin-network-vsp ---
[INFO] Compiling 5 source files to 

[INFO] 
[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-plugin-network-vsp ---
[INFO] Surefire report directory: 


---
 T E S T S
---
Running com.cloud.network.element.NuageVspElementTest
log4j:WARN No appenders could be found for logger 
(com.cloud.network.element.NuageVspElement).
log4j:WARN Please initialize the log4j system properly.
log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for more 
info.
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.654 sec
Running com.cloud.network.manager.NuageVspManagerTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.124 sec
Running com.cloud.network.resource.NuageVspResourceTest
Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.044 sec
Running com.cloud.network.sync.NuageVspSyncTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec
Running com.cloud.network.guru.NuageVspGuestNetworkGuruTest
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.192 sec

Results :

Tests run: 29, Failures: 0, Errors: 0, Skipped: 0

[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ cloud-plugin-network-vsp ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ 
cloud-plugin-network-vsp ---
[INFO] 
[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-plugin-network-vsp ---
[INFO] Installing 

 to 
/jenkins/.m2/repository/org/apache/cloudstack/cloud-plugin-network-vsp/4.5.0-SNAPSHOT/cloud-plugin-network-vsp-4.5.0-SNAPSHOT.jar
[INFO] Installing 

 to 
/jenkins/.m2/repository/org/apache/cloudstack/cloud-plugin-network-vsp/4.5.0-SNAPSHOT/cloud-plugin-network-vsp-4.5.0-SNAPSHOT.pom
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack VMware Base 4.5.0-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-vmware-base ---
[INFO] Deleting 

 (includes = [**/*], excludes = [])
[INFO] Deleting 
 
(includes = [target, dist], excludes = [])
[INFO] 
[INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle) @ 
cloud-vmware-base ---
[INFO] Starting audit...
Audit done.

[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-vmware-base ---
[INFO] 
[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-vmware-base ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 


Re: [BUG] upgrade path to 4.4.1

2014-07-28 Thread Daan Hoogland
Will,

this is a bug due to our upgrade scheme: we have not yet implemented
it so it is missing. We need to implement some (possibly empty)
upgrade path to make sure this will still work for 4.4.1.

On Mon, Jul 28, 2014 at 9:46 PM, Will Stevens  wrote:
> I am guessing this is a bug, but I want to post it here before I create a
> ticket.  I have pulled down the latest code from the 4.4 branch (which
> results in the 4.4.1 release).
>
> I am able to compile the code without any issues, but when I run the
> following command to deploy my DB it fails.
>
> $ mvn -P developer -pl developer,tools/devcloud -Ddeploydb
>
> The error is:
> [ERROR] Failed to execute goal
> org.codehaus.mojo:exec-maven-plugin:1.2.1:java (create-schema) on project
> cloud-developer: An exception occured while executing the Java class. null:
> InvocationTargetException: The end upgrade version is actually at 4.4.0 but
> our management server code version is at 4.4.1-SNAPSHOT -> [Help 1]
>
> It looks like there is no upgrade path from 4.4.0 to 4.4.1, but I am just
> taking that from the error.
>
> I checked the './setup/db/db' directory and there is no file for
> 'schema-440to441.sql'.  Also, I looked in
> './engine/schema/src/com/cloud/upgrade/dao' and there is no
> 'Upgrade440to441.java' file.  Since this file does not exist, it is
> obviously not included in the
> './engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java' file
> either (which is where the error originates from).
>
> I have included the entire output for completeness...
>
> Listening for transport dt_socket at address: 8787
> [INFO] Scanning for projects...
> [INFO]
> 
> [INFO] Reactor Build Order:
> [INFO]
> [INFO] Apache CloudStack Developer Mode
> [INFO] Apache CloudStack DevCloud
> [INFO]
>
> [INFO]
> 
> [INFO] Building Apache CloudStack Developer Mode 4.4.1-SNAPSHOT
> [INFO]
> 
> [INFO]
> [INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle) @
> cloud-developer ---
> [INFO] Starting audit...
> Audit done.
>
> [INFO]
> [INFO] --- properties-maven-plugin:1.0-alpha-2:read-project-properties
> (default) @ cloud-developer ---
> [WARNING] Ignoring missing properties file:
> /mnt/hgfs/cs/cloudstack/developer/../utils/conf/db.properties.override
> [INFO]
> [INFO] --- maven-remote-resources-plugin:1.3:process (default) @
> cloud-developer ---
> [INFO]
> [INFO] --- maven-antrun-plugin:1.7:run (default) @ cloud-developer ---
> [INFO] Executing tasks
>
> main:
> [INFO] Executed tasks
> [INFO]
> [INFO] >>> exec-maven-plugin:1.2.1:java (create-schema) @ cloud-developer

> [INFO]
> [INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle) @
> cloud-developer ---
> [INFO] Starting audit...
> Audit done.
>
> [INFO]
> [INFO] <<< exec-maven-plugin:1.2.1:java (create-schema) @ cloud-developer
> <<<
> [INFO]
> [INFO] --- exec-maven-plugin:1.2.1:java (create-schema) @ cloud-developer
> ---
> log4j:WARN No appenders could be found for logger
> (org.springframework.core.env.StandardEnvironment).
> log4j:WARN Please initialize the log4j system properly.
> log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for
> more info.
> > WARNING: Provided file does not exist:
> /mnt/hgfs/cs/cloudstack/developer/../utils/conf/db.properties.override
> > WARNING: Provided file does not exist:
> /mnt/hgfs/cs/cloudstack/developer/developer-prefill.sql.override
> > Initializing database=cloud with host=localhost port=3306
> username=cloud password=cloud
> > Running query: drop database if exists `cloud`
> > Running query: create database `cloud`
> > Running query: GRANT ALL ON cloud.* to 'cloud'@`localhost`
> identified by 'cloud'
> > Running query: GRANT ALL ON cloud.* to 'cloud'@`%` identified
> by 'cloud'
> > Initializing database=cloud_usage with host=localhost port=3306
> username=cloud password=cloud
> > Running query: drop database if exists `cloud_usage`
> > Running query: create database `cloud_usage`
> > Running query: GRANT ALL ON cloud_usage.* to 'cloud'@`localhost`
> identified by 'cloud'
> > Running query: GRANT ALL ON cloud_usage.* to 'cloud'@`%`
> identified by 'cloud'
> > Initializing database=cloudbridge with host=localhost port=3306
> username=cloud password=cloud
> > Running query: drop database if exists `cloudbridge`
> > Running query: create database `cloudbridge`
> > Running query: GRANT ALL ON cloudbridge.* to 'cloud'@`localhost`
> identified by 'cloud'
> > Running query: GRANT ALL ON cloudbridge.* to 'cloud'@`%`
> identified by 'cloud'
> > Processing SQL file at
> /mnt/hgfs/cs/cloudstack/developer/target/db/create-schema.sq

Re: [DISCUSS] git commit proces

2014-07-28 Thread Daan Hoogland
Rohit,

Let's change the howto-use-git page after the vote.

On Mon, Jul 28, 2014 at 6:47 PM, Stephen Turner
 wrote:
> I am +1 on the principle.
>
> --
> Stephen Turner
>
>
> -Original Message-
> From: Daan Hoogland [mailto:daan.hoogl...@gmail.com]
> Sent: 28 July 2014 16:08
> To: dev
> Subject: Re: [DISCUSS] git commit proces
>
> Let me explain a little more about this lat mail of mine.
> I was assuming a lot of context that most people may not have.
> We want to start working differently with respect to our release procedure 
> and branching habits. The proposals that are out there and about to be voted 
> for are going to require a lot of work of a few people and a lot of 
> discipline from all of us.
>
> My idea was to first vote for some of the habits that are part of the gitflow 
> discipline, but I am not strong opinionated about that.
>
> I do want to prevent that we go for a grand proposal to completely change our 
> way of moving forward (not just the way we move forward) while there are 
> potentially people opposing to this way of working.
>
> So please give a +1/0/-1 to the general idea now, so we fell comfortable 
> spending the time in devising a new release schedule/mechanism.
>
> some of the highlights are:
>
> it will start with 4.5 (4.4.x will be done with the old manual cherry-pick 
> process) it will require everybody to create a branch for every fix or 
> feature they will contribute.
> it will require devs to work mainly on a new branch call 'develop'
> it will be every bodies responsibility to ensure that 'master' is at all 
> times releasable
>
> thanks,
> Daan
>
> On Mon, Jul 28, 2014 at 4:39 PM, Daan Hoogland  
> wrote:
>> I am not for a grand proposal but ok, I can live with it.
>>
>> It would be easiest to just vote for using the gitflow model.
>> Leo is preparing a page on how to do it. I don't know what the status
>> is on it. The vote for my part would be on the contents of that page.
>>
>> On Mon, Jul 28, 2014 at 4:03 PM, Mike Tutkowski
>>  wrote:
>>> Yeah, I was under the impression this decision would require a vote
>>> and formal announcement, if it passes.
>>>
>>> On Monday, July 28, 2014, Hugo Trippaers  wrote:
>>>
 Agreed,  this kind of important decisions should be made by a vote.

 Sebastien, Daan, can one of you kick of the vote thread? Preferably
 with a condensed summary of the thread?

 Cheers,

 Hugo


 On 28 jul. 2014, at 14:07, Ian Duffy >>> >
 wrote:

 > +1 to what Erik said.
 >
 >
 > On 28 July 2014 13:04, Erik Weber >>> > >
 wrote:
 >
 >> On Mon, Jul 28, 2014 at 1:22 PM, Daan Hoogland
 >> >>> >
 >> wrote:
 >>
 >>> H,
 >>>
 >>> I see a lot of commits happening directly on the master branch.
 >>> Yet there were no counter arguments against the proposed gitflow
 >>> and the discussion around it. This leaves me with the idea that
 >>> the thread is largely ignored by the community. It is my
 >>> understanding that we agreed never to commit anything to master
 >>> anymore that hasn't been first committed to a branch and is
 >>> merged back to master (instead of cherry-picked). What mistake in 
 >>> thinking am I making here?
 >>>
 >>>
 >>
 >> Not familiar with bylaws and the such, but wouldn't a change like
 >> this require some sort of voting and potentially a more formal 
 >> information?
 >>
 >> Requiring everyone to read through a 50+ replies mail thread and
 comprehend
 >> it could be a bit much.
 >>
 >> I would suggest an updated document that explain the expected workflow.
 >>
 >> --
 >> Erik
 >>


>>>
>>> --
>>> *Mike Tutkowski*
>>> *Senior CloudStack Developer, SolidFire Inc.*
>>> e: mike.tutkow...@solidfire.com
>>> o: 303.746.7302
>>> Advancing the way the world uses the cloud
>>> *™*
>>
>>
>>
>> --
>> Daan
>
>
>
> --
> Daan



-- 
Daan


Re: [BUG] upgrade path to 4.4.1

2014-07-28 Thread Will Stevens
If there is documentation for how to do this somewhere, I could implement
an empty upgrade path.  Do we know if there are database changes needed for
the 4.4.1 upgrade from 4.4.0?  How would that requirement be captured?

Cheers,

Will


*Will STEVENS*
Lead Developer

*CloudOps* *| *Cloud Solutions Experts
420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6
w cloudops.com *|* tw @CloudOps_


On Mon, Jul 28, 2014 at 4:52 PM, Daan Hoogland 
wrote:

> Will,
>
> this is a bug due to our upgrade scheme: we have not yet implemented
> it so it is missing. We need to implement some (possibly empty)
> upgrade path to make sure this will still work for 4.4.1.
>
> On Mon, Jul 28, 2014 at 9:46 PM, Will Stevens 
> wrote:
> > I am guessing this is a bug, but I want to post it here before I create a
> > ticket.  I have pulled down the latest code from the 4.4 branch (which
> > results in the 4.4.1 release).
> >
> > I am able to compile the code without any issues, but when I run the
> > following command to deploy my DB it fails.
> >
> > $ mvn -P developer -pl developer,tools/devcloud -Ddeploydb
> >
> > The error is:
> > [ERROR] Failed to execute goal
> > org.codehaus.mojo:exec-maven-plugin:1.2.1:java (create-schema) on project
> > cloud-developer: An exception occured while executing the Java class.
> null:
> > InvocationTargetException: The end upgrade version is actually at 4.4.0
> but
> > our management server code version is at 4.4.1-SNAPSHOT -> [Help 1]
> >
> > It looks like there is no upgrade path from 4.4.0 to 4.4.1, but I am just
> > taking that from the error.
> >
> > I checked the './setup/db/db' directory and there is no file for
> > 'schema-440to441.sql'.  Also, I looked in
> > './engine/schema/src/com/cloud/upgrade/dao' and there is no
> > 'Upgrade440to441.java' file.  Since this file does not exist, it is
> > obviously not included in the
> > './engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java' file
> > either (which is where the error originates from).
> >
> > I have included the entire output for completeness...
> >
> > Listening for transport dt_socket at address: 8787
> > [INFO] Scanning for projects...
> > [INFO]
> > 
> > [INFO] Reactor Build Order:
> > [INFO]
> > [INFO] Apache CloudStack Developer Mode
> > [INFO] Apache CloudStack DevCloud
> > [INFO]
> >
> > [INFO]
> > 
> > [INFO] Building Apache CloudStack Developer Mode 4.4.1-SNAPSHOT
> > [INFO]
> > 
> > [INFO]
> > [INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle) @
> > cloud-developer ---
> > [INFO] Starting audit...
> > Audit done.
> >
> > [INFO]
> > [INFO] --- properties-maven-plugin:1.0-alpha-2:read-project-properties
> > (default) @ cloud-developer ---
> > [WARNING] Ignoring missing properties file:
> > /mnt/hgfs/cs/cloudstack/developer/../utils/conf/db.properties.override
> > [INFO]
> > [INFO] --- maven-remote-resources-plugin:1.3:process (default) @
> > cloud-developer ---
> > [INFO]
> > [INFO] --- maven-antrun-plugin:1.7:run (default) @ cloud-developer ---
> > [INFO] Executing tasks
> >
> > main:
> > [INFO] Executed tasks
> > [INFO]
> > [INFO] >>> exec-maven-plugin:1.2.1:java (create-schema) @ cloud-developer
> 
> > [INFO]
> > [INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle) @
> > cloud-developer ---
> > [INFO] Starting audit...
> > Audit done.
> >
> > [INFO]
> > [INFO] <<< exec-maven-plugin:1.2.1:java (create-schema) @ cloud-developer
> > <<<
> > [INFO]
> > [INFO] --- exec-maven-plugin:1.2.1:java (create-schema) @ cloud-developer
> > ---
> > log4j:WARN No appenders could be found for logger
> > (org.springframework.core.env.StandardEnvironment).
> > log4j:WARN Please initialize the log4j system properly.
> > log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for
> > more info.
> > > WARNING: Provided file does not exist:
> > /mnt/hgfs/cs/cloudstack/developer/../utils/conf/db.properties.override
> > > WARNING: Provided file does not exist:
> > /mnt/hgfs/cs/cloudstack/developer/developer-prefill.sql.override
> > > Initializing database=cloud with host=localhost port=3306
> > username=cloud password=cloud
> > > Running query: drop database if exists `cloud`
> > > Running query: create database `cloud`
> > > Running query: GRANT ALL ON cloud.* to 'cloud'@`localhost`
> > identified by 'cloud'
> > > Running query: GRANT ALL ON cloud.* to 'cloud'@`%`
> identified
> > by 'cloud'
> > > Initializing database=cloud_usage with host=localhost port=3306
> > username=cloud password=cloud
> > > Running query: drop database if exists `cloud_usage`
> > > Running query: create database `cloud_usage`
> > > Running query: GRANT ALL ON cloud_usage.* to 'cloud'@

Re: building cloudstack

2014-07-28 Thread Rohit Yadav

Hi Jaya,

Which branch are you on? It's a bug we'll fix it by placing an empty
upgrade path for 4.4.1 version.

The upgrade paths are available only between released versions only, so
it fails as there is no upgrade path for 4.4.1-SNAPSHOT.

Regards.

Elapavuluri, Jaya wrote:

Hello,



I had setup cloudstack 4.4 environment which was running fine.

I recently did a git pull to get the updates after which when I tried  to mvn 
-Pdeveloper -pl developer -Ddeploydb I was encountering with the following 
error.


[ERROR] Failed to execute goal org.codehaus.mojo:exec-maven-plugin:1.2.1:java 
(create-schema) on project cloud-developer: An exception occured while executing 
the Java class. null: InvocationTargetException: The end upgrade version is 
actually at 4.4.0 but our management server code version is at 4.4.1-SNAPSHOT 
->  [Help 1]

However mvn -P developer,systemvm clean install gives a build success.

Can someone share their knowledge on this?



--
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.ya...@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab


Find out more about ShapeBlue and our range of CloudStack related services

IaaS Cloud Design & Build
CSForge – rapid IaaS deployment framework
CloudStack Consulting
CloudStack Infrastructure 
Support
CloudStack Bootcamp Training Courses

This email and any attachments to it may be confidential and are intended solely 
for the use of the individual to whom it is addressed. Any views or opinions 
expressed are solely those of the author and do not necessarily represent those of 
Shape Blue Ltd or related companies. If you are not the intended recipient of this 
email, you must neither take any action based upon its contents, nor copy or show 
it to anyone. Please contact the sender if you believe you have received this email 
in error. Shape Blue Ltd is a company incorporated in England & Wales. 
ShapeBlue Services India LLP is a company incorporated in India and is operated 
under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company 
incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue 
SA Pty Ltd is a company registered by The Republic of South Africa and is traded 
under license from Shape Blue Ltd. ShapeBlue is a registered trademark.


Re: Review Request 20659: CLOUDSTACK-5674: Fixed cloudstackConnection.py to return FAILED in case of well handled exceptions returning from server having jobresultcode as 530

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/20659/#review48899
---


Commit 4a99cf851966512ae90633b7ed7d7954b6d0ac9a in cloudstack's branch 
refs/heads/4.4 from SrikanteswaraRao Talluri
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=4a99cf8 ]

CLOUDSTACK-5674:Fixed pep8 errors in python files in marvin folder
Signed-off-by: SrikanteswaraRao Talluri 

(cherry picked from commit 4f1f182cba5579da2fc7ce1f02019a0afa00efeb)

Conflicts:
tools/marvin/marvin/lib/base.py


- ASF Subversion and Git Services


On May 12, 2014, 6:04 a.m., Gaurav Aradhye wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/20659/
> ---
> 
> (Updated May 12, 2014, 6:04 a.m.)
> 
> 
> Review request for cloudstack and Girish Shilamkar.
> 
> 
> Bugs: CLOUDSTACK-5674
> https://issues.apache.org/jira/browse/CLOUDSTACK-5674
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> In case of well handled exceptions returned from the server with proper error 
> message, the response was as it is returned. Instead, it should check the 
> jobresultcode. If the jobresultcode is 530, it means that exception is 
> returned from server. In this case we should return FAILED.
> 
> 
> Diffs
> -
> 
>   tools/marvin/marvin/cloudstackConnection.py 8044da7 
>   tools/marvin/marvin/codes.py ef49c0c 
> 
> Diff: https://reviews.apache.org/r/20659/diff/
> 
> 
> Testing
> ---
> 
> Yes
> 
> 
> Thanks,
> 
> Gaurav Aradhye
> 
>



Re: Review Request 23677: CLOUDSTACK-7024: Resolved cleanup issue in test script

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23677/#review48901
---


Commit f055ec52d9d751df86e42aeb6a2aace2ceea4567 in cloudstack's branch 
refs/heads/4.4 from Ashutosh K
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=f055ec5 ]

CLOUDSTACK-7024: Resolved cleanup issue in test script

(cherry picked from commit ec49669f1cf525b207889ae13a8a2b01a0271933)


- ASF Subversion and Git Services


On July 18, 2014, 12:08 p.m., Ashutosh Kelkar wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23677/
> ---
> 
> (Updated July 18, 2014, 12:08 p.m.)
> 
> 
> Review request for cloudstack and Girish Shilamkar.
> 
> 
> Bugs: CLOUDSTACK-7024
> https://issues.apache.org/jira/browse/CLOUDSTACK-7024
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> Resolved issue related to order of cleanup items. The project must be removed 
> before the account which manages it.
> 
> 
> Diffs
> -
> 
>   test/integration/component/test_project_usage.py 5e0dda5 
> 
> Diff: https://reviews.apache.org/r/23677/diff/
> 
> 
> Testing
> ---
> 
> Yes.
> 
> Log:
> Test Upload/ delete a template and verify correct usage is generated ... === 
> TestName: test_01_template_usage | Status : SUCCESS ===
> ok
> 
> --
> Ran 1 test in 285.451s
> 
> OK
> 
> 
> Thanks,
> 
> Ashutosh Kelkar
> 
>



Re: Review Request 23611: CLOUDSTACK-7013: Fixing test script issue in test_add_remove_network.py

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23611/#review48900
---


Commit 6b66fe92ca89633ec64397cedb0d1572d0089c93 in cloudstack's branch 
refs/heads/4.4 from Ashutosh K
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=6b66fe9 ]

CLOUDSTACK-7013: Fixing test script issue in test_add_remove_network.py

(cherry picked from commit f99a96f38a1f2433cb01bd7af25890789716e070)


- ASF Subversion and Git Services


On July 17, 2014, 10:24 a.m., Ashutosh Kelkar wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23611/
> ---
> 
> (Updated July 17, 2014, 10:24 a.m.)
> 
> 
> Review request for cloudstack and Girish Shilamkar.
> 
> 
> Bugs: CLOUDSTACK-7013
> https://issues.apache.org/jira/browse/CLOUDSTACK-7013
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> Corrected typo. cls.append to cls._cleanup.append
> 
> 
> Diffs
> -
> 
>   test/integration/component/test_add_remove_network.py dbba59b 
> 
> Diff: https://reviews.apache.org/r/23611/diff/
> 
> 
> Testing
> ---
> 
> Yes.
> 
> Log:
> 
> Try to remove nic from a vm providing wrong vm id to API ... === TestName: 
> test_19_remove_nic_wrong_vm_id | Status : SUCCESS ===
> ok
> 
> --
> Ran 1 test in 172.776s
> 
> OK
> 
> 
> Thanks,
> 
> Ashutosh Kelkar
> 
>



Re: Review Request 23793: CLOUDSTACK-7137: Resolving cleanup issue in test_escalations_securitygroups.py

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23793/#review48902
---


Commit 1ca9abd6dc8013dd1dc4e4f9ca1eabb71785cc37 in cloudstack's branch 
refs/heads/4.4 from Ashutosh K
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=1ca9abd ]

CLOUDSTACK-7137: Resolving cleanup issue in test_escalations_securitygroups.py

(cherry picked from commit 8d8190ea4e00edb0f7ce9665535adcc7a5b5097d)


- ASF Subversion and Git Services


On July 22, 2014, 7:05 a.m., Ashutosh Kelkar wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23793/
> ---
> 
> (Updated July 22, 2014, 7:05 a.m.)
> 
> 
> Review request for cloudstack and Girish Shilamkar.
> 
> 
> Bugs: CLOUDSTACK-7137
> https://issues.apache.org/jira/browse/CLOUDSTACK-7137
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> Resolved the cleanup issue. The security group was not removed from cleanup 
> list after deleting it. So it failed to find the security group in cleanup 
> operation.
> 
> Also, removed the unnecessary imports.
> 
> 
> Diffs
> -
> 
>   test/integration/component/test_escalations_securitygroups.py 8934088 
> 
> Diff: https://reviews.apache.org/r/23793/diff/
> 
> 
> Testing
> ---
> 
> Yes.
> Log:
> @Desc: Test to List Security Groups pagination ... === TestName: 
> test_01_list_securitygroups_pagination | Status : SUCCESS ===
> ok
> @Desc: Test to Authorize and Revoke Ingress for Security Group ... SKIP: skip
> @Desc: Test to Authorize and Revoke Egress for Security Group ... SKIP: skip
> 
> --
> Ran 3 tests in 5.845s
> 
> OK (SKIP=2)
> 
> 
> Thanks,
> 
> Ashutosh Kelkar
> 
>



Re: Review Request 23885: CLOUDSTACK-7178: Correcting imports in test_escalations* test cases

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23885/#review48904
---


Commit 2025f359c4fbff6b24132d39e8cf587315a2a981 in cloudstack's branch 
refs/heads/4.4 from Gaurav Aradhye
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=2025f35 ]

CLOUDSTACK-7178: Correcting imports in test_escalations* test cases

(cherry picked from commit 4e45b296891f71fc7991dc507dc7ae9cec6f5496)


- ASF Subversion and Git Services


On July 24, 2014, 12:10 p.m., Gaurav Aradhye wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23885/
> ---
> 
> (Updated July 24, 2014, 12:10 p.m.)
> 
> 
> Review request for cloudstack and Girish Shilamkar.
> 
> 
> Bugs: CLOUDSTACK-7178
> https://issues.apache.org/jira/browse/CLOUDSTACK-7178
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> Correcting the imports to resolve the import error.
> 
> 
> Diffs
> -
> 
>   test/integration/component/test_escalations_ipaddresses.py 0b31d2e 
>   test/integration/component/test_escalations_snapshots.py 0aa36c3 
> 
> Diff: https://reviews.apache.org/r/23885/diff/
> 
> 
> Testing
> ---
> 
> Yes. Tested with python command.
> 
> 
> Thanks,
> 
> Gaurav Aradhye
> 
>



Re: Review Request 23814: CLOUDSTACK-7148: Adding missing "list" in method call

2014-07-28 Thread ASF Subversion and Git Services

---
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23814/#review48903
---


Commit 58987452994f1abc621a2f8f7fcdd24b443cf0e9 in cloudstack's branch 
refs/heads/4.4 from Ashutosh K
[ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=5898745 ]

CLOUDSTACK-7148: Adding missing list method

(cherry picked from commit dd138ceec5faa5d5b0fcdfe5cc655199b8f9187b)


- ASF Subversion and Git Services


On July 22, 2014, 3:55 p.m., Ashutosh Kelkar wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23814/
> ---
> 
> (Updated July 22, 2014, 3:55 p.m.)
> 
> 
> Review request for cloudstack and Girish Shilamkar.
> 
> 
> Bugs: CLOUDSTACK-7148
> https://issues.apache.org/jira/browse/CLOUDSTACK-7148
> 
> 
> Repository: cloudstack-git
> 
> 
> Description
> ---
> 
> Adding missing "list" in method call.
> 
> 
> Diffs
> -
> 
>   test/integration/component/test_redundant_router_cleanups.py 444fa3a 
> 
> Diff: https://reviews.apache.org/r/23814/diff/
> 
> 
> Testing
> ---
> 
> Yes.
> 
> 
> Thanks,
> 
> Ashutosh Kelkar
> 
>



Re: [ACS44] cherry picking from 4.4-forward

2014-07-28 Thread Daan Hoogland
On Mon, Jul 28, 2014 at 5:49 PM, Daan Hoogland  wrote:
> will do some more later this week.


down to 32

-- 
Daan


Re: [BUG] upgrade path to 4.4.1

2014-07-28 Thread Rohit Yadav

Hi,

Adding upgrade paths is simple (you may add/update a wiki page on it):

- You add a upgrade path class under com.cloud.upgrade.dao, something
like UpgradeVERAtoVERb, in our case Upgrade440to441 which should
implement the interface DbUpgrade. If there is some complex migration
you need to do in code put the sql and other statements in
performDataMigration method.
- Put upgrade path sql statements in db/schema-440to441.sql
- Put upgrade path cleanup statements in db/schema-440to441-cleanup.sql
- Finally add the version key and add/append the upgrade class in
DatabaseUpgradeChecker and all other keys where there is a previous
upgrade path.

On 4.4 branch see the following commit for reference which fixes this:
9de4abeb49f74cd9a4418a97a4d25e5266c81f94

I hope the way upgrade stuff works and the boilerplate code we add
everytime should be fixed/refactored in future.

On 4.4, I went ahead and fixed an apidoc build issue using master's:
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=blobdiff;f=tools/apidoc/gen_toc.py;h=1ad493d59ab6fb1fb52bbd07c17dc754bc128b0e;hp=bcc8417c3c5d3de2feb4129613038468c5ab9ac7;hb=628d8e6;hpb=0ac2eb4f671841b2525db810940d8502e6a3dcf4

Regards.

Will Stevens wrote:

If there is documentation for how to do this somewhere, I could implement
an empty upgrade path.  Do we know if there are database changes needed for
the 4.4.1 upgrade from 4.4.0?  How would that requirement be captured?

Cheers,

Will


*Will STEVENS*
Lead Developer

*CloudOps* *| *Cloud Solutions Experts
420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6
w cloudops.com *|* tw @CloudOps_


On Mon, Jul 28, 2014 at 4:52 PM, Daan Hoogland
wrote:


Will,

this is a bug due to our upgrade scheme: we have not yet implemented
it so it is missing. We need to implement some (possibly empty)
upgrade path to make sure this will still work for 4.4.1.

On Mon, Jul 28, 2014 at 9:46 PM, Will Stevens
wrote:

I am guessing this is a bug, but I want to post it here before I create a
ticket.  I have pulled down the latest code from the 4.4 branch (which
results in the 4.4.1 release).

I am able to compile the code without any issues, but when I run the
following command to deploy my DB it fails.

$ mvn -P developer -pl developer,tools/devcloud -Ddeploydb

The error is:
[ERROR] Failed to execute goal
org.codehaus.mojo:exec-maven-plugin:1.2.1:java (create-schema) on project
cloud-developer: An exception occured while executing the Java class.

null:

InvocationTargetException: The end upgrade version is actually at 4.4.0

but

our management server code version is at 4.4.1-SNAPSHOT ->  [Help 1]

It looks like there is no upgrade path from 4.4.0 to 4.4.1, but I am just
taking that from the error.

I checked the './setup/db/db' directory and there is no file for
'schema-440to441.sql'.  Also, I looked in
'./engine/schema/src/com/cloud/upgrade/dao' and there is no
'Upgrade440to441.java' file.  Since this file does not exist, it is
obviously not included in the
'./engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java' file
either (which is where the error originates from).

I have included the entire output for completeness...

Listening for transport dt_socket at address: 8787
[INFO] Scanning for projects...
[INFO]

[INFO] Reactor Build Order:
[INFO]
[INFO] Apache CloudStack Developer Mode
[INFO] Apache CloudStack DevCloud
[INFO]

[INFO]

[INFO] Building Apache CloudStack Developer Mode 4.4.1-SNAPSHOT
[INFO]

[INFO]
[INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle) @
cloud-developer ---
[INFO] Starting audit...
Audit done.

[INFO]
[INFO] --- properties-maven-plugin:1.0-alpha-2:read-project-properties
(default) @ cloud-developer ---
[WARNING] Ignoring missing properties file:
/mnt/hgfs/cs/cloudstack/developer/../utils/conf/db.properties.override
[INFO]
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @
cloud-developer ---
[INFO]
[INFO] --- maven-antrun-plugin:1.7:run (default) @ cloud-developer ---
[INFO] Executing tasks

main:
[INFO] Executed tasks
[INFO]
[INFO]>>>  exec-maven-plugin:1.2.1:java (create-schema) @ cloud-developer
[INFO]
[INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle) @
cloud-developer ---
[INFO] Starting audit...
Audit done.

[INFO]
[INFO]<<<  exec-maven-plugin:1.2.1:java (create-schema) @ cloud-developer
<<<
[INFO]
[INFO] --- exec-maven-plugin:1.2.1:java (create-schema) @ cloud-developer
---
log4j:WARN No appenders could be found for logger
(org.springframework.core.env.StandardEnvironment).
log4j:WARN Please initialize the log4j system properly.
log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for
more info.
>  WARNING: Provided file does not exist:
/mnt/hgfs/cs/cloudstack/developer/../utils/conf/db.properties.overri

Re: [BUG] upgrade path to 4.4.1

2014-07-28 Thread Alena Prokharchyk
The upgrade path should also be merged to master branch. Where btw I
already see an upgrade path from 4.4 to 4.5 implemented. Should we change
it to 4.4.1->4.5?

-Alena.

On 7/28/14, 2:54 PM, "Rohit Yadav"  wrote:

>Hi,
>
>Adding upgrade paths is simple (you may add/update a wiki page on it):
>
>- You add a upgrade path class under com.cloud.upgrade.dao, something
>like UpgradeVERAtoVERb, in our case Upgrade440to441 which should
>implement the interface DbUpgrade. If there is some complex migration
>you need to do in code put the sql and other statements in
>performDataMigration method.
>- Put upgrade path sql statements in db/schema-440to441.sql
>- Put upgrade path cleanup statements in db/schema-440to441-cleanup.sql
>- Finally add the version key and add/append the upgrade class in
>DatabaseUpgradeChecker and all other keys where there is a previous
>upgrade path.
>
>On 4.4 branch see the following commit for reference which fixes this:
>9de4abeb49f74cd9a4418a97a4d25e5266c81f94
>
>I hope the way upgrade stuff works and the boilerplate code we add
>everytime should be fixed/refactored in future.
>
>On 4.4, I went ahead and fixed an apidoc build issue using master's:
>https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=blobdiff;f=tool
>s/apidoc/gen_toc.py;h=1ad493d59ab6fb1fb52bbd07c17dc754bc128b0e;hp=bcc8417c
>3c5d3de2feb4129613038468c5ab9ac7;hb=628d8e6;hpb=0ac2eb4f671841b2525db81094
>0d8502e6a3dcf4
>
>Regards.
>
>Will Stevens wrote:
>> If there is documentation for how to do this somewhere, I could
>>implement
>> an empty upgrade path.  Do we know if there are database changes needed
>>for
>> the 4.4.1 upgrade from 4.4.0?  How would that requirement be captured?
>>
>> Cheers,
>>
>> Will
>>
>>
>> *Will STEVENS*
>> Lead Developer
>>
>> *CloudOps* *| *Cloud Solutions Experts
>> 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6
>> w cloudops.com *|* tw @CloudOps_
>>
>>
>> On Mon, Jul 28, 2014 at 4:52 PM, Daan Hoogland
>> wrote:
>>
>>> Will,
>>>
>>> this is a bug due to our upgrade scheme: we have not yet implemented
>>> it so it is missing. We need to implement some (possibly empty)
>>> upgrade path to make sure this will still work for 4.4.1.
>>>
>>> On Mon, Jul 28, 2014 at 9:46 PM, Will Stevens
>>> wrote:
 I am guessing this is a bug, but I want to post it here before I
create a
 ticket.  I have pulled down the latest code from the 4.4 branch (which
 results in the 4.4.1 release).

 I am able to compile the code without any issues, but when I run the
 following command to deploy my DB it fails.

 $ mvn -P developer -pl developer,tools/devcloud -Ddeploydb

 The error is:
 [ERROR] Failed to execute goal
 org.codehaus.mojo:exec-maven-plugin:1.2.1:java (create-schema) on
project
 cloud-developer: An exception occured while executing the Java class.
>>> null:
 InvocationTargetException: The end upgrade version is actually at
4.4.0
>>> but
 our management server code version is at 4.4.1-SNAPSHOT ->  [Help 1]

 It looks like there is no upgrade path from 4.4.0 to 4.4.1, but I am
just
 taking that from the error.

 I checked the './setup/db/db' directory and there is no file for
 'schema-440to441.sql'.  Also, I looked in
 './engine/schema/src/com/cloud/upgrade/dao' and there is no
 'Upgrade440to441.java' file.  Since this file does not exist, it is
 obviously not included in the
 './engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java'
file
 either (which is where the error originates from).

 I have included the entire output for completeness...

 Listening for transport dt_socket at address: 8787
 [INFO] Scanning for projects...
 [INFO]
 
---
-
 [INFO] Reactor Build Order:
 [INFO]
 [INFO] Apache CloudStack Developer Mode
 [INFO] Apache CloudStack DevCloud
 [INFO]

 [INFO]
 
---
-
 [INFO] Building Apache CloudStack Developer Mode 4.4.1-SNAPSHOT
 [INFO]
 
---
-
 [INFO]
 [INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle)
@
 cloud-developer ---
 [INFO] Starting audit...
 Audit done.

 [INFO]
 [INFO] --- properties-maven-plugin:1.0-alpha-2:read-project-properties
 (default) @ cloud-developer ---
 [WARNING] Ignoring missing properties file:
 /mnt/hgfs/cs/cloudstack/developer/../utils/conf/db.properties.override
 [INFO]
 [INFO] --- maven-remote-resources-plugin:1.3:process (default) @
 cloud-developer ---
 [INFO]
 [INFO] --- maven-antrun-plugin:1.7:run (default) @ cloud-developer ---
 [INFO] Executing tasks

 main:
 [INFO] Executed tasks
 [INFO]
 [INFO]>>>  exec-maven-plugin:1.2.

Re: [BUG] upgrade path to 4.4.1

2014-07-28 Thread Rohit Yadav

Hi Alena,

I've changed the upgrade path from 4.4.1 to 4.5.0, please verify at your
end especially the DatabaseUpgradeChecker since there are too many list
of upgrade path class changes.

On master: d42e20429d1e238816a07edd865567c06a4914d3

Regards.

Alena Prokharchyk wrote:

The upgrade path should also be merged to master branch. Where btw I
already see an upgrade path from 4.4 to 4.5 implemented. Should we change
it to 4.4.1->4.5?

-Alena.

On 7/28/14, 2:54 PM, "Rohit Yadav"  wrote:


Hi,

Adding upgrade paths is simple (you may add/update a wiki page on it):

- You add a upgrade path class under com.cloud.upgrade.dao, something
like UpgradeVERAtoVERb, in our case Upgrade440to441 which should
implement the interface DbUpgrade. If there is some complex migration
you need to do in code put the sql and other statements in
performDataMigration method.
- Put upgrade path sql statements in db/schema-440to441.sql
- Put upgrade path cleanup statements in db/schema-440to441-cleanup.sql
- Finally add the version key and add/append the upgrade class in
DatabaseUpgradeChecker and all other keys where there is a previous
upgrade path.

On 4.4 branch see the following commit for reference which fixes this:
9de4abeb49f74cd9a4418a97a4d25e5266c81f94

I hope the way upgrade stuff works and the boilerplate code we add
everytime should be fixed/refactored in future.

On 4.4, I went ahead and fixed an apidoc build issue using master's:
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=blobdiff;f=tool
s/apidoc/gen_toc.py;h=1ad493d59ab6fb1fb52bbd07c17dc754bc128b0e;hp=bcc8417c
3c5d3de2feb4129613038468c5ab9ac7;hb=628d8e6;hpb=0ac2eb4f671841b2525db81094
0d8502e6a3dcf4

Regards.

Will Stevens wrote:

If there is documentation for how to do this somewhere, I could
implement
an empty upgrade path.  Do we know if there are database changes needed
for
the 4.4.1 upgrade from 4.4.0?  How would that requirement be captured?

Cheers,

Will


*Will STEVENS*
Lead Developer

*CloudOps* *| *Cloud Solutions Experts
420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6
w cloudops.com *|* tw @CloudOps_


On Mon, Jul 28, 2014 at 4:52 PM, Daan Hoogland
wrote:


Will,

this is a bug due to our upgrade scheme: we have not yet implemented
it so it is missing. We need to implement some (possibly empty)
upgrade path to make sure this will still work for 4.4.1.

On Mon, Jul 28, 2014 at 9:46 PM, Will Stevens
wrote:

I am guessing this is a bug, but I want to post it here before I
create a
ticket.  I have pulled down the latest code from the 4.4 branch (which
results in the 4.4.1 release).

I am able to compile the code without any issues, but when I run the
following command to deploy my DB it fails.

$ mvn -P developer -pl developer,tools/devcloud -Ddeploydb

The error is:
[ERROR] Failed to execute goal
org.codehaus.mojo:exec-maven-plugin:1.2.1:java (create-schema) on
project
cloud-developer: An exception occured while executing the Java class.

null:

InvocationTargetException: The end upgrade version is actually at
4.4.0

but

our management server code version is at 4.4.1-SNAPSHOT ->   [Help 1]

It looks like there is no upgrade path from 4.4.0 to 4.4.1, but I am
just
taking that from the error.

I checked the './setup/db/db' directory and there is no file for
'schema-440to441.sql'.  Also, I looked in
'./engine/schema/src/com/cloud/upgrade/dao' and there is no
'Upgrade440to441.java' file.  Since this file does not exist, it is
obviously not included in the
'./engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java'
file
either (which is where the error originates from).

I have included the entire output for completeness...

Listening for transport dt_socket at address: 8787
[INFO] Scanning for projects...
[INFO]

---
-
[INFO] Reactor Build Order:
[INFO]
[INFO] Apache CloudStack Developer Mode
[INFO] Apache CloudStack DevCloud
[INFO]

[INFO]

---
-
[INFO] Building Apache CloudStack Developer Mode 4.4.1-SNAPSHOT
[INFO]

---
-
[INFO]
[INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle)
@
cloud-developer ---
[INFO] Starting audit...
Audit done.

[INFO]
[INFO] --- properties-maven-plugin:1.0-alpha-2:read-project-properties
(default) @ cloud-developer ---
[WARNING] Ignoring missing properties file:
/mnt/hgfs/cs/cloudstack/developer/../utils/conf/db.properties.override
[INFO]
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @
cloud-developer ---
[INFO]
[INFO] --- maven-antrun-plugin:1.7:run (default) @ cloud-developer ---
[INFO] Executing tasks

main:
[INFO] Executed tasks
[INFO]
[INFO]>>>   exec-maven-plugin:1.2.1:java (create-schema) @
cloud-developer
[INFO]
[INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle)
@
cloud-developer ---
[INFO] Starting audit...
Audit done.

[INFO]
[INFO]<<<   exec-ma

Re: [BUG] upgrade path to 4.4.1

2014-07-28 Thread Alena Prokharchyk
Will do, thank you, Rohit.

-Alena.

On 7/28/14, 3:23 PM, "Rohit Yadav"  wrote:

>Hi Alena,
>
>I've changed the upgrade path from 4.4.1 to 4.5.0, please verify at your
>end especially the DatabaseUpgradeChecker since there are too many list
>of upgrade path class changes.
>
>On master: d42e20429d1e238816a07edd865567c06a4914d3
>
>Regards.
>
>Alena Prokharchyk wrote:
>> The upgrade path should also be merged to master branch. Where btw I
>> already see an upgrade path from 4.4 to 4.5 implemented. Should we
>>change
>> it to 4.4.1->4.5?
>>
>> -Alena.
>>
>> On 7/28/14, 2:54 PM, "Rohit Yadav"  wrote:
>>
>>> Hi,
>>>
>>> Adding upgrade paths is simple (you may add/update a wiki page on it):
>>>
>>> - You add a upgrade path class under com.cloud.upgrade.dao, something
>>> like UpgradeVERAtoVERb, in our case Upgrade440to441 which should
>>> implement the interface DbUpgrade. If there is some complex migration
>>> you need to do in code put the sql and other statements in
>>> performDataMigration method.
>>> - Put upgrade path sql statements in db/schema-440to441.sql
>>> - Put upgrade path cleanup statements in db/schema-440to441-cleanup.sql
>>> - Finally add the version key and add/append the upgrade class in
>>> DatabaseUpgradeChecker and all other keys where there is a previous
>>> upgrade path.
>>>
>>> On 4.4 branch see the following commit for reference which fixes this:
>>> 9de4abeb49f74cd9a4418a97a4d25e5266c81f94
>>>
>>> I hope the way upgrade stuff works and the boilerplate code we add
>>> everytime should be fixed/refactored in future.
>>>
>>> On 4.4, I went ahead and fixed an apidoc build issue using master's:
>>> 
>>>https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=blobdiff;f=to
>>>ol
>>> 
>>>s/apidoc/gen_toc.py;h=1ad493d59ab6fb1fb52bbd07c17dc754bc128b0e;hp=bcc841
>>>7c
>>> 
>>>3c5d3de2feb4129613038468c5ab9ac7;hb=628d8e6;hpb=0ac2eb4f671841b2525db810
>>>94
>>> 0d8502e6a3dcf4
>>>
>>> Regards.
>>>
>>> Will Stevens wrote:
 If there is documentation for how to do this somewhere, I could
 implement
 an empty upgrade path.  Do we know if there are database changes
needed
 for
 the 4.4.1 upgrade from 4.4.0?  How would that requirement be captured?

 Cheers,

 Will


 *Will STEVENS*
 Lead Developer

 *CloudOps* *| *Cloud Solutions Experts
 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6
 w cloudops.com *|* tw @CloudOps_


 On Mon, Jul 28, 2014 at 4:52 PM, Daan
Hoogland
 wrote:

> Will,
>
> this is a bug due to our upgrade scheme: we have not yet implemented
> it so it is missing. We need to implement some (possibly empty)
> upgrade path to make sure this will still work for 4.4.1.
>
> On Mon, Jul 28, 2014 at 9:46 PM, Will Stevens
> wrote:
>> I am guessing this is a bug, but I want to post it here before I
>> create a
>> ticket.  I have pulled down the latest code from the 4.4 branch
>>(which
>> results in the 4.4.1 release).
>>
>> I am able to compile the code without any issues, but when I run the
>> following command to deploy my DB it fails.
>>
>> $ mvn -P developer -pl developer,tools/devcloud -Ddeploydb
>>
>> The error is:
>> [ERROR] Failed to execute goal
>> org.codehaus.mojo:exec-maven-plugin:1.2.1:java (create-schema) on
>> project
>> cloud-developer: An exception occured while executing the Java
>>class.
> null:
>> InvocationTargetException: The end upgrade version is actually at
>> 4.4.0
> but
>> our management server code version is at 4.4.1-SNAPSHOT ->   [Help
>>1]
>>
>> It looks like there is no upgrade path from 4.4.0 to 4.4.1, but I am
>> just
>> taking that from the error.
>>
>> I checked the './setup/db/db' directory and there is no file for
>> 'schema-440to441.sql'.  Also, I looked in
>> './engine/schema/src/com/cloud/upgrade/dao' and there is no
>> 'Upgrade440to441.java' file.  Since this file does not exist, it is
>> obviously not included in the
>> './engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java'
>> file
>> either (which is where the error originates from).
>>
>> I have included the entire output for completeness...
>>
>> Listening for transport dt_socket at address: 8787
>> [INFO] Scanning for projects...
>> [INFO]
>>
>> 
>>-
>>--
>> -
>> [INFO] Reactor Build Order:
>> [INFO]
>> [INFO] Apache CloudStack Developer Mode
>> [INFO] Apache CloudStack DevCloud
>> [INFO]
>>
>> [INFO]
>>
>> 
>>-
>>--
>> -
>> [INFO] Building Apache CloudStack Developer Mode 4.4.1-SNAPSHOT
>> [INFO]
>>
>> 
>>-
>>>

Build failed in Jenkins: build-master-noredist #3174

2014-07-28 Thread jenkins
See 

Changes:

[Alena Prokharchyk] DB upgrade - added a path from 4.4.0 to 4.4.5

[Alena Prokharchyk] listNetworks: moved pagination post processing to 
StringUtils class

[Alena Prokharchyk] CS-19072: fixed broken pagination and count in 
listNetworkOfferings

[Alena Prokharchyk] CS-19072: fixed broken pagination and count in 
listVpcOfferings

--
[...truncated 5891 lines...]
[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-plugin-network-vsp ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-plugin-network-vsp ---
[INFO] Compiling 43 source files to 

[INFO] 
[INFO] --- license-maven-plugin:2.5:check (cloudstack-checklicence) @ 
cloud-plugin-network-vsp ---
[INFO] Checking licenses...
[INFO] 
[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-plugin-network-vsp ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-plugin-network-vsp ---
[INFO] Compiling 5 source files to 

[INFO] 
[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-plugin-network-vsp ---
[INFO] Surefire report directory: 


---
 T E S T S
---
Running com.cloud.network.element.NuageVspElementTest
log4j:WARN No appenders could be found for logger 
(com.cloud.network.element.NuageVspElement).
log4j:WARN Please initialize the log4j system properly.
log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for more 
info.
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.695 sec
Running com.cloud.network.manager.NuageVspManagerTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.131 sec
Running com.cloud.network.resource.NuageVspResourceTest
Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.047 sec
Running com.cloud.network.sync.NuageVspSyncTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 sec
Running com.cloud.network.guru.NuageVspGuestNetworkGuruTest
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.201 sec

Results :

Tests run: 29, Failures: 0, Errors: 0, Skipped: 0

[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ cloud-plugin-network-vsp ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ 
cloud-plugin-network-vsp ---
[INFO] 
[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-plugin-network-vsp ---
[INFO] Installing 

 to 
/jenkins/.m2/repository/org/apache/cloudstack/cloud-plugin-network-vsp/4.5.0-SNAPSHOT/cloud-plugin-network-vsp-4.5.0-SNAPSHOT.jar
[INFO] Installing 

 to 
/jenkins/.m2/repository/org/apache/cloudstack/cloud-plugin-network-vsp/4.5.0-SNAPSHOT/cloud-plugin-network-vsp-4.5.0-SNAPSHOT.pom
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack VMware Base 4.5.0-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-vmware-base ---
[INFO] Deleting 

 (includes = [**/*], excludes = [])
[INFO] Deleting 
 
(includes = [target, dist], excludes = [])
[INFO] 
[INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle) @ 
cloud-vmware-base ---
[INFO] Starting audit...
Audit done.

[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (defau

Build failed in Jenkins: build-master-noredist #3175

2014-07-28 Thread jenkins
See 

Changes:

[Rohit Yadav] schema: add upgrade path from 4.4.0 to 4.5.0 via 4.4.1

[Alena Prokharchyk] CS-19072: fixed broken pagination and count in listVpcs

--
[...truncated 5892 lines...]
[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-plugin-network-vsp ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-plugin-network-vsp ---
[INFO] Compiling 43 source files to 

[INFO] 
[INFO] --- license-maven-plugin:2.5:check (cloudstack-checklicence) @ 
cloud-plugin-network-vsp ---
[INFO] Checking licenses...
[INFO] 
[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-plugin-network-vsp ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-plugin-network-vsp ---
[INFO] Compiling 5 source files to 

[INFO] 
[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-plugin-network-vsp ---
[INFO] Surefire report directory: 


---
 T E S T S
---
Running com.cloud.network.element.NuageVspElementTest
log4j:WARN No appenders could be found for logger 
(com.cloud.network.element.NuageVspElement).
log4j:WARN Please initialize the log4j system properly.
log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for more 
info.
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.75 sec
Running com.cloud.network.manager.NuageVspManagerTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.142 sec
Running com.cloud.network.resource.NuageVspResourceTest
Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.044 sec
Running com.cloud.network.sync.NuageVspSyncTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec
Running com.cloud.network.guru.NuageVspGuestNetworkGuruTest
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.268 sec

Results :

Tests run: 29, Failures: 0, Errors: 0, Skipped: 0

[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ cloud-plugin-network-vsp ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ 
cloud-plugin-network-vsp ---
[INFO] 
[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-plugin-network-vsp ---
[INFO] Installing 

 to 
/jenkins/.m2/repository/org/apache/cloudstack/cloud-plugin-network-vsp/4.5.0-SNAPSHOT/cloud-plugin-network-vsp-4.5.0-SNAPSHOT.jar
[INFO] Installing 

 to 
/jenkins/.m2/repository/org/apache/cloudstack/cloud-plugin-network-vsp/4.5.0-SNAPSHOT/cloud-plugin-network-vsp-4.5.0-SNAPSHOT.pom
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack VMware Base 4.5.0-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-vmware-base ---
[INFO] Deleting 

 (includes = [**/*], excludes = [])
[INFO] Deleting 
 
(includes = [target, dist], excludes = [])
[INFO] 
[INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle) @ 
cloud-vmware-base ---
[INFO] Starting audit...
Audit done.

[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-vmware-base ---
[INFO] 
[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-vmware-base ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encodi

Re: [BUG] upgrade path to 4.4.1

2014-07-28 Thread Alena Prokharchyk
Just one thing was missing - upgrade path from 4.4.1->4.5, I’ve added it
to DataBaseUpgradeChecker:

_upgradeMap.put("4.4.1", new DbUpgrade[] { new Upgrade441to450() });


-Alena.

On 7/28/14, 3:26 PM, "Alena Prokharchyk" 
wrote:

>Will do, thank you, Rohit.
>
>-Alena.
>
>On 7/28/14, 3:23 PM, "Rohit Yadav"  wrote:
>
>>Hi Alena,
>>
>>I've changed the upgrade path from 4.4.1 to 4.5.0, please verify at your
>>end especially the DatabaseUpgradeChecker since there are too many list
>>of upgrade path class changes.
>>
>>On master: d42e20429d1e238816a07edd865567c06a4914d3
>>
>>Regards.
>>
>>Alena Prokharchyk wrote:
>>> The upgrade path should also be merged to master branch. Where btw I
>>> already see an upgrade path from 4.4 to 4.5 implemented. Should we
>>>change
>>> it to 4.4.1->4.5?
>>>
>>> -Alena.
>>>
>>> On 7/28/14, 2:54 PM, "Rohit Yadav"  wrote:
>>>
 Hi,

 Adding upgrade paths is simple (you may add/update a wiki page on it):

 - You add a upgrade path class under com.cloud.upgrade.dao, something
 like UpgradeVERAtoVERb, in our case Upgrade440to441 which should
 implement the interface DbUpgrade. If there is some complex migration
 you need to do in code put the sql and other statements in
 performDataMigration method.
 - Put upgrade path sql statements in db/schema-440to441.sql
 - Put upgrade path cleanup statements in
db/schema-440to441-cleanup.sql
 - Finally add the version key and add/append the upgrade class in
 DatabaseUpgradeChecker and all other keys where there is a previous
 upgrade path.

 On 4.4 branch see the following commit for reference which fixes this:
 9de4abeb49f74cd9a4418a97a4d25e5266c81f94

 I hope the way upgrade stuff works and the boilerplate code we add
 everytime should be fixed/refactored in future.

 On 4.4, I went ahead and fixed an apidoc build issue using master's:
 
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=blobdiff;f=t
o
ol
 
s/apidoc/gen_toc.py;h=1ad493d59ab6fb1fb52bbd07c17dc754bc128b0e;hp=bcc84
1
7c
 
3c5d3de2feb4129613038468c5ab9ac7;hb=628d8e6;hpb=0ac2eb4f671841b2525db81
0
94
 0d8502e6a3dcf4

 Regards.

 Will Stevens wrote:
> If there is documentation for how to do this somewhere, I could
> implement
> an empty upgrade path.  Do we know if there are database changes
>needed
> for
> the 4.4.1 upgrade from 4.4.0?  How would that requirement be
>captured?
>
> Cheers,
>
> Will
>
>
> *Will STEVENS*
> Lead Developer
>
> *CloudOps* *| *Cloud Solutions Experts
> 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6
> w cloudops.com *|* tw @CloudOps_
>
>
> On Mon, Jul 28, 2014 at 4:52 PM, Daan
>Hoogland
> wrote:
>
>> Will,
>>
>> this is a bug due to our upgrade scheme: we have not yet implemented
>> it so it is missing. We need to implement some (possibly empty)
>> upgrade path to make sure this will still work for 4.4.1.
>>
>> On Mon, Jul 28, 2014 at 9:46 PM, Will Stevens
>> wrote:
>>> I am guessing this is a bug, but I want to post it here before I
>>> create a
>>> ticket.  I have pulled down the latest code from the 4.4 branch
>>>(which
>>> results in the 4.4.1 release).
>>>
>>> I am able to compile the code without any issues, but when I run
>>>the
>>> following command to deploy my DB it fails.
>>>
>>> $ mvn -P developer -pl developer,tools/devcloud -Ddeploydb
>>>
>>> The error is:
>>> [ERROR] Failed to execute goal
>>> org.codehaus.mojo:exec-maven-plugin:1.2.1:java (create-schema) on
>>> project
>>> cloud-developer: An exception occured while executing the Java
>>>class.
>> null:
>>> InvocationTargetException: The end upgrade version is actually at
>>> 4.4.0
>> but
>>> our management server code version is at 4.4.1-SNAPSHOT ->   [Help
>>>1]
>>>
>>> It looks like there is no upgrade path from 4.4.0 to 4.4.1, but I
>>>am
>>> just
>>> taking that from the error.
>>>
>>> I checked the './setup/db/db' directory and there is no file for
>>> 'schema-440to441.sql'.  Also, I looked in
>>> './engine/schema/src/com/cloud/upgrade/dao' and there is no
>>> 'Upgrade440to441.java' file.  Since this file does not exist, it is
>>> obviously not included in the
>>> './engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java'
>>> file
>>> either (which is where the error originates from).
>>>
>>> I have included the entire output for completeness...
>>>
>>> Listening for transport dt_socket at address: 8787
>>> [INFO] Scanning for projects...
>>> [INFO]
>>>
>>> 
>>>
>>>-
>>>--
>>> -
>>> [INFO] Reactor Build Order:
>>

RE: building cloudstack

2014-07-28 Thread Elapavuluri, Jaya
Hi,
I am working on 4.4 branch.

-Original Message-
From: Rohit Yadav [mailto:rohit.ya...@shapeblue.com] 
Sent: Monday, July 28, 2014 5:10 PM
To: dev@cloudstack.apache.org
Subject: Re: building cloudstack

Hi Jaya,

Which branch are you on? It's a bug we'll fix it by placing an empty upgrade 
path for 4.4.1 version.

The upgrade paths are available only between released versions only, so it 
fails as there is no upgrade path for 4.4.1-SNAPSHOT.

Regards.

Elapavuluri, Jaya wrote:
> Hello,
>
>
>
> I had setup cloudstack 4.4 environment which was running fine.
>
> I recently did a git pull to get the updates after which when I tried  to mvn 
> -Pdeveloper -pl developer -Ddeploydb I was encountering with the following 
> error.
>
>
> [ERROR] Failed to execute goal 
> org.codehaus.mojo:exec-maven-plugin:1.2.1:java (create-schema) on 
> project cloud-developer: An exception occured while executing the Java 
> class. null: InvocationTargetException: The end upgrade version is 
> actually at 4.4.0 but our management server code version is at 
> 4.4.1-SNAPSHOT ->  [Help 1]
>
> However mvn -P developer,systemvm clean install gives a build success.
>
> Can someone share their knowledge on this?
>

--
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.ya...@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab


Find out more about ShapeBlue and our range of CloudStack related services

IaaS Cloud Design & Build
CSForge – rapid IaaS deployment framework
CloudStack Consulting
CloudStack Infrastructure 
Support
CloudStack Bootcamp Training Courses

This email and any attachments to it may be confidential and are intended 
solely for the use of the individual to whom it is addressed. Any views or 
opinions expressed are solely those of the author and do not necessarily 
represent those of Shape Blue Ltd or related companies. If you are not the 
intended recipient of this email, you must neither take any action based upon 
its contents, nor copy or show it to anyone. Please contact the sender if you 
believe you have received this email in error. Shape Blue Ltd is a company 
incorporated in England & Wales. ShapeBlue Services India LLP is a company 
incorporated in India and is operated under license from Shape Blue Ltd. Shape 
Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is 
operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a company 
registered by The Republic of South Africa and is traded under license from 
Shape Blue Ltd. ShapeBlue is a registered trademark.


Build failed in Jenkins: build-master-noredist #3176

2014-07-28 Thread jenkins
See 

--
[...truncated 5892 lines...]
[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-plugin-network-vsp ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-plugin-network-vsp ---
[INFO] Compiling 43 source files to 

[INFO] 
[INFO] --- license-maven-plugin:2.5:check (cloudstack-checklicence) @ 
cloud-plugin-network-vsp ---
[INFO] Checking licenses...
[INFO] 
[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-plugin-network-vsp ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-plugin-network-vsp ---
[INFO] Compiling 5 source files to 

[INFO] 
[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-plugin-network-vsp ---
[INFO] Surefire report directory: 


---
 T E S T S
---
Running com.cloud.network.element.NuageVspElementTest
log4j:WARN No appenders could be found for logger 
(com.cloud.network.element.NuageVspElement).
log4j:WARN Please initialize the log4j system properly.
log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for more 
info.
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.66 sec
Running com.cloud.network.manager.NuageVspManagerTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.125 sec
Running com.cloud.network.resource.NuageVspResourceTest
Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.044 sec
Running com.cloud.network.sync.NuageVspSyncTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec
Running com.cloud.network.guru.NuageVspGuestNetworkGuruTest
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.203 sec

Results :

Tests run: 29, Failures: 0, Errors: 0, Skipped: 0

[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ cloud-plugin-network-vsp ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ 
cloud-plugin-network-vsp ---
[INFO] 
[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-plugin-network-vsp ---
[INFO] Installing 

 to 
/jenkins/.m2/repository/org/apache/cloudstack/cloud-plugin-network-vsp/4.5.0-SNAPSHOT/cloud-plugin-network-vsp-4.5.0-SNAPSHOT.jar
[INFO] Installing 

 to 
/jenkins/.m2/repository/org/apache/cloudstack/cloud-plugin-network-vsp/4.5.0-SNAPSHOT/cloud-plugin-network-vsp-4.5.0-SNAPSHOT.pom
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack VMware Base 4.5.0-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-vmware-base ---
[INFO] Deleting 

 (includes = [**/*], excludes = [])
[INFO] Deleting 
 
(includes = [target, dist], excludes = [])
[INFO] 
[INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle) @ 
cloud-vmware-base ---
[INFO] Starting audit...
Audit done.

[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-vmware-base ---
[INFO] 
[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-vmware-base ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO

Build failed in Jenkins: build-master-noredist #3177

2014-07-28 Thread jenkins
See 

Changes:

[Alena Prokharchyk] Added upgrade path from 4.4.1 to 4.5

[sheng.yang] CLOUDSTACK-7186: Revert "CLOUDSTACK-7182: NPE while trying to 
deploy VMs in parallel in isolated network"

--
[...truncated 5892 lines...]
[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-plugin-network-vsp ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-plugin-network-vsp ---
[INFO] Compiling 43 source files to 

[INFO] 
[INFO] --- license-maven-plugin:2.5:check (cloudstack-checklicence) @ 
cloud-plugin-network-vsp ---
[INFO] Checking licenses...
[INFO] 
[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-plugin-network-vsp ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-plugin-network-vsp ---
[INFO] Compiling 5 source files to 

[INFO] 
[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-plugin-network-vsp ---
[INFO] Surefire report directory: 


---
 T E S T S
---
Running com.cloud.network.element.NuageVspElementTest
log4j:WARN No appenders could be found for logger 
(com.cloud.network.element.NuageVspElement).
log4j:WARN Please initialize the log4j system properly.
log4j:WARN See http://logging.apache.org/log4j/1.2/faq.html#noconfig for more 
info.
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.668 sec
Running com.cloud.network.manager.NuageVspManagerTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.126 sec
Running com.cloud.network.resource.NuageVspResourceTest
Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.046 sec
Running com.cloud.network.sync.NuageVspSyncTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 sec
Running com.cloud.network.guru.NuageVspGuestNetworkGuruTest
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.215 sec

Results :

Tests run: 29, Failures: 0, Errors: 0, Skipped: 0

[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ cloud-plugin-network-vsp ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ 
cloud-plugin-network-vsp ---
[INFO] 
[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-plugin-network-vsp ---
[INFO] Installing 

 to 
/jenkins/.m2/repository/org/apache/cloudstack/cloud-plugin-network-vsp/4.5.0-SNAPSHOT/cloud-plugin-network-vsp-4.5.0-SNAPSHOT.jar
[INFO] Installing 

 to 
/jenkins/.m2/repository/org/apache/cloudstack/cloud-plugin-network-vsp/4.5.0-SNAPSHOT/cloud-plugin-network-vsp-4.5.0-SNAPSHOT.pom
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack VMware Base 4.5.0-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-vmware-base ---
[INFO] Deleting 

 (includes = [**/*], excludes = [])
[INFO] Deleting 
 
(includes = [target, dist], excludes = [])
[INFO] 
[INFO] --- maven-checkstyle-plugin:2.11:check (cloudstack-checkstyle) @ 
cloud-vmware-base ---
[INFO] Starting audit...
Audit done.

[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-vmware-base ---
[INFO] 
[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-vmware-base ---
[debug] execute contextu

[ACS44] KVM SystemVM template trouble

2014-07-28 Thread Erik Weber
Tried helping Soeren Malchow on irc today, with a new ACS44 installation.

The docs referenced ACS43 system templates from January, but even by using
the late June ones that got uploaded after the heartbleed incident it still
does not work.

The error message is: "Unsupported major.minor version 51.0" which points
to wrong java version installed.

The systemvm template is installed with openjdk-6

Manually upgrading it to openjdk-7-jre-headless seems to do the trick, but
only lasts for systemvm's lifetime (and not new ones), and is no permanent
fix.

Before I file a bug, could anyone help test the same on other hypervisors?
I don't really have a lab available, so I can't easily test on a lot of
installations.

To be clear, I'm not sure if this happens for both upgrades and new
installations, so please try with a clean installation first.

A proper fix is to release a new systemvm template with openjdk-7 and
updating docs, but as of yet I don't know if it applies to all hypervisors
or only KVM.


Thanks,

Erik


Jenkins build is back to normal : build-master-noredist #3178

2014-07-28 Thread jenkins
See 



Re: [ACS44] merge of forward branch

2014-07-28 Thread Sheng Yang
Daan,

4.4-forward should contain all the commits for 4.4. So 4.4-forward itself
should be able to make as 4.4, without merge back to 4.4?

That's what we want to have a 4.4-forward for 4.4. future release. It's
superset of current 4.4 branch.

Well, probably result in a force-overwrite. But I guess how we did it in
4.3? Animesh?

--Sheng


On Mon, Jul 28, 2014 at 2:36 AM, Daan Hoogland 
wrote:

> H,
>
> I tried merging 4.4-forward back into 4.4. This leaves us with a grand
> big conflict. I have calculated that the number of not cherry-picked
> not reverted commits is 185. I will start cherry-picking them at
> moments $dayjob allows. and then send a mail again.
>
> don't forget to read up on the proces git-flow is based upon. We will
> need to start working with a branch-merge per fix instead cherry-picks
> in the very near future.
>
> kind regards,
> --
> Daan
>


Re: [ACS44] merge of forward branch

2014-07-28 Thread Mike Tutkowski
This is my thinking, as well.

In theory, 4.4-forward should be a superset of 4.4.

I don't think merging is required.


On Mon, Jul 28, 2014 at 7:28 PM, Sheng Yang  wrote:

> Daan,
>
> 4.4-forward should contain all the commits for 4.4. So 4.4-forward itself
> should be able to make as 4.4, without merge back to 4.4?
>
> That's what we want to have a 4.4-forward for 4.4. future release. It's
> superset of current 4.4 branch.
>
> Well, probably result in a force-overwrite. But I guess how we did it in
> 4.3? Animesh?
>
> --Sheng
>
>
> On Mon, Jul 28, 2014 at 2:36 AM, Daan Hoogland 
> wrote:
>
> > H,
> >
> > I tried merging 4.4-forward back into 4.4. This leaves us with a grand
> > big conflict. I have calculated that the number of not cherry-picked
> > not reverted commits is 185. I will start cherry-picking them at
> > moments $dayjob allows. and then send a mail again.
> >
> > don't forget to read up on the proces git-flow is based upon. We will
> > need to start working with a branch-merge per fix instead cherry-picks
> > in the very near future.
> >
> > kind regards,
> > --
> > Daan
> >
>



-- 
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkow...@solidfire.com
o: 303.746.7302
Advancing the way the world uses the cloud
*™*


[GitHub] cloudstack-docs-install pull request: CentOS Link Broken

2014-07-28 Thread pdion891
Github user pdion891 commented on the pull request:


https://github.com/apache/cloudstack-docs-install/pull/14#issuecomment-50424672
  
PR completed but github is not yet sync.


---
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.
---


[GitHub] cloudstack-docs-install pull request: Updated systemvm template pa...

2014-07-28 Thread pdion891
Github user pdion891 commented on the pull request:


https://github.com/apache/cloudstack-docs-install/pull/18#issuecomment-50424664
  
PR completed but github is not yet sync.


---
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.
---


[ACS4.5] GUI Question

2014-07-28 Thread Mike Tutkowski
Hi,

My student for GSoC, Seif, was interested in adding this control to
CloudStack's GUI codebase:

http://loopj.com/jquery-tokeninput/

He's already written a new API command that retrieves a list of storage
tags (in addition to other work for GSoC).

Ideally he would be able to augment a couple dialogs that use storage tags
to make use of this control so that admins could more easily input storage
tags (ex. they could see existing storage tags in a list and be assisted by
suggestions when typing in a storage tag).

Would anyone (I've CCed some people who often work on the CS GUI) be able
to provide Seif insight into where he should start with this task? It might
make sense for him to extend this control and then utilize this extension
in multiple places in the GUI. It would be great if he had a bit of
guidance with regards to how this might fit into the existing CS GUI
architecture.

Thanks!

-- 
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkow...@solidfire.com
o: 303.746.7302
Advancing the way the world uses the cloud
*™*


Re: [ACS4.5] GUI Question

2014-07-28 Thread Mike Tutkowski
Just to add a bit more detail:

Seif is looking to create a new dialog that can utilize this control. One
could access this new dialog - perhaps - by clicking on a new button to the
right of the Storage Tags text field (ex. in the Add Primary Storage
dialog). This new dialog would utilize the new control to show the admin
all existing storage tags, allow for tags to be selected, and provide hints
when a user types in a new tag. When this dialog is OKed, the storage tags
can be listed in a comma-separated fashion in the, say, Add Primary Storage
dialog. This way the admin doesn't have to guess at storage tags when
entering them in a manual fashion.


On Mon, Jul 28, 2014 at 7:43 PM, Mike Tutkowski <
mike.tutkow...@solidfire.com> wrote:

> Hi,
>
> My student for GSoC, Seif, was interested in adding this control to
> CloudStack's GUI codebase:
>
> http://loopj.com/jquery-tokeninput/
>
> He's already written a new API command that retrieves a list of storage
> tags (in addition to other work for GSoC).
>
> Ideally he would be able to augment a couple dialogs that use storage tags
> to make use of this control so that admins could more easily input storage
> tags (ex. they could see existing storage tags in a list and be assisted by
> suggestions when typing in a storage tag).
>
> Would anyone (I've CCed some people who often work on the CS GUI) be able
> to provide Seif insight into where he should start with this task? It might
> make sense for him to extend this control and then utilize this extension
> in multiple places in the GUI. It would be great if he had a bit of
> guidance with regards to how this might fit into the existing CS GUI
> architecture.
>
> Thanks!
>
> --
> *Mike Tutkowski*
> *Senior CloudStack Developer, SolidFire Inc.*
> e: mike.tutkow...@solidfire.com
> o: 303.746.7302
> Advancing the way the world uses the cloud
> *™*
>



-- 
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkow...@solidfire.com
o: 303.746.7302
Advancing the way the world uses the cloud
*™*


[ACS44] systemvm templates inconsistency on cloudstack.apt-get.eu

2014-07-28 Thread Pierre-Luc Dion
there is 2 hyper-V systemvm template availables: .vhd, .vhd.zip at
http://cloudstack.apt-get.eu/systemvm/4.4/

So, I've download both, but it turn out that the template .vhd file don't
have the same size at the end of the process in both cases. Please see the
cut&paste result.

http://pastebin.com/wDLExzs3

Can't test them, I don't have hyperV, but could we have the same issue with
the KVM template?



*Pierre-Luc DION*
Architecte de Solution Cloud | Cloud Solutions Architect
t 855.652.5683

*CloudOps* Votre partenaire infonuagique* | *Cloud Solutions Experts
420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6
w cloudops.com *|* tw @CloudOps_


Re: [ACS44] merge of forward branch

2014-07-28 Thread Animesh Chaturvedi
Yes that's how I did for 4.2 and 4.3

Sent from my iPhone

On Jul 28, 2014, at 6:28 PM, "Sheng Yang" 
mailto:sh...@yasker.org>> wrote:

Daan,

4.4-forward should contain all the commits for 4.4. So 4.4-forward itself 
should be able to make as 4.4, without merge back to 4.4?

That's what we want to have a 4.4-forward for 4.4. future release. It's 
superset of current 4.4 branch.

Well, probably result in a force-overwrite. But I guess how we did it in 4.3? 
Animesh?

--Sheng


On Mon, Jul 28, 2014 at 2:36 AM, Daan Hoogland 
mailto:daan.hoogl...@gmail.com>> wrote:
H,

I tried merging 4.4-forward back into 4.4. This leaves us with a grand
big conflict. I have calculated that the number of not cherry-picked
not reverted commits is 185. I will start cherry-picking them at
moments $dayjob allows. and then send a mail again.

don't forget to read up on the proces git-flow is based upon. We will
need to start working with a branch-merge per fix instead cherry-picks
in the very near future.

kind regards,
--
Daan



Re: [DISCUSS] git commit proces

2014-07-28 Thread Sheng Yang
Sorry guys, I haven't followed up the thread. But I think we probably jump
to conclusion too quickly. I found the discussion mostly took place later
last week. I'm afraid not enough people aware of what's happening.

I am trying to catch up, by reading the thread and checking what's gitflow
etc, but could someone already familiar with the topic give an overview of
the issue?

For example, we can start by asking these questions:
1. What's the issue with current development process?
2. What's the purposed new approach to the process?
3. What's the pro/con of the new process? And what's the pro/con of the old
one?

That would make the question much more clear.

Thanks.

--Sheng

On Mon, Jul 28, 2014 at 1:54 PM, Daan Hoogland 
wrote:

> Rohit,
>
> Let's change the howto-use-git page after the vote.
>
> On Mon, Jul 28, 2014 at 6:47 PM, Stephen Turner
>  wrote:
> > I am +1 on the principle.
> >
> > --
> > Stephen Turner
> >
> >
> > -Original Message-
> > From: Daan Hoogland [mailto:daan.hoogl...@gmail.com]
> > Sent: 28 July 2014 16:08
> > To: dev
> > Subject: Re: [DISCUSS] git commit proces
> >
> > Let me explain a little more about this lat mail of mine.
> > I was assuming a lot of context that most people may not have.
> > We want to start working differently with respect to our release
> procedure and branching habits. The proposals that are out there and about
> to be voted for are going to require a lot of work of a few people and a
> lot of discipline from all of us.
> >
> > My idea was to first vote for some of the habits that are part of the
> gitflow discipline, but I am not strong opinionated about that.
> >
> > I do want to prevent that we go for a grand proposal to completely
> change our way of moving forward (not just the way we move forward) while
> there are potentially people opposing to this way of working.
> >
> > So please give a +1/0/-1 to the general idea now, so we fell comfortable
> spending the time in devising a new release schedule/mechanism.
> >
> > some of the highlights are:
> >
> > it will start with 4.5 (4.4.x will be done with the old manual
> cherry-pick process) it will require everybody to create a branch for every
> fix or feature they will contribute.
> > it will require devs to work mainly on a new branch call 'develop'
> > it will be every bodies responsibility to ensure that 'master' is at all
> times releasable
> >
> > thanks,
> > Daan
> >
> > On Mon, Jul 28, 2014 at 4:39 PM, Daan Hoogland 
> wrote:
> >> I am not for a grand proposal but ok, I can live with it.
> >>
> >> It would be easiest to just vote for using the gitflow model.
> >> Leo is preparing a page on how to do it. I don't know what the status
> >> is on it. The vote for my part would be on the contents of that page.
> >>
> >> On Mon, Jul 28, 2014 at 4:03 PM, Mike Tutkowski
> >>  wrote:
> >>> Yeah, I was under the impression this decision would require a vote
> >>> and formal announcement, if it passes.
> >>>
> >>> On Monday, July 28, 2014, Hugo Trippaers  wrote:
> >>>
>  Agreed,  this kind of important decisions should be made by a vote.
> 
>  Sebastien, Daan, can one of you kick of the vote thread? Preferably
>  with a condensed summary of the thread?
> 
>  Cheers,
> 
>  Hugo
> 
> 
>  On 28 jul. 2014, at 14:07, Ian Duffy   >
>  wrote:
> 
>  > +1 to what Erik said.
>  >
>  >
>  > On 28 July 2014 13:04, Erik Weber   > >
>  wrote:
>  >
>  >> On Mon, Jul 28, 2014 at 1:22 PM, Daan Hoogland
>  >>   >
>  >> wrote:
>  >>
>  >>> H,
>  >>>
>  >>> I see a lot of commits happening directly on the master branch.
>  >>> Yet there were no counter arguments against the proposed gitflow
>  >>> and the discussion around it. This leaves me with the idea that
>  >>> the thread is largely ignored by the community. It is my
>  >>> understanding that we agreed never to commit anything to master
>  >>> anymore that hasn't been first committed to a branch and is
>  >>> merged back to master (instead of cherry-picked). What mistake in
> thinking am I making here?
>  >>>
>  >>>
>  >>
>  >> Not familiar with bylaws and the such, but wouldn't a change like
>  >> this require some sort of voting and potentially a more formal
> information?
>  >>
>  >> Requiring everyone to read through a 50+ replies mail thread and
>  comprehend
>  >> it could be a bit much.
>  >>
>  >> I would suggest an updated document that explain the expected
> workflow.
>  >>
>  >> --
>  >> Erik
>  >>
> 
> 
> >>>
> >>> --
> >>> *Mike Tutkowski*
> >>> *Senior CloudStack Developer, SolidFire Inc.*
> >>> e: mike.tutkow...@solidfire.com
> >>> o: 303.746.7302
> >>> Advancing the way the world uses the cloud
> >>> *™*
> >>
> >>
> >>
> >> --
> >> Daan
> >
> >
> >
> > --
> > Daan
>
>
>
> --
> Daan
>


Re: [ACS44] merge of forward branch

2014-07-28 Thread Daan Hoogland
I don't like the idea. release (candidates) are on 4.4

On Tue, Jul 29, 2014 at 5:43 AM, Animesh Chaturvedi
 wrote:
> Yes that's how I did for 4.2 and 4.3
>
> Sent from my iPhone
>
> On Jul 28, 2014, at 6:28 PM, "Sheng Yang"  wrote:
>
> Daan,
>
> 4.4-forward should contain all the commits for 4.4. So 4.4-forward itself
> should be able to make as 4.4, without merge back to 4.4?
>
> That's what we want to have a 4.4-forward for 4.4. future release. It's
> superset of current 4.4 branch.
>
> Well, probably result in a force-overwrite. But I guess how we did it in
> 4.3? Animesh?
>
> --Sheng
>
>
> On Mon, Jul 28, 2014 at 2:36 AM, Daan Hoogland 
> wrote:
>>
>> H,
>>
>> I tried merging 4.4-forward back into 4.4. This leaves us with a grand
>> big conflict. I have calculated that the number of not cherry-picked
>> not reverted commits is 185. I will start cherry-picking them at
>> moments $dayjob allows. and then send a mail again.
>>
>> don't forget to read up on the proces git-flow is based upon. We will
>> need to start working with a branch-merge per fix instead cherry-picks
>> in the very near future.
>>
>> kind regards,
>> --
>> Daan
>
>



-- 
Daan


Re: [ACS44] merge of forward branch

2014-07-28 Thread Sheng Yang
Every commit in 4.4 is from 4.4-forward, that's why we create 4.4-forward I
think?

--Sheng


On Mon, Jul 28, 2014 at 9:44 PM, Daan Hoogland 
wrote:

> I don't like the idea. release (candidates) are on 4.4
>
> On Tue, Jul 29, 2014 at 5:43 AM, Animesh Chaturvedi
>  wrote:
> > Yes that's how I did for 4.2 and 4.3
> >
> > Sent from my iPhone
> >
> > On Jul 28, 2014, at 6:28 PM, "Sheng Yang"  wrote:
> >
> > Daan,
> >
> > 4.4-forward should contain all the commits for 4.4. So 4.4-forward itself
> > should be able to make as 4.4, without merge back to 4.4?
> >
> > That's what we want to have a 4.4-forward for 4.4. future release. It's
> > superset of current 4.4 branch.
> >
> > Well, probably result in a force-overwrite. But I guess how we did it in
> > 4.3? Animesh?
> >
> > --Sheng
> >
> >
> > On Mon, Jul 28, 2014 at 2:36 AM, Daan Hoogland 
> > wrote:
> >>
> >> H,
> >>
> >> I tried merging 4.4-forward back into 4.4. This leaves us with a grand
> >> big conflict. I have calculated that the number of not cherry-picked
> >> not reverted commits is 185. I will start cherry-picking them at
> >> moments $dayjob allows. and then send a mail again.
> >>
> >> don't forget to read up on the proces git-flow is based upon. We will
> >> need to start working with a branch-merge per fix instead cherry-picks
> >> in the very near future.
> >>
> >> kind regards,
> >> --
> >> Daan
> >
> >
>
>
>
> --
> Daan
>


Re: [ACS44] merge of forward branch

2014-07-28 Thread Animesh Chaturvedi
Then what about all fixes that went into 4.4-forward if they don't get picked 
up that contribution will not be used at all.

Sent from my iPhone

> On Jul 28, 2014, at 9:45 PM, "Daan Hoogland"  wrote:
> 
> I don't like the idea. release (candidates) are on 4.4
> 
> On Tue, Jul 29, 2014 at 5:43 AM, Animesh Chaturvedi
>  wrote:
>> Yes that's how I did for 4.2 and 4.3
>> 
>> Sent from my iPhone
>> 
>> On Jul 28, 2014, at 6:28 PM, "Sheng Yang"  wrote:
>> 
>> Daan,
>> 
>> 4.4-forward should contain all the commits for 4.4. So 4.4-forward itself
>> should be able to make as 4.4, without merge back to 4.4?
>> 
>> That's what we want to have a 4.4-forward for 4.4. future release. It's
>> superset of current 4.4 branch.
>> 
>> Well, probably result in a force-overwrite. But I guess how we did it in
>> 4.3? Animesh?
>> 
>> --Sheng
>> 
>> 
>> On Mon, Jul 28, 2014 at 2:36 AM, Daan Hoogland 
>> wrote:
>>> 
>>> H,
>>> 
>>> I tried merging 4.4-forward back into 4.4. This leaves us with a grand
>>> big conflict. I have calculated that the number of not cherry-picked
>>> not reverted commits is 185. I will start cherry-picking them at
>>> moments $dayjob allows. and then send a mail again.
>>> 
>>> don't forget to read up on the proces git-flow is based upon. We will
>>> need to start working with a branch-merge per fix instead cherry-picks
>>> in the very near future.
>>> 
>>> kind regards,
>>> --
>>> Daan
> 
> 
> 
> -- 
> Daan