Re: [Blocker] Default ip table rules on VR

[Daan Hoogland]

I changed it to critical. It is only a blocker if we agree on this
list that it is.

On Thu, Jul 30, 2015 at 6:44 AM, Sanjeev N  wrote:
> Hi,
>
> In latest ACS builds, the ip table rules in VR have ACCEPT as the default
> policy in INPUT and FORWARD chains, instead of DROP.
>
> Created a blocker bug for this issue
> https://issues.apache.org/jira/browse/CLOUDSTACK-8688
>
> Can somebody please fix it?
>
> Thanks,
> Sanjeev



-- 
Daan

[GitHub] cloudstack pull request: Cloudstack 8656 adding messages to empty ...

[wilderrodrigues]

Github user wilderrodrigues commented on the pull request:

https://github.com/apache/cloudstack/pull/637#issuecomment-126204154
  
Fair enough, @DaanHoogland 

Thanks for the exaplanation. :)

LGTM :+1: 


---
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 pull request: Cloudstack 8656 adding messages to empty ...

[DaanHoogland]

Github user DaanHoogland commented on the pull request:

https://github.com/apache/cloudstack/pull/637#issuecomment-126202911
  
@koushik-das, Ignoring interrupted exceptions means that you do not allow 
the user or other threads to interrupt you. To me that seems serious. I did not 
in any case see comment about why it was done so I rigorously added the 
messages.
As for level; On one hand you are right @wilderrodrigues , as some errors 
that have been ignored in the past have been problems. On the other hand, 
someone did think it was safe to ignore those errors. The real job is to asses 
all the messages on level but I regard that out of scope for this PR. Maybe 
some of them should be WARN or even ERROR and others merely DEBUG or TRACE. I 
put the tag [ignored] there so we know we must considder them for either proper 
handling or another level of logging.


---
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 pull request: Cloudstack 8656 adding messages to empty ...

[wilderrodrigues]

Github user wilderrodrigues commented on the pull request:

https://github.com/apache/cloudstack/pull/637#issuecomment-126200897
  
Hi @DaanHoogland 

Nice you took time to have a look at those. It really helps sys admins to 
know what is going on with ACS. However, I would rather have them logged as 
WARN over INFO. Why? Because if we fall into the catch block, is because 
something went wrong or might probably require manual intervention. If you 
agree, would that be a lot of work to change them into WARN?

Concerning the logs getting filled up too soon, I wouldn't really bother. 
From my point of view that's an admin task to have a clever rotation of logs. 
If ACS code base was more robust, we could afford less logs and filling up 
files wouldn't be a problem. But since it isn't, let's make sure the 
users/admins are aware about what is happening.

With respect to the InterruptedExceptions, we can log them as debug, but 
ignoring them completely wouldn't be nice. 

Cheers,
Wilder  


---
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 pull request: CLOUDSTACK-8668: VR type in shared networ...

[wilderrodrigues]

Github user wilderrodrigues commented on the pull request:

https://github.com/apache/cloudstack/pull/627#issuecomment-126196695
  
Awesome, thanks!

Cheers,
Wilder

Sent from my iPhone

On 30 Jul 2015, at 07:22, kishankavala 
mailto:notificati...@github.com>> wrote:


Hi @wilderrodrigues,
@sanjeevneelarapu filed ticket for 
"default policy ACCEPT" issue. 
https://issues.apache.org/jira/browse/CLOUDSTACK-8688

—
Reply to this email directly or view it on 
GitHub.



---
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 pull request: CLOUDSTACK-8668: VR type in shared networ...

[kishankavala]

Github user kishankavala commented on the pull request:

https://github.com/apache/cloudstack/pull/627#issuecomment-126186427
  
Hi @wilderrodrigues, 
@sanjeevneelarapu  filed ticket for "default policy ACCEPT" issue. 
https://issues.apache.org/jira/browse/CLOUDSTACK-8688


