You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jclouds.apache.org by Zack Shoylev <no...@github.com> on 2014/09/03 18:44:41 UTC

[jclouds-labs-openstack] Cleans up neutron code (#139)

You can merge this Pull Request by running:

  git pull https://github.com/rackerlabs/jclouds-labs-openstack neutron-small-cleanup

Or you can view, comment on it, or merge it online at:

  https://github.com/jclouds/jclouds-labs-openstack/pull/139

-- Commit Summary --

  * Cleans up neutron code

-- File Changes --

    M openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IPv6DHCPMode.java (2)
    M openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkStatus.java (2)
    M openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkType.java (16)
    M openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java (12)
    M openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RuleDirection.java (2)
    M openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RuleEthertype.java (2)
    M openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RuleProtocol.java (2)
    M openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java (2)
    M openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/VIFType.java (2)
    M openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/VNICType.java (2)
    M openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApi.java (4)
    M openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiLiveTest.java (77)

-- Patch Links --

https://github.com/jclouds/jclouds-labs-openstack/pull/139.patch
https://github.com/jclouds/jclouds-labs-openstack/pull/139.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Andrew Phillips <no...@github.com>.
Thanks for the changes, @zack-shoylev! Still a couple of [Checkstyle violations](https://jclouds.ci.cloudbees.com/job/jclouds-labs-openstack-pull-requests/405/violations/), by the way...but they don't seem to be related to this PR..?

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54551288

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Zack Shoylev <no...@github.com>.
merged

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-55014427

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Andrew Phillips <no...@github.com>.
> @@ -40,7 +40,7 @@ public String toString() {
>        return name;
>     }
>  
> -   /**

> was OK here, so why the change?

Originally my review comment, @jdaggett ;-) I made it because this seems like a comment for a jclouds-dev, not something a **user** of jclouds would expect in the Javadoc.

A user-facing description would be something like "Converts a string representation to the appropriate enum, with A, B and C special features" or so. But I don't really think we need that?

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139/files#r17145229

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Zack Shoylev <no...@github.com>.
I still have to figure out if we want to do something about *Options to distinguish from the old patterns.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54326965

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-labs-openstack-pull-requests #413](https://jclouds.ci.cloudbees.com/job/jclouds-labs-openstack-pull-requests/413/) SUCCESS
This pull request looks good

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-55015437

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Zack Shoylev <no...@github.com>.
This seems good to rebase and merge.I will hold off on it for a bit, but would like to merge and then work on getting neutron backported to 1.8.x today.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54982148

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Zack Shoylev <no...@github.com>.
Most of these changes were based on comments here:
https://github.com/jclouds/jclouds-labs-openstack/pull/132

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54340665

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Jeremy Daggett <no...@github.com>.
> @@ -40,7 +40,7 @@ public String toString() {
>        return name;
>     }
>  
> -   /**

`/**` was OK here, so why the change?

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139/files#r17063974

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Jeremy Daggett <no...@github.com>.
There are other instances where `/**` changed to `/*` and if you could revert those changes that would be awesome! +1 once the changes and other comments have been addressed. 

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54332242

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-labs-openstack-pull-requests #411](https://jclouds.ci.cloudbees.com/job/jclouds-labs-openstack-pull-requests/411/) SUCCESS
This pull request looks good

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54745331

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Zack Shoylev <no...@github.com>.
Thanks @jdaggett !

I will be sitting on this one for a bit to figure out if we want to rename createOptions/updateOptions.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54509797

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Zack Shoylev <no...@github.com>.
> @@ -40,7 +40,7 @@ public String toString() {
>        return name;
>     }
>  
> -   /**

Internal to jclouds?

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139/files#r17068569

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Zack Shoylev <no...@github.com>.
@jdaggett let me know if my comments answer your questions or if there is anything else. Thanks!

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54480981

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Zack Shoylev <no...@github.com>.
About to rebase and merge

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-55013556

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-labs-openstack #1665](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs-openstack/1665/) SUCCESS
This pull request looks good
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54328616

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Jeremy Daggett <no...@github.com>.
>  
> -         Rule newSecGroupRule = null;
> -         for(Rule sgr : securityGroup.getRules()) {
> -            if(sgr.getId().equals(rule.getId())) {
> -               newSecGroupRule = sgr;
> -               break;
> -            }
> -         }
> -         assertNotNull(newSecGroupRule, "Did not find the new rule in the group.");
> +            assertEquals(securityGroup.getRules().size(), 3);

`assertEquals(securityGroup.getRules().size(), 3, "Expected 3 default rules");` as was on line 54...


---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139/files#r17064283

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-labs-openstack-pull-requests #409](https://jclouds.ci.cloudbees.com/job/jclouds-labs-openstack-pull-requests/409/) SUCCESS
This pull request looks good

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54655650

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-labs-openstack-pull-requests #408](https://jclouds.ci.cloudbees.com/job/jclouds-labs-openstack-pull-requests/408/) SUCCESS
This pull request looks good

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54650942

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-labs-openstack #1674](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs-openstack/1674/) SUCCESS
This pull request looks good
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54482076

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Zack Shoylev <no...@github.com>.
Closed #139.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#event-163242588

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Zack Shoylev <no...@github.com>.
Checkstyle violations seem to have been fixed.
This still needs *Options naming changes, if any.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54661390

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Jeremy Daggett <no...@github.com>.
> @@ -38,7 +38,7 @@ public String toString() {
>        return name();
>     }
>  
> -   /**
> +   /*

Same as above!

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139/files#r17063978

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-labs-openstack-pull-requests #403](https://jclouds.ci.cloudbees.com/job/jclouds-labs-openstack-pull-requests/403/) SUCCESS
This pull request looks good

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54329013

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-labs-openstack-pull-requests #405](https://jclouds.ci.cloudbees.com/job/jclouds-labs-openstack-pull-requests/405/) SUCCESS
This pull request looks good

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54482376

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by BuildHive <no...@github.com>.
[jclouds » jclouds-labs-openstack #1690](https://buildhive.cloudbees.com/job/jclouds/job/jclouds-labs-openstack/1690/) SUCCESS
This pull request looks good
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54745265

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-labs-openstack-pull-requests #412](https://jclouds.ci.cloudbees.com/job/jclouds-labs-openstack-pull-requests/412/) SUCCESS
This pull request looks good

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54980196

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Andrew Phillips <no...@github.com>.
> This still needs *Options naming changes, if any.

Would you rather wait for that discussion, or commit this and then make any *Options changes (which will affect not only Neutron, I think?) in a separate PR?

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-54689716

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Andrew Phillips <no...@github.com>.
+1 - looks good to me, too. Thanks for the updates, @zack-shoylev!

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139#issuecomment-55056740

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Zack Shoylev <no...@github.com>.
>  
> -         Rule newSecGroupRule = null;
> -         for(Rule sgr : securityGroup.getRules()) {
> -            if(sgr.getId().equals(rule.getId())) {
> -               newSecGroupRule = sgr;
> -               break;
> -            }
> -         }
> -         assertNotNull(newSecGroupRule, "Did not find the new rule in the group.");
> +            assertEquals(securityGroup.getRules().size(), 3);

What do you mean? The error message was supposed to have been removed, as the default message is better.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139/files#r17113690

Re: [jclouds-labs-openstack] Cleans up neutron code (#139)

Posted by Jeremy Daggett <no...@github.com>.
> @@ -18,8 +18,8 @@
>  package org.jclouds.openstack.neutron.v2.domain;
>  
>  /**
> - * Enumerates supported Network types. 
> - * 
> + * Enumerates supported Network types.
> + *
>   * @see <a href=
>   *      "http://docs.openstack.org/api/openstack-network/2.0/content/provider_ext.html">api doc</a>

Nuke the links too ;)

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs-openstack/pull/139/files#r17064007