The network metadata should be more useful

Hi Jens, I think you possibly make the case for splitting this into two bugs. One for the status IP addressing information and the other for the IPv6 specifics.

Fix proposed to branch: master
Review: https://review.openstack.org/450211

Fix proposed to branch: master
Review: https://review.openstack.org/450212

Fix proposed to branch: master
Review: https://review.openstack.org/450297

@Jay: During developing the patch series, I found even a third issue. As the patches stack quite nicely on top of each other, I would prefer keeping this together, though.

For reference, here is the sample output before and after my patch series, for an instance with three interfaces (dual-stack slaac, dhcpv6-stateless, dhcpv6-stateful):

Old:

{
  "services": [

  ],
  "networks": [
    {
      "network_id": "58469bbc-1b36-4e2d-a098-4096ab0e956b",
      "link": "tapd15840ff-85",
      "type": "ipv4_dhcp",
      "id": "network0"
    },
    {
      "network_id": "58469bbc-1b36-4e2d-a098-4096ab0e956b",
      "link": "tapd15840ff-85",
      "type": "ipv6_dhcp",
      "id": "network1"
    },
    {
      "network_id": "7d398f31-1179-4dcd-b322-017f1dd3fa91",
      "link": "tap6d9c3001-5a",
      "type": "ipv6_dhcp",
      "id": "network2"
    },
    {
      "network_id": "b41c9da6-95b5-4d79-874a-8ff66eefe691",
      "link": "tapee59b935-fe",
      "type": "ipv6_dhcp",
      "id": "network3"
    }
  ],
  "links": [
    {
      "ethernet_mac_address": "fa:16:3e:21:90:c1",
      "mtu": 1450,
      "type": "ovs",
      "id": "tapd15840ff-85",
      "vif_id": "d15840ff-85cb-4d07-b101-9bc25e228705"
    },
    {
      "ethernet_mac_address": "fa:16:3e:90:5f:b3",
      "mtu": 1450,
      "type": "ovs",
      "id": "tap6d9c3001-5a",
      "vif_id": "6d9c3001-5a51-4f76-a22e-724c9d31236b"
    },
    {
      "ethernet_mac_address": "fa:16:3e:7a:38:15",
      "mtu": 1450,
      "type": "ovs",
      "id": "tapee59b935-fe",
      "vif_id": "ee59b935-fee0-41cb-b118-b6a2f28f455b"
    }
  ]
}

New:

{
  "services": [

  ],
  "networks": [
    {
      "network_id": "58469bbc-1b36-4e2d-a098-4096ab0e956b",
      "type": "ipv4_dhcp",
      "netmask": "255.255.255.192",
      "link": "tapd15840ff-85",
      "routes": [
        {
          "netmask": "0.0.0.0",
          "network": "0.0.0.0",
          "gateway": "10.0.0.1"
        }
      ],
      "ip_address": "10.0.0.8",
      "id": "network0"
    },
    {
      "network_id": "58469bbc-1b36-4e2d-a098-4096ab0e956b",
      "type": "ipv6_slaac",
      "netmask": "\/64",
      "link": "tapd15840ff-85",
      "routes": [
        {
          "netmask": "\/0",
          "network": "::",
          "gateway": "fdcd:6ce3:aac5::1"
        }
      ],
      "ip_address": "fdcd:6ce3:aac5:0:f816:3eff:fe21:90c1",
      "id": "network1"
    },
    {
      "network_id": "7d398f31-1179-4dcd-b322-017f1dd3fa91",
      "type": "ipv6_dhcpv6-stateless",
      "netmask": "\/64",
      "link": "tap6d9c3001-5a",
      "routes": [
        {
          "netmask": "\/0",
          "network": "::",
          "gateway": "fdcd:6ce3:aac5:1::1"
        }
      ],
      "ip_address": "fdcd:6ce3:aac5:1:f816:3eff:fe90:5fb3",
      "id": "network2"
    },
    {
      "network_id": "b41c9da6-95b5-4d79-874a-8ff66eefe691",
      "type": "ipv6_dhcpv6-stateful",
      "netmask": "\/64",
      "link": "tapee59b935-fe",
      "routes": [
        {
          "netmask": "\/0",
          "network": "::",
          "gateway": "fdcd:6ce3:aac5:3::1"
        }
      ],
      "ip_address": "fdcd:6ce3:aac5:3::c",
      "id": "network3"
    }
  ],
  "links": [
    {
      "ethernet_mac_address": "fa:16:3e:21:90:c1",
      "mtu": 1450,
      "type": "ovs",
      "id": "tapd15840ff-85",
      "vif_id": "d15840ff-85cb-4d07-b101-9bc25e2287...

Looking at how the subnet type is being parsed by cloud-init here[1] it seems that "ipv6_slaac" and "ipv6_dhcpv6-stateful" will both work fine - at least in that regard -, but "ipv6_dhcpv6-stateless" will be interpreted as dhcpv6 instead of slaac.

They also seem to completely ignore any netmask and routes information.

[1] https://git.launchpad.net/cloud-init/tree/cloudinit/sources/helpers/openstack.py#n571

Reviewed: https://review.openstack.org/450297
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=ccebded0cbb654be18db5b4e0e7f8b8a3a7cacdb
Submitter: Jenkins
Branch: master

commit ccebded0cbb654be18db5b4e0e7f8b8a3a7cacdb
Author: Jens Rosenboom <email address hidden>
Date: Mon Mar 27 15:33:25 2017 +0000

    Update network metadata type field for IPv6

    Currently it is not possible to decide from looking at the network
    metadata whether an IPv6 subnet is using slaac, dhcpv6-stateless or
    dhcpv6-stateful.

    So we add ipv6_address_mode information into the subnet metadata when
    it is available and use that to construct the subnet type.

    As a result, the type for a subnet with mode SLAAC will be "ipv6_slaac"
    instead of "ipv6_dhcp" and similarly for the other available modes.

    Change-Id: I751200a354ec9be2bfd5f94d3e4bbf53dab2c8bb
    Partial-Bug: 1676363

Change abandoned by Matt Riedemann (<email address hidden>) on branch: master
Review: https://review.openstack.org/336293
Reason: This hasn't been updated since May, has a -1 on it and is in merge conflict. If we need to discuss the -1 then I'd suggest bringing this up in the weekly nova meeting or the mailing list. Note that Thursday July 27 is feature freeze for Pike, so if this is going to get done this release it needs to move fast.

Found open reviews for this bug in gerrit, setting to In Progress.

review: https://review.openstack.org/450212 in branch: master
review: https://review.openstack.org/450211 in branch: master

Change abandoned by Sean Dague (<email address hidden>) on branch: master
Review: https://review.openstack.org/450212
Reason: This review is > 4 weeks without comment, and is not mergable in it's current state. We are abandoning this for now. Feel free to reactivate the review by pressing the restore button and leaving a 'recheck' comment to get fresh test results.

Change abandoned by Sean Dague (<email address hidden>) on branch: master
Review: https://review.openstack.org/450211
Reason: This review is > 4 weeks without comment, and is not mergable in it's current state. We are abandoning this for now. Feel free to reactivate the review by pressing the restore button and leaving a 'recheck' comment to get fresh test results.

There are no currently open reviews on this bug, changing the status back to the previous state and unassigning. If there are active reviews related to this bug, please include links in comments.