---
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 pull request: Cloudstack 8656 adding messages to empty ...

[koushik-das]

Github user koushik-das commented on the pull request:

https://github.com/apache/cloudstack/pull/637#issuecomment-126185823
  
Since all these "ignore" messages are logged at INFO level, it needs to be 
ensured that logs are not getting filled up too soon. Also I see lot of 
instances for InterruptedException, I think they can they be excluded.


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

[Blocker] Default ip table rules on VR

[Sanjeev N]

Hi,

In latest ACS builds, the ip table rules in VR have ACCEPT as the default
policy in INPUT and FORWARD chains, instead of DROP.

Created a blocker bug for this issue
https://issues.apache.org/jira/browse/CLOUDSTACK-8688

Can somebody please fix it?

Thanks,
Sanjeev

[GitHub] cloudstack pull request: Cloudstack 8656

[DaanHoogland]

Github user DaanHoogland commented on the pull request:

https://github.com/apache/cloudstack/pull/637#issuecomment-126094297
  
@wilderrodrigues @wido @bhaisaab @rajesh-battala @koushik-das @kishankavala 
@K0zka 
I am taking this by exception type now so this is going to give conflicts 
pretty soon.  I will continue on file by file basis to reduce the chances for 
that.


---
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 pull request: Cloudstack 8656

[DaanHoogland]

GitHub user DaanHoogland opened a pull request:

https://github.com/apache/cloudstack/pull/637

Cloudstack 8656

filling empty catch clauses with log messages

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

$ git pull https://github.com/DaanHoogland/cloudstack CLOUDSTACK-8656

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

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


commit 483a8edf83977b0469bb4d951ded69170719fd5a
Author: Daan Hoogland 
Date:   2015-07-21T11:10:15Z

CLOUDSTACK-8656: filling empty catch block with info messages
 using regexp "catch\s*\(\s*(Exception|Throwable)\s*\w*\)\s*\{\s*\}"

commit 7d3d82048c315c00a1e592ebff88e8c12550554d
Author: Daan Hoogland 
Date:   2015-07-29T20:52:12Z

CLOUDSTACK-8656: info messgage on interupted exceptions




---
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 pull request: Update NiciraNvpGuestNetworkGuru.java

[DaanHoogland]

Github user DaanHoogland commented on the pull request:

https://github.com/apache/cloudstack/pull/636#issuecomment-126047538
  
does every version of nvp support vxlan?


---
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: Git Rebase Question

[Mike Tutkowski]

Hi Miguel,

I appreciate your willingness to help - thanks!

As it turns out, however - and you may have read this in a subsequent
e-mail after you sent yours, I was able to perform a rebase without issue
by switching over to another dev machine.

I don't know if it was due to switching the OS Git was running on (probably
unlikely), if it was because it was a different (older, in this case)
version of Git I had running on the other dev machine, or if there was just
some weird state on my original machine that was messing Git up, but it
works now (at least on the 2nd dev machine).

Thanks!
Mike

On Wed, Jul 29, 2015 at 3:43 AM, Miguel Ferreira <
mferre...@schubergphilis.com> wrote:

