Merge lp:~danwent/neutron/test-show-no-attachment into lp:neutron/essex

[dan wendlandt]

This does not change functionality.

It adds unit tests to validate how the API performs when fetching a port attachment when no attachment is set.

[Somik Behera (somikbehera)]

Unit test looks good.

review: Approve (netstack-core)

[Brad Hall (bgh)]

Looks good

review: Approve

[Tyler Smith (tylesmit)]

Looks good.

review: Approve

[dan wendlandt (danwent)]

quickest review EVER! thanks :)

On Fri, Sep 23, 2011 at 1:31 PM, Tyler Smith <email address hidden> wrote:

> Review: Approve
>
> Looks good.
> --
>
> https://code.launchpad.net/~danwent/quantum/test-show-no-attachment/+merge/76801
> You are the owner of lp:~danwent/quantum/test-show-no-attachment.
>

--
~~~~~~~~~~~~~~~~~~~~~~~~~~~
Dan Wendlandt
Nicira Networks, Inc.
www.nicira.com | www.openvswitch.org
Sr. Product Manager
cell: 650-906-2650
~~~~~~~~~~~~~~~~~~~~~~~~~~~

[James E. Blair (corvus)]

dan wendlandt <email address hidden> writes:

> dan wendlandt has proposed merging lp:~danwent/quantum/test-show-no-attachment into lp:quantum.

Hi,

Shouldn't this be in Gerrit?

  http://wiki.openstack.org/GerritWorkflow

-Jim

[dan wendlandt (danwent)]

Hi Jim,

This is still for diablo (we delayed our release one day, so it is releasing
today).

dan

On Fri, Sep 23, 2011 at 2:55 PM, James E. Blair <email address hidden> wrote:

> dan wendlandt <email address hidden> writes:
>
> > dan wendlandt has proposed merging
> lp:~danwent/quantum/test-show-no-attachment into lp:quantum.
>
> Hi,
>
> Shouldn't this be in Gerrit?
>
> http://wiki.openstack.org/GerritWorkflow
>
> -Jim
>
> --
>
> https://code.launchpad.net/~danwent/quantum/test-show-no-attachment/+merge/76801
> You are the owner of lp:~danwent/quantum/test-show-no-attachment.
>

--
~~~~~~~~~~~~~~~~~~~~~~~~~~~
Dan Wendlandt
Nicira Networks, Inc.
www.nicira.com | www.openvswitch.org
Sr. Product Manager
cell: 650-906-2650
~~~~~~~~~~~~~~~~~~~~~~~~~~~

[Salvatore Orlando (salvatore-orlando)]

> dan wendlandt <email address hidden> writes:
>
> > dan wendlandt has proposed merging lp:~danwent/quantum/test-show-no-
> attachment into lp:quantum.
>
> Hi,
>
> Shouldn't this be in Gerrit?
>
> http://wiki.openstack.org/GerritWorkflow
>
> -Jim

Hu Jim,

I think we are still merging into launchpad, as these are 'last-minute' patches into the diablo release, which will come from Launchpad.

Dan, please correct me if I'm wrong.

[Salvatore Orlando (salvatore-orlando)]

Dan, thanks for adding this code.

Just a note: approving this branch implies we accept the current API behavior and hence will keep a malfunctioning Quantum Manager in Nova's diablo release.

Please tell me that I'm wrong.

review: Needs Information

[dan wendlandt (danwent)]

Yes, let's chat about this.

On Fri, Sep 23, 2011 at 3:17 PM, Salvatore Orlando <
<email address hidden>> wrote:

> Review: Needs Information
>
> Dan, thanks for adding this code.
>
> Just a note: approving this branch implies we accept the current API
> behavior and hence will keep a malfunctioning Quantum Manager in Nova's
> diablo release.
>
> Please tell me that I'm wrong.
>
> --
>
> https://code.launchpad.net/~danwent/quantum/test-show-no-attachment/+merge/76801
> You are the owner of lp:~danwent/quantum/test-show-no-attachment.
>

