You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by mikezaccardo <gi...@git.apache.org> on 2015/06/18 20:37:52 UTC
[GitHub] incubator-brooklyn pull request: Fix GeoscalingWebClient create pr...
GitHub user mikezaccardo opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/697
Fix GeoscalingWebClient create primary domain REST call
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/mikezaccardo/incubator-brooklyn fix/geoscaling-web-client
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/697.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 #697
----
commit c4357954dc374e64d16b476d1c9c57fcd6f24474
Author: Mike Zaccardo <mi...@cloudsoftcorp.com>
Date: 2015-06-18T18:36:23Z
Fix GeoscalingWebClient create primary domain REST call
----
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix GeoscalingWebClient create pr...
Posted by mikezaccardo <gi...@git.apache.org>.
Github user mikezaccardo commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/697#discussion_r32783805
--- Diff: software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java ---
@@ -42,8 +42,8 @@
private final static String USERNAME = "cloudsoft";
private final static String PASSWORD = "cl0uds0ft";
- private final static String PRIMARY_DOMAIN = "domain"+((int)(Math.random()*10000))+".test.org";
- private final static String SUBDOMAIN = "subdomain"+((int)(Math.random()*10000));
+ private final static String PRIMARY_DOMAIN = "domain"+((int)(Math.random()*10000) + 10000)+".test.org";
+ private final static String SUBDOMAIN = "subdomain"+((int)(Math.random()*10000) + 10000);
--- End diff --
To guarantee that they don't collide with the existing domains (as unlikely as it is).
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix GeoscalingWebClient create pr...
Posted by ahgittin <gi...@git.apache.org>.
Github user ahgittin commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/697#discussion_r32824245
--- Diff: software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java ---
@@ -42,8 +42,8 @@
private final static String USERNAME = "cloudsoft";
private final static String PASSWORD = "cl0uds0ft";
- private final static String PRIMARY_DOMAIN = "domain"+((int)(Math.random()*10000))+".test.org";
- private final static String SUBDOMAIN = "subdomain"+((int)(Math.random()*10000));
+ private final static String PRIMARY_DOMAIN = "domain"+((int)(Math.random()*10000) + 10000)+".test.org";
--- End diff --
use `Strings.makeRandomId()` or `Strings.makeZeroPaddedString()` instead ?
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix GeoscalingWebClient create pr...
Posted by alasdairhodge <gi...@git.apache.org>.
Github user alasdairhodge commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/697#issuecomment-113295758
Nice catch, Mike; thanks for digging into this :o)
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix GeoscalingWebClient create pr...
Posted by mikezaccardo <gi...@git.apache.org>.
Github user mikezaccardo commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/697#issuecomment-113254609
The subdomain component of the tests work so they both pass now -- thanks @alasdairhodge
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix GeoscalingWebClient create pr...
Posted by mikezaccardo <gi...@git.apache.org>.
Github user mikezaccardo commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/697#issuecomment-113539223
^ Done x3
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix GeoscalingWebClient create pr...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-brooklyn/pull/697
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix GeoscalingWebClient create pr...
Posted by alasdairhodge <gi...@git.apache.org>.
Github user alasdairhodge commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/697#discussion_r32810939
--- Diff: software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java ---
@@ -42,8 +42,8 @@
private final static String USERNAME = "cloudsoft";
private final static String PASSWORD = "cl0uds0ft";
- private final static String PRIMARY_DOMAIN = "domain"+((int)(Math.random()*10000))+".test.org";
- private final static String SUBDOMAIN = "subdomain"+((int)(Math.random()*10000));
+ private final static String PRIMARY_DOMAIN = "domain"+((int)(Math.random()*10000) + 10000)+".test.org";
+ private final static String SUBDOMAIN = "subdomain"+((int)(Math.random()*10000) + 10000);
--- End diff --
Hmm, I don't think that's necessary: the existing (what, four?) `*.test.org` domains look like remnants of previous failed test runs and should be deleted.
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix GeoscalingWebClient create pr...
Posted by alasdairhodge <gi...@git.apache.org>.
Github user alasdairhodge commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/697#discussion_r32780866
--- Diff: software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java ---
@@ -42,8 +42,8 @@
private final static String USERNAME = "cloudsoft";
private final static String PASSWORD = "cl0uds0ft";
- private final static String PRIMARY_DOMAIN = "domain"+((int)(Math.random()*10000))+".test.org";
- private final static String SUBDOMAIN = "subdomain"+((int)(Math.random()*10000));
+ private final static String PRIMARY_DOMAIN = "domain"+((int)(Math.random()*10000) + 10000)+".test.org";
+ private final static String SUBDOMAIN = "subdomain"+((int)(Math.random()*10000) + 10000);
--- End diff --
Why the constant offset? Trying to keep the lengths consistent?
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix GeoscalingWebClient create pr...
Posted by mikezaccardo <gi...@git.apache.org>.
Github user mikezaccardo commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/697#issuecomment-113525557
Will improve cleanup logic, use better name generation, and remove vestigial domains from GeoScaling.
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix GeoscalingWebClient create pr...
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/697#issuecomment-113621272
Thanks @mikezaccardo - looks good; merging.
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-brooklyn pull request: Fix GeoscalingWebClient create pr...
Posted by alasdairhodge <gi...@git.apache.org>.
Github user alasdairhodge commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/697#discussion_r32811012
--- Diff: software/webapp/src/test/java/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java ---
@@ -42,8 +42,8 @@
private final static String USERNAME = "cloudsoft";
private final static String PASSWORD = "cl0uds0ft";
- private final static String PRIMARY_DOMAIN = "domain"+((int)(Math.random()*10000))+".test.org";
- private final static String SUBDOMAIN = "subdomain"+((int)(Math.random()*10000));
+ private final static String PRIMARY_DOMAIN = "domain"+((int)(Math.random()*10000) + 10000)+".test.org";
+ private final static String SUBDOMAIN = "subdomain"+((int)(Math.random()*10000) + 10000);
--- End diff --
Actually, that makes me think we should review the domain cleanup logic in the test; looks like tear-down code wasn't executed following previous test failures...
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---