> Hi Mike,
>
> I’m willing to help you with this, but the easiest way would be for you to
> point me to the repo you are working on.
> This way I could actually see what’s going on.
>
> Anyway, from your description, all the files might be new in your modified
> branch, but a file with the same name might have been introduced in the 4.5
> branch upstream.
> Could that be the case?
>
> I can think of other situations that could result in such conflicts, for
> example, when your modified branch has merges coming form other local or
> remote branches.
> If you could point me to your modified branch and tell me which branch yo
> want to pull and rebase from, I could give it a try and let you know what I
> find.
>
> Cheers,
> \ Miguel Ferreira
>mferre...@schubergphilis.com
>
>
>
> On 15 Jul 2015, at 03:03, Mike Tutkowski  > wrote:
>
> Hi everyone,
>
> I have a Git question that relates to a rebase problem I've been seeing.
>
> I have a branch I've been working on the past six or seven weeks.
>
> As you'd expect, every now and then I update my local 4.5 branch from the
> upstream CloudStack one and perform a rebase.
>
> The weird part is that even though all of the files in my modified 4.5
> branch are new (there are no updates to any existing files or any deletions
> of existing files), when I try to rebase on top of an updated 4.5, I see an
> error when it tries to apply one patch (there are about 50 or so commits
> being applied and I've typically had trouble in the middle some where).
>
> The error informs me that the patch can't be applied because it would
> conflict with an existing, modified file of mine (and, as such, it says I
> should stash before doing the rebase).
>
> For one, no matter which file it refers to, the file in question is not in
> a modified state. When I do a git status, nothing comes up modified either.
>
> That being the case, I do a git rebase --continue, but get an error saying
> that nothing's been added and so a continue can't be started.
>
> I end up having to either skip the patch (and reapply it manually once the
> rebase is done) or perform some other hack to get past this issue.
>
> Thoughts?
>
> --
> *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
*™*

Re: [4.6] RC1 soon ?

[Wido den Hollander]

On 28-07-15 04:51, Pierre-Luc Dion wrote:
> Hi,
> 
> I've create this jira filter[1] for the Release Manager, based on it, there
> would be only 4 maybe just 3 blockers on 4.6. Based on this, should we
> consider placing a target date for RC1 somewhere like end of August ?
> 

Well, the S3 is still a blocker:
https://issues.apache.org/jira/browse/CLOUDSTACK-8640

Currently trying to figure it out. But as a "fix" we could revert the
Amazon S3 in the meantime. That would work for users.

Wido

> What's missing and to do in 4.6 as far as I know:
> 
> 1. Basic documentation of new features,
> 2. Decide if we let it in master and freeze merge during RC ?
> 3. Build all job as 4.6 in jenkins ?
> 4. Organize a QA-party, like old time lan-party
> 
> [1] https://issues.apache.org/jira/issues/?filter=12332940
> 

[GitHub] cloudstack pull request: Update NiciraNvpGuestNetworkGuru.java

[DaanHoogland]

Github user DaanHoogland commented on the pull request:

https://github.com/apache/cloudstack/pull/636#issuecomment-125961987
  
@sspans any testing done?


---
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 pull request: Update NiciraNvpGuestNetworkGuru.java

[sspans]

GitHub user sspans opened a pull request:

https://github.com/apache/cloudstack/pull/636

Update NiciraNvpGuestNetworkGuru.java

Add support for VXLAN as isolation method

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

$ git pull https://github.com/sspans/cloudstack vxlan-patch

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

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


commit d03505acc2f7e6a6569201dca633dc1097df5cf5
Author: Sten Spans 
Date:   2015-07-29T13:45:41Z

Update NiciraNvpGuestNetworkGuru.java

Add support for VXLAN as isolation method




---
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 pull request: CLOUDSTACK-8687: Prepare template only on...

[DaanHoogland]

Github user DaanHoogland commented on the pull request:

https://github.com/apache/cloudstack/pull/635#issuecomment-125917105
  
please add unit- or integration tests. for instance for prepareTemplate, 
prepareTemplateInOneStoragePool and prepareTemplateInAllStoragePools to show 
that expected behavior stays the same and new behavior is proven.


---
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 pull request: CLOUDSTACK-8668: VR type in shared networ...

[wilderrodrigues]

Github user wilderrodrigues commented on the pull request:

https://github.com/apache/cloudstack/pull/627#issuecomment-125915603
  
Awesome! Thanks a lot, @karuturi and @kishankavala 

Cheers,
Wilder


---
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 pull request: CLOUDSTACK-8668: VR type in shared networ...

[kishankavala]

Github user kishankavala commented on the pull request:

https://github.com/apache/cloudstack/pull/627#issuecomment-125915281
  
Thanks @wilderrodrigues 
I merged https://github.com/apache/cloudstack/pull/634/
I'll created separate ticket to track  "default policy ACCEPT" issue.


---
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 pull request: CLOUDSTACK-8683: process cmd_line.json fo...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/cloudstack/pull/634


---
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 pull request: CLOUDSTACK-8683: process cmd_line.json fo...

[karuturi]

Github user karuturi commented on the pull request:

https://github.com/apache/cloudstack/pull/634#issuecomment-125912564
  
@wilderrodrigues agreed. we can take it up as a new issue


---
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 pull request: CLOUDSTACK-8683: process cmd_line.json fo...

[wilderrodrigues]

Github user wilderrodrigues commented on the pull request:

https://github.com/apache/cloudstack/pull/634#issuecomment-125912381
  
LGTM :+1: 

@karuturi, should we perhaps create an issue to follow up on this? I think 
we should refactor the early-config a bit and, as you mentioned, move the 
processing away to a more specific place.

Cheers,
Wilder


---
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 pull request: CLOUDSTACK-8683: process cmd_line.json fo...

[karuturi]

Github user karuturi commented on the pull request:

https://github.com/apache/cloudstack/pull/634#issuecomment-125910552
  
looks good :+1: but, should this processing be part of the 
setup_[router|vpcrouter|dhcpserver] itself? 


---
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 pull request: CLOUDSTACK-8687: Prepare template only on...

[devdeep]

GitHub user devdeep opened a pull request:

https://github.com/apache/cloudstack/pull/635

CLOUDSTACK-8687: Prepare template only on a given storage pool

Update prepare template api to seed/prepare a template only on a given 
primary storage. Currently, the prepare template api will seed/prepare a given 
template on all the primary storage pools in a zone. If however, a user wishes 
to prepare a template only a particular storage pool, it isn't possible. 
Updated the api to take storage pool id as an optional parameter. If the pool 
id is provided then the template is prepared only on the given primary storage 
pool.

Following scenarios were tested. 1) Prepared a template with out the 
storage pool id. The template was seeded on all the available pools in the 
given zone. 2) Prepared a template with storage pool id as a parameter in the 
api. The template was seeded only on the given primary storage pool.

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

