[lxc-devel] [lxd/master] api: Fix network_nat_address extension

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190418/f7c131a8/attachment.bin>
-------------- next part --------------
From 20f194700b0032c4dda94d5f2e58f05dff63b77d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 18 Apr 2019 14:55:07 +0100
Subject: [PATCH] api: Fix network_nat_address extension
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 doc/api-extensions.md | 10 +++++-----
 shared/version/api.go |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/api-extensions.md b/doc/api-extensions.md
index 3ee586b66f..16d2c5c73e 100644
--- a/doc/api-extensions.md
+++ b/doc/api-extensions.md
@@ -566,10 +566,6 @@ will be done via iptables instead of proxy devices.
 This introduces the `ipv4.nat.order` and `ipv6.nat.order` configuration keys for LXD bridges.
 Those keys control whether to put the LXD rules before or after any pre-existing rules in the chain.
 
-## network\_nat\_address
-This introduces the `ipv4.nat.address` and `ipv6.nat.address` configuration keys for LXD bridges.
-Those keys control the source address used for outbound traffic from the bridge.
-
 ## container\_full
 This introduces a new recursion=2 mode for `GET /1.0/containers` which allows for the retrieval of
 all container structs, including the state, snapshots and backup structs.
@@ -731,4 +727,8 @@ changed but the kernel map is (e.g. shiftfs).
 Expose the location of the generation of API events.
 
 ## storage\_api\_remote\_volume\_snapshots
-This allows migrating storage volumes including their snapshots.
\ No newline at end of file
+This allows migrating storage volumes including their snapshots.
+
+## network\_nat\_address
+This introduces the `ipv4.nat.address` and `ipv6.nat.address` configuration keys for LXD bridges.
+Those keys control the source address used for outbound traffic from the bridge.
diff --git a/shared/version/api.go b/shared/version/api.go
index cae5a863c9..fabc6e3a25 100644
--- a/shared/version/api.go
+++ b/shared/version/api.go
@@ -147,6 +147,7 @@ var APIExtensions = []string{
 	"id_map_current",
 	"event_location",
 	"storage_api_remote_volume_snapshots",
+	"network_nat_address",
 }
 
 // APIExtensionsCount returns the number of available API extensions.