--
~~~~~~~~~~~~~~~~~~~~~~~~~~~
Dan Wendlandt
Nicira Networks, Inc.
www.nicira.com | www.openvswitch.org
Sr. Product Manager
cell: 650-906-2650
~~~~~~~~~~~~~~~~~~~~~~~~~~~

[James E. Blair (corvus)]

dan wendlandt <email address hidden> writes:

> Hi Jim,
>
> This is still for diablo (we delayed our release one day, so it is releasing
> today).

Oh, in that case maybe this proposal should be targeted to
lp:quantum/diablo instead of lp:quantum? At this point lp:quantum is a
mirror of github.

-Jim

[Salvatore Orlando (salvatore-orlando)]

Agreed to approve after discussion on IRC.

review: Approve

[dan wendlandt (danwent)]

On Fri, Sep 23, 2011 at 3:31 PM, James E. Blair <email address hidden> wrote:

> dan wendlandt <email address hidden> writes:
>
> > Hi Jim,
> >
> > This is still for diablo (we delayed our release one day, so it is
> releasing
> > today).
>
> Oh, in that case maybe this proposal should be targeted to
> lp:quantum/diablo instead of lp:quantum? At this point lp:quantum is a
> mirror of github.
>

Ok, I am actually merging them into lp:quantum/diablo anyway. I will play
with lauchpad to try to make things look sane :)

dan

>
> -Jim
>
> --
>
> https://code.launchpad.net/~danwent/quantum/test-show-no-attachment/+merge/76801
> You are the owner of lp:~danwent/quantum/test-show-no-attachment.
>

--
~~~~~~~~~~~~~~~~~~~~~~~~~~~
Dan Wendlandt
Nicira Networks, Inc.
www.nicira.com | www.openvswitch.org
Sr. Product Manager
cell: 650-906-2650
~~~~~~~~~~~~~~~~~~~~~~~~~~~

[dan wendlandt (danwent)]

Turns out we can't merge directly into lp:quantum, as it mirrors github. I merged this directly into lp:quantum/diablo

=== modified file 'tests/unit/test_api.py'
--- tests/unit/test_api.py	2011-09-09 15:59:55 +0000
+++ tests/unit/test_api.py	2011-09-23 20:18:01 +0000
@@ -645,6 +645,22 @@
         self.assertEqual(attachment_data['attachment']['id'], interface_id)
         LOG.debug("_test_show_attachment - format:%s - END", format)
 
+    def _test_show_attachment_none_set(self, format):
+        LOG.debug("_test_show_attachment_none_set - format:%s - START", format)
+        content_type = "application/%s" % format
+        port_state = "ACTIVE"
+        network_id = self._create_network(format)
+        port_id = self._create_port(network_id, port_state, format)
+        get_attachment_req = testlib.get_attachment_request(self.tenant_id,
+                                                            network_id,
+                                                            port_id,
+                                                            format)
+        get_attachment_res = get_attachment_req.get_response(self.api)
+        attachment_data = Serializer().deserialize(get_attachment_res.body,
+                                                   content_type)
+        self.assertTrue('id' not in attachment_data['attachment'])
+        LOG.debug("_test_show_attachment_none_set - format:%s - END", format)
+
     def _test_show_attachment_networknotfound(self, format):
         LOG.debug("_test_show_attachment_networknotfound - format:%s - START",
                   format)
@@ -1005,6 +1021,12 @@
     def test_show_attachment_json(self):
         self._test_show_attachment('json')
 
+    def test_show_attachment_none_set_xml(self):
+        self._test_show_attachment_none_set('xml')
+
+    def test_show_attachment_none_set_json(self):
+        self._test_show_attachment_none_set('json')
+
     def test_show_attachment_networknotfound_xml(self):
         self._test_show_attachment_networknotfound('xml')