$ git pull https://github.com/devdeep/cloudstack-1 CLOUDSTACK-8687

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

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


commit 7466054a3a1453c8347ce0640e8941b8a6a7
Author: Devdeep Singh 
Date:   2015-07-28T06:35:35Z

CLOUDSTACK-8687: Update prepare template api to seed/prepare a template
only on a given primary storage. Currently, the prepare template api
will seed/prepare a given template on all the primary storage pools in
a zone. If however, a user wishes to prepare a template only a
particular storage pool, it isn't possible. Updated the api to take
storage pool id as an optional parameter. If the pool id is provided
then the template is prepared only on the given primary storage pool




---
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 pull request: CLOUDSTACK-8686:Verify data disk attachme...

[sanju1010]

Github user sanju1010 commented on a diff in the pull request:

https://github.com/apache/cloudstack/pull/631#discussion_r35743142
  
--- Diff: test/integration/testpaths/testpath_attach_disk_zwps.py ---
@@ -0,0 +1,185 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+""" Test case for Data Disk Attach to VM on ZWPS Test Path
+"""
+
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.lib.utils import (cleanup_resources,
+  validateList)
+from marvin.lib.base import (Account,
+ ServiceOffering,
+ DiskOffering,
+ Volume,
+ VirtualMachine,
+ StoragePool
+ )
+from marvin.lib.common import (get_domain,
+   get_zone,
+   get_template
+   )
+
+from marvin.codes import (PASS,
+  ZONETAG1)
+
+
+class TestAttachDataDisk(cloudstackTestCase):
+
+@classmethod
+def setUpClass(cls):
+testClient = super(TestAttachDataDisk, cls).getClsTestClient()
+cls.apiclient = testClient.getApiClient()
+cls.testdata = testClient.getParsedTestDataConfig()
+cls.hypervisor = cls.testClient.getHypervisorInfo()
+
+# Get Zone, Domain and templates
+cls.domain = get_domain(cls.apiclient)
+cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+cls._cleanup = []
+cls.template = get_template(
+cls.apiclient,
+cls.zone.id,
+cls.testdata["ostype"])
+cls.skiptest = False
+
+try:
+cls.pools = StoragePool.list(cls.apiclient, zoneid=cls.zone.id)
+except Exception as e:
+cls.skiptest = True
+return
+try:
+
+# Create an account
+cls.account = Account.create(
+cls.apiclient,
+cls.testdata["account"],
+domainid=cls.domain.id
+)
+cls._cleanup.append(cls.account)
+
+# Create user api client of the account
+cls.userapiclient = testClient.getUserApiClient(
+UserName=cls.account.name,
+DomainName=cls.account.domain
+)
+# Create Service offering
+cls.service_offering_zone1 = ServiceOffering.create(
+cls.apiclient,
+cls.testdata["service_offering"],
+tags=ZONETAG1
+)
+cls._cleanup.append(cls.service_offering_zone1)
+
+# Create Disk offering
+cls.disk_offering = DiskOffering.create(
+cls.apiclient,
+cls.testdata["disk_offering"]
+)
+
+cls._cleanup.append(cls.disk_offering)
+
+except Exception as e:
+cls.tearDownClass()
+raise e
+return
+
+@classmethod
+def tearDownClass(cls):
+try:
+cleanup_resources(cls.apiclient, cls._cleanup)
+except Exception as e:
+raise Exception("Warning: Exception during cleanup : %s" % e)
+
+def setUp(self):
+self.apiclient = self.testClient.getApiClient()
+self.dbclient = self.testClient.getDbConnection()
+self.cleanup = []
+
+def tearDown(self):
+try:
+if hasattr(self, "data_volume_created"):
+data_volumes_list = Volume.list(
+self.userapiclient,
+id=self.data_volume_created.id,
+virtualmachineid=self.vm.id
+)

Re: Git Rebase Question

[Miguel Ferreira]

Hi Mike,

I’m willing to help you with this, but the easiest way would be for you to 
point me to the repo you are working on.
This way I could actually see what’s going on.

Anyway, from your description, all the files might be new in your modified 
branch, but a file with the same name might have been introduced in the 4.5 
branch upstream.
Could that be the case?

I can think of other situations that could result in such conflicts, for 
example, when your modified branch has merges coming form other local or remote 
branches.
If you could point me to your modified branch and tell me which branch yo want 
to pull and rebase from, I could give it a try and let you know what I find.

Cheers,
\ Miguel Ferreira
   mferre...@schubergphilis.com



On 15 Jul 2015, at 03:03, Mike Tutkowski 
mailto:mike.tutkow...@solidfire.com>> wrote:

Hi everyone,

I have a Git question that relates to a rebase problem I've been seeing.

I have a branch I've been working on the past six or seven weeks.

As you'd expect, every now and then I update my local 4.5 branch from the
upstream CloudStack one and perform a rebase.

The weird part is that even though all of the files in my modified 4.5
branch are new (there are no updates to any existing files or any deletions
of existing files), when I try to rebase on top of an updated 4.5, I see an
error when it tries to apply one patch (there are about 50 or so commits
being applied and I've typically had trouble in the middle some where).

The error informs me that the patch can't be applied because it would
conflict with an existing, modified file of mine (and, as such, it says I
should stash before doing the rebase).

For one, no matter which file it refers to, the file in question is not in
a modified state. When I do a git status, nothing comes up modified either.

That being the case, I do a git rebase --continue, but get an error saying
that nothing's been added and so a continue can't be started.

I end up having to either skip the patch (and reapply it manually once the
rebase is done) or perform some other hack to get past this issue.

Thoughts?

--
*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 pull request: unittesting: test resolution is not guara...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/cloudstack/pull/633


---
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 pull request: unittesting: test resolution is not guara...

[bhaisaab]

Github user bhaisaab commented on the pull request:

https://github.com/apache/cloudstack/pull/633#issuecomment-125896500
  
LGTM


---
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 pull request: unittesting: test resolution is not guara...

[wilderrodrigues]

Github user wilderrodrigues commented on the pull request:

https://github.com/apache/cloudstack/pull/633#issuecomment-125896323
  
Thanks, @DaanHoogland!

LGTM :+1: 


---
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 pull request: CLOUDSTACK-8683: process cmd_line.json fo...

[wilderrodrigues]

Github user wilderrodrigues commented on the pull request:

https://github.com/apache/cloudstack/pull/634#issuecomment-125895559
  
Awesome, @kishankavala!

Will wait for the build/travis to vote/merge it.

Cheers,
Wilder


---
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 pull request: CLOUDSTACK-8668: VR type in shared networ...

[wilderrodrigues]

Github user wilderrodrigues commented on the pull request:

https://github.com/apache/cloudstack/pull/627#issuecomment-125894943
  
Hi @kishankavala 

Let's try to focus on 1 change at a time:

1. the port 3922 is blocked
2. default policy ACCEPT

So, the changes on the "cloud-early-config" won't cause any harm to the 
VPC/Isolated VRs, right?

Once we have the port fixed we move on to the next.

Cheers,
Wilder


---
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 pull request: CLOUDSTACK-8668: VR type in shared networ...

[kishankavala]

Github user kishankavala commented on the pull request:

https://github.com/apache/cloudstack/pull/627#issuecomment-125890106
  
@wilderrodrigues iptables issue is not specific to dhcpsrvr (shared VR). On 
isolated VR also default policy is ACCEPT
```
root@r-23-VM:~# iptables -L -nv
Chain INPUT (policy ACCEPT 9620 packets, 1598K bytes)




---
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 pull request: CLOUDSTACK-8683: process cmd_line.json fo...

[kishankavala]

GitHub user kishankavala opened a pull request:

https://github.com/apache/cloudstack/pull/634

CLOUDSTACK-8683: process cmd_line.json for shared network VR in 
cloud-early-config

- SSH access on link_local_ip is blocked for shared VR
- MS is unable to program rules on VR. Vm deployment also fails as the DHCP 
entries cannot be added.
- Fixed by processing cmd_line.json in cloud-early-config similar to 
isolated VR

Test:
- Deploy Vm successful
- Can access VR from host via ssh on link_local_ip on port 3922


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

$ git pull https://github.com/kishankavala/cloudstack CLOUDSTACK-8683

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

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


commit 14218a6726403262dcf8a712229377977513dcfb
Author: Kishan Kavala 
Date:   2015-07-29T08:43:01Z

CLOUDSTACK-8683: process cmd_line.json for shared network VR in 
cloud-early-config




---
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 pull request: CLOUDSTACK-8668: VR type in shared networ...

[wilderrodrigues]

Github user wilderrodrigues commented on the pull request:

https://github.com/apache/cloudstack/pull/627#issuecomment-125889027
  
Hi @kishankavala,

If it doesn't match the content of rules.v4 perhaps the iptables-save is 
not being called when dhcpsrvr.

By adding the change you suggested the code on the CsAddress.py line 367 
will be executed:

if self.get_type() in ["control"]:
self.fw.append(["filter", "", "-A FW_OUTBOUND -m state --state 
RELATED,ESTABLISHED -j ACCEPT"])
self.fw.append(["filter", "", "-A INPUT -i %s -p tcp -m tcp 
--dport 3922 -m state --state NEW -j ACCEPT" % self.dev])

I can add the changes here and run tests before you create the PR, if 
that's okay with you.

Cheers,
Wilder


---
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 pull request: Added a test to verify that listSnapshots...

[gauravaradhye]

Github user gauravaradhye commented on the pull request:

https://github.com/apache/cloudstack/pull/632#issuecomment-125886503
  
LGTM except one small change suggested.
Please don't mix intended changes and pep8 fixes, you can add another 
review request for pep8 fixes subsequently. That will remove the confusion 
while reviewing.


---
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 pull request: Added a test to verify that listSnapshots...

[gauravaradhye]

Github user gauravaradhye commented on a diff in the pull request:

https://github.com/apache/cloudstack/pull/632#discussion_r35739964
  
--- Diff: test/integration/smoke/test_snapshots.py ---
@@ -123,65 +126,78 @@ def test_01_snapshot_root_disk(self):
 #the reqd volume under
 #/secondary/snapshots//$account_id/$volumeid/$snapshot_uuid
 # 3. verify backup_snap_id was non null in the `snapshots` table
+# 4. Verify that zoneid is returned in listSnapshots API response
 
 volumes = list_volumes(
-self.apiclient,
-
virtualmachineid=self.virtual_machine_with_disk.id,
-type='ROOT',
-listall=True
-)
+self.apiclient,
+virtualmachineid=self.virtual_machine_with_disk.id,
+type='ROOT',
+listall=True
+)
 
 snapshot = Snapshot.create(
-   self.apiclient,
-   volumes[0].id,
-   account=self.account.name,
-   domainid=self.account.domainid
-   )
+self.apiclient,
+volumes[0].id,
+account=self.account.name,
+domainid=self.account.domainid
+)
 self.debug("Snapshot created: ID - %s" % snapshot.id)
 
 snapshots = list_snapshots(
-  self.apiclient,
-  id=snapshot.id
-  )
+self.apiclient,
+id=snapshot.id
+)
 self.assertEqual(
-isinstance(snapshots, list),
-True,
-"Check list response returns a valid list"
-)
+isinstance(snapshots, list),
+True,
+"Check list response returns a valid list"
+)
 
 self.assertNotEqual(
-snapshots,
-None,
-"Check if result exists in list item call"
-)
+snapshots,
+None,
+"Check if result exists in list item call"
+)
 self.assertEqual(
-snapshots[0].id,
-snapshot.id,
-"Check resource id in list resources call"
-)
+snapshots[0].id,
+snapshot.id,
+"Check resource id in list resources call"
+)
+self.assertNotEqual(
--- End diff --

You can directly use assertIsNotNone here.


---
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 pull request: Added a test to verify that listSnapshots...

[manasaveloori]

Github user manasaveloori commented on the pull request:

https://github.com/apache/cloudstack/pull/632#issuecomment-125886157
  
@DaanHoogland 
This is just an enhancement to existing test in the script.
The output is from nose test result of the script.


---
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 pull request: Added a test to verify that listSnapshots...

[DaanHoogland]

Github user DaanHoogland commented on the pull request:

https://github.com/apache/cloudstack/pull/632#issuecomment-125884841
  
@manasaveloori can you give us the command to which this output fits?

@gauravaradhye can you review this, please? (looks like a lot of code to me)


---
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 pull request: unittesting: test resolution is not guara...

[DaanHoogland]

GitHub user DaanHoogland opened a pull request:

https://github.com/apache/cloudstack/pull/633

unittesting: test resolution is not guaranteed to be exact

a lot of validation pull requests are failing over this test. It should 
pass but it's failure is environmental in any observed case so far.

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

$ git pull https://github.com/DaanHoogland/cloudstack test-resolution

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

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


commit 2c110ab70949d49da1552abc299a3413bdc61b37
Author: Daan Hoogland 
Date:   2015-07-29T08:46:30Z

unittesting: test resolution is not guaranteed to be exact




---
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 pull request: Added a test to verify that listSnapshots...

[manasaveloori]

GitHub user manasaveloori opened a pull request:

https://github.com/apache/cloudstack/pull/632

Added a test to verify that listSnapshots response returns zone id

Test Snapshot Root Disk ... === TestName: test_01_snapshot_root_disk | 
Status : SUCCESS ===
ok

--
Ran 1 test in 339.130s

OK

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

$ git pull https://github.com/manasaveloori/cloudstack Local

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

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


commit 40bda38f1fa031312015d305cd130d1b006e0de1
Author: manasaVeloori 
Date:   2015-07-29T08:29:15Z

Added a test to verify that listSnapshots response returns zone id




---
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 pull request: CLOUDSTACK-8668: VR type in shared networ...

[kishankavala]

Github user kishankavala commented on the pull request:

https://github.com/apache/cloudstack/pull/627#issuecomment-125882216
  
Sure @wilderrodrigues 
I'll create a PR. 

But iptables rules are more open now (default ACCEPT).
root@r-30-VM:~# iptables -L INPUT -nv
Chain INPUT (policy ACCEPT 104 packets, 14936 bytes)

It doesn't match content in /etc/iptables/rules.v4 


---
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 pull request: CLOUDSTACK-8668: VR type in shared networ...

[wilderrodrigues]

Github user wilderrodrigues commented on the pull request:

https://github.com/apache/cloudstack/pull/627#issuecomment-125878438
  
Nice catch, @kishankavala !

I checked the history of the file and found out that the changes for VPC 
router and normal router were added in the commit 
13b7ca1b3fc3d3c44d677307a59a5205b6c881bb

The extra iff you added, for the dhcpsrvr case, will do it.

Do you want to create a new PR for that one? I can test it as well. Since 
it's touching only dhcpsrvr (used for basic zones) I'm not expecting problemas 
with VPC routers or other routers used for advanced zones.

Cheers,
Wilder 


---
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 pull request: CLOUDSTACK-8651: [Browser Based Upload Te...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/cloudstack/pull/607


---
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 pull request: CLOUDSTACK-8686:Verify data disk attachme...

[DaanHoogland]

Github user DaanHoogland commented on the pull request:

https://github.com/apache/cloudstack/pull/631#issuecomment-125875443
  
I can only judge this on code cleanliness. An added pep8 pull request 
builder might help;) @pritisarap12 please solicit review from test experts that 
have access to the required hardware (zwmp?) or add verification instructions 
for no-knows like me to test this.
Thanks


---
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 pull request: Fixed Coverity issue "Dereference null re...

[DaanHoogland]

Github user DaanHoogland commented on the pull request:

https://github.com/apache/cloudstack/pull/630#issuecomment-125874159
  
@manuiiit your change has checkstyle error, can you look at these? (at 
least I see tabs instead of 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.
---

[GitHub] cloudstack pull request: CLOUDSTACK-8651: [Browser Based Upload Te...

[DaanHoogland]

Github user DaanHoogland commented on the pull request:

https://github.com/apache/cloudstack/pull/607#issuecomment-125873205
  
thanks @koushik-das , as the test issue is being addressed now please don't 
let it block this PR


---
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 pull request: CLOUDSTACK-8668: VR type in shared networ...

[kishankavala]

Github user kishankavala commented on the pull request:

https://github.com/apache/cloudstack/pull/627#issuecomment-125864299
  
@wilderrodrigues
Below changes fixed the issue but not sure if it breaks anything else:

kk-cloudstack > git diff
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config 
b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index 711d575..934ba9c 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -1339,6 +1339,10 @@ start() {
  dhcpsrvr)
  [ "$NAME" == "" ] && NAME=dhcpsrvr
  setup_dhcpsrvr
+ if [ -x /opt/cloud/bin/update_config.py ]
+ then
+/opt/cloud/bin/update_config.py cmd_line.json
+ fi
  ;;
  secstorage)
  [ "$NAME" == "" ] && NAME=secstorage


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