The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/7299
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
From 40dbef05ff99aeb1747b2b003411dbe3ec7195f7 Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:27:12 +0100
Subject: [PATCH 01/15] lxd/db: Rename NetworksNodeConfig to
GetNetworksLocalConfig
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/api_cluster.go | 2 +-
lxd/cluster/membership.go | 2 +-
lxd/db/networks.go | 7 ++++---
lxd/db/networks_test.go | 6 +++---
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go
index abe21b7e44..b1a5f816e7 100644
--- a/lxd/api_cluster.go
+++ b/lxd/api_cluster.go
@@ -130,7 +130,7 @@ func clusterGetMemberConfig(cluster *db.Cluster)
([]api.ClusterMemberConfigKey,
return errors.Wrapf(err, "Failed to fetch storage pools
configuration")
}
- networks, err = tx.NetworksNodeConfig()
+ networks, err = tx.GetNetworksLocalConfig()
if err != nil {
return errors.Wrapf(err, "Failed to fetch networks
configuration")
}
diff --git a/lxd/cluster/membership.go b/lxd/cluster/membership.go
index 23590ff70e..5773986ad0 100644
--- a/lxd/cluster/membership.go
+++ b/lxd/cluster/membership.go
@@ -285,7 +285,7 @@ func Join(state *state.State, gateway *Gateway, cert
*shared.CertInfo, name stri
if err != nil {
return err
}
- networks, err = tx.NetworksNodeConfig()
+ networks, err = tx.GetNetworksLocalConfig()
if err != nil {
return err
}
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index ba138cad5a..a8be9e47d3 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -12,9 +12,10 @@ import (
"github.com/lxc/lxd/shared/api"
)
-// NetworksNodeConfig returns a map associating each network name to its
-// node-specific config values (i.e. the ones where node_id is not NULL).
-func (c *ClusterTx) NetworksNodeConfig() (map[string]map[string]string, error)
{
+// GetNetworksLocalConfig returns a map associating each network name to its
+// node-specific config values on the local node (i.e. the ones where node_id
+// equals the ID of the local node).
+func (c *ClusterTx) GetNetworksLocalConfig() (map[string]map[string]string,
error) {
names, err := query.SelectStrings(c.tx, "SELECT name FROM networks")
if err != nil {
return nil, err
diff --git a/lxd/db/networks_test.go b/lxd/db/networks_test.go
index 7ec66ccb13..f1d385509f 100644
--- a/lxd/db/networks_test.go
+++ b/lxd/db/networks_test.go
@@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/require"
)
-// The NetworksNodeConfigs method returns only node-specific config values.
-func TestNetworksNodeConfigs(t *testing.T) {
+// The GetNetworksLocalConfigs method returns only node-specific config values.
+func TestGetNetworksLocalConfigs(t *testing.T) {
cluster, cleanup := db.NewTestCluster(t)
defer cleanup()
@@ -25,7 +25,7 @@ func TestNetworksNodeConfigs(t *testing.T) {
err = cluster.Transaction(func(tx *db.ClusterTx) error {
var err error
- config, err = tx.NetworksNodeConfig()
+ config, err = tx.GetNetworksLocalConfig()
return err
})
require.NoError(t, err)
From 215730deb733016779d76e1974d1d4d27f23cf9f Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:30:02 +0100
Subject: [PATCH 02/15] lxd/db: Rename NetworkIDsNotPending to
GetNonPendingNetworkIDs
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/cluster/membership.go | 2 +-
lxd/db/networks.go | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxd/cluster/membership.go b/lxd/cluster/membership.go
index 5773986ad0..66c245ca93 100644
--- a/lxd/cluster/membership.go
+++ b/lxd/cluster/membership.go
@@ -412,7 +412,7 @@ func Join(state *state.State, gateway *Gateway, cert
*shared.CertInfo, name stri
}
// Networks.
- ids, err = tx.NetworkIDsNotPending()
+ ids, err = tx.GetNonPendingNetworkIDs()
if err != nil {
return errors.Wrap(err, "failed to get cluster network
IDs")
}
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index a8be9e47d3..0255357651 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -34,10 +34,10 @@ func (c *ClusterTx) GetNetworksLocalConfig()
(map[string]map[string]string, erro
return networks, nil
}
-// NetworkIDsNotPending returns a map associating each network name to its ID.
+// GetNonPendingNetworkIDs returns a map associating each network name to its
ID.
//
// Pending networks are skipped.
-func (c *ClusterTx) NetworkIDsNotPending() (map[string]int64, error) {
+func (c *ClusterTx) GetNonPendingNetworkIDs() (map[string]int64, error) {
networks := []struct {
id int64
name string
From 485d9bd281a1d0d80ca81efc18d7d29ea03f601e Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:31:48 +0100
Subject: [PATCH 03/15] lxd/db: Rename NetworkID to GetNetworkID
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/db/networks.go | 4 ++--
lxd/db/networks_test.go | 2 +-
lxd/networks.go | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index 0255357651..624027267e 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -66,8 +66,8 @@ func (c *ClusterTx) GetNonPendingNetworkIDs()
(map[string]int64, error) {
return ids, nil
}
-// NetworkID returns the ID of the network with the given name.
-func (c *ClusterTx) NetworkID(name string) (int64, error) {
+// GetNetworkID returns the ID of the network with the given name.
+func (c *ClusterTx) GetNetworkID(name string) (int64, error) {
stmt := "SELECT id FROM networks WHERE name=?"
ids, err := query.SelectIntegers(c.tx, stmt, name)
if err != nil {
diff --git a/lxd/db/networks_test.go b/lxd/db/networks_test.go
index f1d385509f..8a76d43289 100644
--- a/lxd/db/networks_test.go
+++ b/lxd/db/networks_test.go
@@ -48,7 +48,7 @@ func TestNetworkCreatePending(t *testing.T) {
err = tx.NetworkCreatePending("buzz", "network1", config)
require.NoError(t, err)
- networkID, err := tx.NetworkID("network1")
+ networkID, err := tx.GetNetworkID("network1")
require.NoError(t, err)
assert.True(t, networkID > 0)
diff --git a/lxd/networks.go b/lxd/networks.go
index c3c84a64fb..7a4fa76494 100644
--- a/lxd/networks.go
+++ b/lxd/networks.go
@@ -229,7 +229,7 @@ func networksPostCluster(d *Daemon, req api.NetworksPost)
error {
var networkID int64
err = d.cluster.Transaction(func(tx *db.ClusterTx) error {
// Fetch the network ID.
- networkID, err = tx.NetworkID(req.Name)
+ networkID, err = tx.GetNetworkID(req.Name)
if err != nil {
return err
}
From a423a80964a2c9bc30a41a33b778f7d1f475ee58 Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:32:30 +0100
Subject: [PATCH 04/15] lxd/db: Rename NetworkConfigAdd to CreateNetworkConfig
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/cluster/membership.go | 2 +-
lxd/db/networks.go | 6 +++---
lxd/networks.go | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lxd/cluster/membership.go b/lxd/cluster/membership.go
index 66c245ca93..326ea0ceba 100644
--- a/lxd/cluster/membership.go
+++ b/lxd/cluster/membership.go
@@ -425,7 +425,7 @@ func Join(state *state.State, gateway *Gateway, cert
*shared.CertInfo, name stri
if err != nil {
return errors.Wrap(err, "failed to add joining
node's to the network")
}
- err = tx.NetworkConfigAdd(id, node.ID, config)
+ err = tx.CreateNetworkConfig(id, node.ID, config)
if err != nil {
return errors.Wrap(err, "failed to add joining
node's network config")
}
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index 624027267e..1bd235a7f8 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -83,8 +83,8 @@ func (c *ClusterTx) GetNetworkID(name string) (int64, error) {
}
}
-// NetworkConfigAdd adds a new entry in the networks_config table
-func (c *ClusterTx) NetworkConfigAdd(networkID, nodeID int64, config
map[string]string) error {
+// CreateNetworkConfig adds a new entry in the networks_config table
+func (c *ClusterTx) CreateNetworkConfig(networkID, nodeID int64, config
map[string]string) error {
return networkConfigAdd(c.tx, networkID, nodeID, config)
}
@@ -218,7 +218,7 @@ func (c *ClusterTx) NetworkCreatePending(node, name string,
conf map[string]stri
if err != nil {
return err
}
- err = c.NetworkConfigAdd(networkID, nodeInfo.ID, conf)
+ err = c.CreateNetworkConfig(networkID, nodeInfo.ID, conf)
if err != nil {
return err
}
diff --git a/lxd/networks.go b/lxd/networks.go
index 7a4fa76494..b729c06fd5 100644
--- a/lxd/networks.go
+++ b/lxd/networks.go
@@ -247,7 +247,7 @@ func networksPostCluster(d *Daemon, req api.NetworksPost)
error {
}
// Insert the global config keys.
- return tx.NetworkConfigAdd(networkID, 0, req.Config)
+ return tx.CreateNetworkConfig(networkID, 0, req.Config)
})
if err != nil {
if err == db.ErrNoSuchObject {
From 29c76b56e161b5fa17c05206f0bb6cdabda70dbe Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:34:32 +0100
Subject: [PATCH 05/15] lxd/db: Rename Networks to GetNetworks
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/api_cluster.go | 4 ++--
lxd/cluster/membership_test.go | 2 +-
lxd/db/migration_test.go | 2 +-
lxd/db/networks.go | 4 ++--
lxd/network/network_utils.go | 2 +-
lxd/networks.go | 2 +-
lxd/networks_utils.go | 2 +-
lxd/patches.go | 4 ++--
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go
index b1a5f816e7..74cf38524a 100644
--- a/lxd/api_cluster.go
+++ b/lxd/api_cluster.go
@@ -427,7 +427,7 @@ func clusterPutJoin(d *Daemon, req api.ClusterPut)
response.Response {
}
networks := []api.Network{}
- networkNames, err := d.cluster.Networks()
+ networkNames, err := d.cluster.GetNetworks()
if err != nil && err != db.ErrNoSuchObject {
return err
}
@@ -1035,7 +1035,7 @@ func clusterNodeDelete(d *Daemon, r *http.Request)
response.Response {
return response.SmartError(err)
}
- networks, err := d.cluster.Networks()
+ networks, err := d.cluster.GetNetworks()
if err != nil {
return response.SmartError(err)
}
diff --git a/lxd/cluster/membership_test.go b/lxd/cluster/membership_test.go
index 35aa6360e1..ef32100e27 100644
--- a/lxd/cluster/membership_test.go
+++ b/lxd/cluster/membership_test.go
@@ -270,7 +270,7 @@ func TestJoin(t *testing.T) {
err = cluster.Bootstrap(targetState, targetGateway, "buzz")
require.NoError(t, err)
- _, err = targetState.Cluster.Networks()
+ _, err = targetState.Cluster.GetNetworks()
require.NoError(t, err)
// Setup a joining node
diff --git a/lxd/db/migration_test.go b/lxd/db/migration_test.go
index 7060892c6c..c63d84a75e 100644
--- a/lxd/db/migration_test.go
+++ b/lxd/db/migration_test.go
@@ -81,7 +81,7 @@ func TestImportPreClusteringData(t *testing.T) {
require.NoError(t, err)
// networks
- networks, err := cluster.Networks()
+ networks, err := cluster.GetNetworks()
require.NoError(t, err)
assert.Equal(t, []string{"lxcbr0"}, networks)
id, network, err := cluster.NetworkGet("lxcbr0")
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index 1bd235a7f8..2140cf8b44 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -252,8 +252,8 @@ func (c *ClusterTx) networkState(name string, state int)
error {
return nil
}
-// Networks returns the names of existing networks.
-func (c *Cluster) Networks() ([]string, error) {
+// GetNetworks returns the names of existing networks.
+func (c *Cluster) GetNetworks() ([]string, error) {
return c.networks("")
}
diff --git a/lxd/network/network_utils.go b/lxd/network/network_utils.go
index 91c6c632a0..53b830306c 100644
--- a/lxd/network/network_utils.go
+++ b/lxd/network/network_utils.go
@@ -221,7 +221,7 @@ func UpdateDNSMasqStatic(s *state.State, networkName
string) error {
var networks []string
if networkName == "" {
var err error
- networks, err = s.Cluster.Networks()
+ networks, err = s.Cluster.GetNetworks()
if err != nil {
return err
}
diff --git a/lxd/networks.go b/lxd/networks.go
index b729c06fd5..7587b95a06 100644
--- a/lxd/networks.go
+++ b/lxd/networks.go
@@ -860,7 +860,7 @@ func networkStartup(s *state.State) error {
func networkShutdown(s *state.State) error {
// Get a list of managed networks
- networks, err := s.Cluster.Networks()
+ networks, err := s.Cluster.GetNetworks()
if err != nil {
return err
}
diff --git a/lxd/networks_utils.go b/lxd/networks_utils.go
index 52210d4a44..c7c61f068e 100644
--- a/lxd/networks_utils.go
+++ b/lxd/networks_utils.go
@@ -26,7 +26,7 @@ func networkAutoAttach(cluster *db.Cluster, devName string)
error {
}
func networkGetInterfaces(cluster *db.Cluster) ([]string, error) {
- networks, err := cluster.Networks()
+ networks, err := cluster.GetNetworks()
if err != nil {
return nil, err
}
diff --git a/lxd/patches.go b/lxd/patches.go
index 29ed6c0a41..b736f48377 100644
--- a/lxd/patches.go
+++ b/lxd/patches.go
@@ -296,7 +296,7 @@ func patchInvalidProfileNames(name string, d *Daemon) error
{
func patchNetworkPermissions(name string, d *Daemon) error {
// Get the list of networks
- networks, err := d.cluster.Networks()
+ networks, err := d.cluster.GetNetworks()
if err != nil {
return err
}
@@ -2678,7 +2678,7 @@ func patchStorageZFSVolumeSize(name string, d *Daemon)
error {
func patchNetworkDnsmasqHosts(name string, d *Daemon) error {
// Get the list of networks
- networks, err := d.cluster.Networks()
+ networks, err := d.cluster.GetNetworks()
if err != nil {
return err
}
From b261cebd2cb51160b9bf734a29af8fde9514789e Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:35:30 +0100
Subject: [PATCH 06/15] lxd/db: Rename NetworksNotPending to
GetNonPendingNetworks
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/api_cluster.go | 2 +-
lxd/db/networks.go | 4 ++--
lxd/networks.go | 2 +-
lxd/networks_utils.go | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go
index 74cf38524a..e1aea981f2 100644
--- a/lxd/api_cluster.go
+++ b/lxd/api_cluster.go
@@ -1467,7 +1467,7 @@ func clusterCheckStoragePoolsMatch(cluster *db.Cluster,
reqPools []api.StoragePo
}
func clusterCheckNetworksMatch(cluster *db.Cluster, reqNetworks []api.Network)
error {
- networkNames, err := cluster.NetworksNotPending()
+ networkNames, err := cluster.GetNonPendingNetworks()
if err != nil && err != db.ErrNoSuchObject {
return err
}
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index 2140cf8b44..623df21387 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -257,9 +257,9 @@ func (c *Cluster) GetNetworks() ([]string, error) {
return c.networks("")
}
-// NetworksNotPending returns the names of all networks that are not
+// GetNonPendingNetworks returns the names of all networks that are not
// pending.
-func (c *Cluster) NetworksNotPending() ([]string, error) {
+func (c *Cluster) GetNonPendingNetworks() ([]string, error) {
return c.networks("NOT state=?", networkPending)
}
diff --git a/lxd/networks.go b/lxd/networks.go
index 7587b95a06..c7b92e5844 100644
--- a/lxd/networks.go
+++ b/lxd/networks.go
@@ -836,7 +836,7 @@ func networkLeasesGet(d *Daemon, r *http.Request)
response.Response {
func networkStartup(s *state.State) error {
// Get a list of managed networks
- networks, err := s.Cluster.NetworksNotPending()
+ networks, err := s.Cluster.GetNonPendingNetworks()
if err != nil {
return err
}
diff --git a/lxd/networks_utils.go b/lxd/networks_utils.go
index c7c61f068e..beafa5ba86 100644
--- a/lxd/networks_utils.go
+++ b/lxd/networks_utils.go
@@ -137,7 +137,7 @@ func networkValidAddressCIDRV4(value string) error {
// networkUpdateForkdnsServersTask runs every 30s and refreshes the forkdns
servers list.
func networkUpdateForkdnsServersTask(s *state.State, heartbeatData
*cluster.APIHeartbeat) error {
// Get a list of managed networks
- networks, err := s.Cluster.NetworksNotPending()
+ networks, err := s.Cluster.GetNonPendingNetworks()
if err != nil {
return err
}
From beecd97151702003cb9b23eb665ad9cd0f27ec54 Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:37:07 +0100
Subject: [PATCH 07/15] lxd/db: Rename NetworksNotPending to GetNonNetworks
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/api_cluster.go | 4 ++--
lxd/db/migration_test.go | 2 +-
lxd/db/networks.go | 10 +++++-----
lxd/device/nic_bridged.go | 2 +-
lxd/network/network_load.go | 2 +-
lxd/networks.go | 8 ++++----
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go
index e1aea981f2..a00af4078d 100644
--- a/lxd/api_cluster.go
+++ b/lxd/api_cluster.go
@@ -433,7 +433,7 @@ func clusterPutJoin(d *Daemon, req api.ClusterPut)
response.Response {
}
for _, name := range networkNames {
- _, network, err := d.cluster.NetworkGet(name)
+ _, network, err := d.cluster.GetNetwork(name)
if err != nil {
return err
}
@@ -1478,7 +1478,7 @@ func clusterCheckNetworksMatch(cluster *db.Cluster,
reqNetworks []api.Network) e
continue
}
found = true
- _, network, err := cluster.NetworkGet(name)
+ _, network, err := cluster.GetNetwork(name)
if err != nil {
return err
}
diff --git a/lxd/db/migration_test.go b/lxd/db/migration_test.go
index c63d84a75e..4008ad7818 100644
--- a/lxd/db/migration_test.go
+++ b/lxd/db/migration_test.go
@@ -84,7 +84,7 @@ func TestImportPreClusteringData(t *testing.T) {
networks, err := cluster.GetNetworks()
require.NoError(t, err)
assert.Equal(t, []string{"lxcbr0"}, networks)
- id, network, err := cluster.NetworkGet("lxcbr0")
+ id, network, err := cluster.GetNetwork("lxcbr0")
require.NoError(t, err)
assert.Equal(t, int64(1), id)
assert.Equal(t, "true", network.Config["ipv4.nat"])
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index 623df21387..ac807457a0 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -297,8 +297,8 @@ const (
networkErrored // Network creation failed on some nodes
)
-// NetworkGet returns the network with the given name.
-func (c *Cluster) NetworkGet(name string) (int64, *api.Network, error) {
+// GetNetwork returns the network with the given name.
+func (c *Cluster) GetNetwork(name string) (int64, *api.Network, error) {
description := sql.NullString{}
id := int64(-1)
state := 0
@@ -492,7 +492,7 @@ func (c *Cluster) NetworkCreate(name, description string,
config map[string]stri
// NetworkUpdate updates the network with the given name.
func (c *Cluster) NetworkUpdate(name, description string, config
map[string]string) error {
- id, _, err := c.NetworkGet(name)
+ id, _, err := c.GetNetwork(name)
if err != nil {
return err
}
@@ -568,7 +568,7 @@ func NetworkConfigClear(tx *sql.Tx, networkID, nodeID
int64) error {
// NetworkDelete deletes the network with the given name.
func (c *Cluster) NetworkDelete(name string) error {
- id, _, err := c.NetworkGet(name)
+ id, _, err := c.GetNetwork(name)
if err != nil {
return err
}
@@ -583,7 +583,7 @@ func (c *Cluster) NetworkDelete(name string) error {
// NetworkRename renames a network.
func (c *Cluster) NetworkRename(oldName string, newName string) error {
- id, _, err := c.NetworkGet(oldName)
+ id, _, err := c.GetNetwork(oldName)
if err != nil {
return err
}
diff --git a/lxd/device/nic_bridged.go b/lxd/device/nic_bridged.go
index 5ab6c41df0..b2d50e948d 100644
--- a/lxd/device/nic_bridged.go
+++ b/lxd/device/nic_bridged.go
@@ -404,7 +404,7 @@ func (d *nicBridged) rebuildDnsmasqEntry() error {
dnsmasq.ConfigMutex.Lock()
defer dnsmasq.ConfigMutex.Unlock()
- _, dbInfo, err := d.state.Cluster.NetworkGet(d.config["parent"])
+ _, dbInfo, err := d.state.Cluster.GetNetwork(d.config["parent"])
if err != nil {
return err
}
diff --git a/lxd/network/network_load.go b/lxd/network/network_load.go
index cf8d94e029..c73a7a26cd 100644
--- a/lxd/network/network_load.go
+++ b/lxd/network/network_load.go
@@ -6,7 +6,7 @@ import (
// LoadByName loads the network info from the database by name.
func LoadByName(s *state.State, name string) (*Network, error) {
- id, dbInfo, err := s.Cluster.NetworkGet(name)
+ id, dbInfo, err := s.Cluster.GetNetwork(name)
if err != nil {
return nil, err
}
diff --git a/lxd/networks.go b/lxd/networks.go
index c7b92e5844..b966fab277 100644
--- a/lxd/networks.go
+++ b/lxd/networks.go
@@ -361,7 +361,7 @@ func doNetworkGet(d *Daemon, name string) (api.Network,
error) {
// Get some information
osInfo, _ := net.InterfaceByName(name)
- _, dbInfo, _ := d.cluster.NetworkGet(name)
+ _, dbInfo, _ := d.cluster.GetNetwork(name)
// Sanity check
if osInfo == nil && dbInfo == nil {
@@ -432,7 +432,7 @@ func networkDelete(d *Daemon, r *http.Request)
response.Response {
// Check if the network is pending, if so we just need to delete it from
// the database.
- _, dbNetwork, err := d.cluster.NetworkGet(name)
+ _, dbNetwork, err := d.cluster.GetNetwork(name)
if err != nil {
return response.SmartError(err)
}
@@ -551,7 +551,7 @@ func networkPut(d *Daemon, r *http.Request)
response.Response {
name := mux.Vars(r)["name"]
// Get the existing network
- _, dbInfo, err := d.cluster.NetworkGet(name)
+ _, dbInfo, err := d.cluster.GetNetwork(name)
if err != nil {
return response.SmartError(err)
}
@@ -590,7 +590,7 @@ func networkPatch(d *Daemon, r *http.Request)
response.Response {
name := mux.Vars(r)["name"]
// Get the existing network
- _, dbInfo, err := d.cluster.NetworkGet(name)
+ _, dbInfo, err := d.cluster.GetNetwork(name)
if err != nil {
return response.SmartError(err)
}
From 66d19948c4eaf2f74d8656085bfd2674ef6b3416 Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:38:40 +0100
Subject: [PATCH 08/15] lxd/db: Rename NetworkGetInterface to
GetNetworkWithInterface
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/db/networks.go | 4 ++--
lxd/networks_utils.go | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index ac807457a0..75bb95b263 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -365,9 +365,9 @@ SELECT nodes.name FROM nodes
return nodes, nil
}
-// NetworkGetInterface returns the network associated with the interface with
+// GetNetworkWithInterface returns the network associated with the interface
with
// the given name.
-func (c *Cluster) NetworkGetInterface(devName string) (int64, *api.Network,
error) {
+func (c *Cluster) GetNetworkWithInterface(devName string) (int64,
*api.Network, error) {
id := int64(-1)
name := ""
value := ""
diff --git a/lxd/networks_utils.go b/lxd/networks_utils.go
index beafa5ba86..d8e5bf214d 100644
--- a/lxd/networks_utils.go
+++ b/lxd/networks_utils.go
@@ -16,7 +16,7 @@ import (
)
func networkAutoAttach(cluster *db.Cluster, devName string) error {
- _, dbInfo, err := cluster.NetworkGetInterface(devName)
+ _, dbInfo, err := cluster.GetNetworkWithInterface(devName)
if err != nil {
// No match found, move on
return nil
From 0ae9da030fab48209124966fcb598d7f63496057 Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:40:44 +0100
Subject: [PATCH 09/15] lxd/db: Rename NetworkConfig to getNetworkConfig
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/db/networks.go | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index 75bb95b263..2f01a1e44e 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -315,7 +315,7 @@ func (c *Cluster) GetNetwork(name string) (int64,
*api.Network, error) {
return -1, nil, err
}
- config, err := c.NetworkConfigGet(id)
+ config, err := c.getNetworkConfig(id)
if err != nil {
return -1, nil, err
}
@@ -395,7 +395,7 @@ func (c *Cluster) GetNetworkWithInterface(devName string)
(int64, *api.Network,
return -1, nil, fmt.Errorf("No network found for interface:
%s", devName)
}
- config, err := c.NetworkConfigGet(id)
+ config, err := c.getNetworkConfig(id)
if err != nil {
return -1, nil, err
}
@@ -410,8 +410,8 @@ func (c *Cluster) GetNetworkWithInterface(devName string)
(int64, *api.Network,
return id, &network, nil
}
-// NetworkConfigGet returns the config map of the network with the given ID.
-func (c *Cluster) NetworkConfigGet(id int64) (map[string]string, error) {
+// Return the config map of the network with the given ID.
+func (c *Cluster) getNetworkConfig(id int64) (map[string]string, error) {
var key, value string
query := `
SELECT
From 4b22d3b1a1f7b9d6818444ddc4e8cda84b93e696 Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:45:24 +0100
Subject: [PATCH 10/15] lxd/db: Rename NetworkCreate to CreateNetwork
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/db/networks.go | 4 ++--
lxd/db/networks_test.go | 2 +-
lxd/networks.go | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index 2f01a1e44e..d5d156bbea 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -455,8 +455,8 @@ func (c *Cluster) getNetworkConfig(id int64)
(map[string]string, error) {
return config, nil
}
-// NetworkCreate creates a new network.
-func (c *Cluster) NetworkCreate(name, description string, config
map[string]string) (int64, error) {
+// CreateNetwork creates a new network.
+func (c *Cluster) CreateNetwork(name, description string, config
map[string]string) (int64, error) {
var id int64
err := c.Transaction(func(tx *ClusterTx) error {
result, err := tx.tx.Exec("INSERT INTO networks (name,
description, state) VALUES (?, ?, ?)", name, description, networkCreated)
diff --git a/lxd/db/networks_test.go b/lxd/db/networks_test.go
index 8a76d43289..196617fe4d 100644
--- a/lxd/db/networks_test.go
+++ b/lxd/db/networks_test.go
@@ -15,7 +15,7 @@ func TestGetNetworksLocalConfigs(t *testing.T) {
cluster, cleanup := db.NewTestCluster(t)
defer cleanup()
- _, err := cluster.NetworkCreate("lxdbr0", "", map[string]string{
+ _, err := cluster.CreateNetwork("lxdbr0", "", map[string]string{
"dns.mode": "none",
"bridge.external_interfaces": "vlan0",
})
diff --git a/lxd/networks.go b/lxd/networks.go
index b966fab277..da90f7ff9c 100644
--- a/lxd/networks.go
+++ b/lxd/networks.go
@@ -195,7 +195,7 @@ func networksPost(d *Daemon, r *http.Request)
response.Response {
}
// Create the database entry
- _, err = d.cluster.NetworkCreate(req.Name, req.Description, req.Config)
+ _, err = d.cluster.CreateNetwork(req.Name, req.Description, req.Config)
if err != nil {
return response.SmartError(fmt.Errorf("Error inserting %s into
database: %s", req.Name, err))
}
From f497e19d1f03dbe54571d863ab45b09917ef7c6b Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:47:38 +0100
Subject: [PATCH 11/15] lxd/db: Rename NetworkUpdate to UpdateNetwork
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/db/networks.go | 11 +++++------
lxd/network/network.go | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index d5d156bbea..c8ae1df601 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -490,15 +490,15 @@ func (c *Cluster) CreateNetwork(name, description string,
config map[string]stri
return id, err
}
-// NetworkUpdate updates the network with the given name.
-func (c *Cluster) NetworkUpdate(name, description string, config
map[string]string) error {
+// UpdateNetwork updates the network with the given name.
+func (c *Cluster) UpdateNetwork(name, description string, config
map[string]string) error {
id, _, err := c.GetNetwork(name)
if err != nil {
return err
}
err = c.Transaction(func(tx *ClusterTx) error {
- err = NetworkUpdateDescription(tx.tx, id, description)
+ err = updateNetworkDescription(tx.tx, id, description)
if err != nil {
return err
}
@@ -518,9 +518,8 @@ func (c *Cluster) NetworkUpdate(name, description string,
config map[string]stri
return err
}
-// NetworkUpdateDescription updates the description of the network with the
-// given ID.
-func NetworkUpdateDescription(tx *sql.Tx, id int64, description string) error {
+// Update the description of the network with the given ID.
+func updateNetworkDescription(tx *sql.Tx, id int64, description string) error {
_, err := tx.Exec("UPDATE networks SET description=? WHERE id=?",
description, id)
return err
}
diff --git a/lxd/network/network.go b/lxd/network/network.go
index 7e399e1636..e73958569f 100644
--- a/lxd/network/network.go
+++ b/lxd/network/network.go
@@ -1138,7 +1138,7 @@ func (n *Network) Update(newNetwork api.NetworkPut,
notify bool) error {
n.description = oldDescription
// Update the database
- n.state.Cluster.NetworkUpdate(n.name, n.description,
n.config)
+ n.state.Cluster.UpdateNetwork(n.name, n.description,
n.config)
// Reset any change that was made to the bridge
n.setup(newConfig)
@@ -1229,7 +1229,7 @@ func (n *Network) Update(newNetwork api.NetworkPut,
notify bool) error {
}
// Update the database.
- err = n.state.Cluster.NetworkUpdate(n.name, n.description,
n.config)
+ err = n.state.Cluster.UpdateNetwork(n.name, n.description,
n.config)
if err != nil {
return err
}
From 5f7766362cf594bf30fda9846dd3063ecab1a831 Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:53:32 +0100
Subject: [PATCH 12/15] lxd/db: Rename NetworkConfigClear to clearNetworkConfig
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/db/networks.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index c8ae1df601..ae047486c4 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -503,7 +503,7 @@ func (c *Cluster) UpdateNetwork(name, description string,
config map[string]stri
return err
}
- err = NetworkConfigClear(tx.tx, id, c.nodeID)
+ err = clearNetworkConfig(tx.tx, id, c.nodeID)
if err != nil {
return err
}
@@ -552,9 +552,9 @@ func networkConfigAdd(tx *sql.Tx, networkID, nodeID int64,
config map[string]str
return nil
}
-// NetworkConfigClear resets the config of the network with the given ID
+// Remove any the config of the network with the given ID
// associated with the node with the given ID.
-func NetworkConfigClear(tx *sql.Tx, networkID, nodeID int64) error {
+func clearNetworkConfig(tx *sql.Tx, networkID, nodeID int64) error {
_, err := tx.Exec(
"DELETE FROM networks_config WHERE network_id=? AND (node_id=?
OR node_id IS NULL)",
networkID, nodeID)
From 6fd538e4d7fa876f409765e4a42654ecc6c46b79 Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:54:28 +0100
Subject: [PATCH 13/15] lxd/db: Rename NetworkDelete to DeleteNetwork
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/db/networks.go | 4 ++--
lxd/network/network.go | 2 +-
lxd/networks.go | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index ae047486c4..e74ade920b 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -565,8 +565,8 @@ func clearNetworkConfig(tx *sql.Tx, networkID, nodeID
int64) error {
return nil
}
-// NetworkDelete deletes the network with the given name.
-func (c *Cluster) NetworkDelete(name string) error {
+// DeleteNetwork deletes the network with the given name.
+func (c *Cluster) DeleteNetwork(name string) error {
id, _, err := c.GetNetwork(name)
if err != nil {
return err
diff --git a/lxd/network/network.go b/lxd/network/network.go
index e73958569f..08351088f6 100644
--- a/lxd/network/network.go
+++ b/lxd/network/network.go
@@ -104,7 +104,7 @@ func (n *Network) Delete(withDatabase bool) error {
}
// Remove the network from the database
- err := n.state.Cluster.NetworkDelete(n.name)
+ err := n.state.Cluster.DeleteNetwork(n.name)
if err != nil {
return err
}
diff --git a/lxd/networks.go b/lxd/networks.go
index da90f7ff9c..46eb1c42af 100644
--- a/lxd/networks.go
+++ b/lxd/networks.go
@@ -437,7 +437,7 @@ func networkDelete(d *Daemon, r *http.Request)
response.Response {
return response.SmartError(err)
}
if dbNetwork.Status == "Pending" {
- err := d.cluster.NetworkDelete(name)
+ err := d.cluster.DeleteNetwork(name)
if err != nil {
return response.SmartError(err)
}
From f466eefdfad9e3b1aafb088d02ee438ece2dcd0d Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:55:00 +0100
Subject: [PATCH 14/15] lxd/db: Rename NetworkRename to RenameNetwork
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/db/networks.go | 4 ++--
lxd/network/network.go | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index e74ade920b..46186e5a2b 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -580,8 +580,8 @@ func (c *Cluster) DeleteNetwork(name string) error {
return nil
}
-// NetworkRename renames a network.
-func (c *Cluster) NetworkRename(oldName string, newName string) error {
+// RenameNetwork renames a network.
+func (c *Cluster) RenameNetwork(oldName string, newName string) error {
id, _, err := c.GetNetwork(oldName)
if err != nil {
return err
diff --git a/lxd/network/network.go b/lxd/network/network.go
index 08351088f6..37ae7fa203 100644
--- a/lxd/network/network.go
+++ b/lxd/network/network.go
@@ -148,7 +148,7 @@ func (n *Network) Rename(name string) error {
}
// Rename the database entry
- err := n.state.Cluster.NetworkRename(n.name, name)
+ err := n.state.Cluster.RenameNetwork(n.name, name)
if err != nil {
return err
}
From 66949d128f832bbd7efb20a6a55a55bccf0e37cd Mon Sep 17 00:00:00 2001
From: Free Ekanayaka <free.ekanay...@canonical.com>
Date: Mon, 4 May 2020 14:56:38 +0100
Subject: [PATCH 15/15] lxd/db: Rename NetworkNodeConfigKeys to
NodeSpecificNetworkNodeConfig
Signed-off-by: Free Ekanayaka <free.ekanay...@canonical.com>
---
lxd/api_cluster.go | 4 ++--
lxd/db/migration.go | 4 ++--
lxd/db/networks.go | 6 +++---
lxd/networks.go | 10 +++++-----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go
index a00af4078d..51cebb8138 100644
--- a/lxd/api_cluster.go
+++ b/lxd/api_cluster.go
@@ -798,7 +798,7 @@ func clusterInitMember(d, client lxd.InstanceServer,
memberConfig []api.ClusterM
continue
}
- if !shared.StringInSlice(config.Key,
db.NetworkNodeConfigKeys) {
+ if !shared.StringInSlice(config.Key,
db.NodeSpecificNetworkConfig) {
logger.Warnf("Ignoring config key %s for
network %s", config.Key, config.Name)
continue
}
@@ -1483,7 +1483,7 @@ func clusterCheckNetworksMatch(cluster *db.Cluster,
reqNetworks []api.Network) e
return err
}
// Exclude the keys which are node-specific.
- exclude := db.NetworkNodeConfigKeys
+ exclude := db.NodeSpecificNetworkConfig
err = util.CompareConfigs(network.Config,
reqNetwork.Config, exclude)
if err != nil {
return fmt.Errorf("Mismatching config for
network %s: %v", name, err)
diff --git a/lxd/db/migration.go b/lxd/db/migration.go
index 83d77a633a..e1d7a1a591 100644
--- a/lxd/db/migration.go
+++ b/lxd/db/migration.go
@@ -178,7 +178,7 @@ INSERT INTO projects_config (project_id, key, value) VALUES
(1, 'features.storag
case "containers":
appendNodeID()
case "networks_config":
- // The keys listed in NetworkNodeConfigKeys
+ // The keys listed in NodeSpecificNetworkConfig
// are the only ones which are not global to the
// cluster, so all other keys will have a NULL
// node_id.
@@ -190,7 +190,7 @@ INSERT INTO projects_config (project_id, key, value) VALUES
(1, 'features.storag
}
}
key := row[index].(string)
- if !shared.StringInSlice(key,
NetworkNodeConfigKeys) {
+ if !shared.StringInSlice(key,
NodeSpecificNetworkConfig) {
nullNodeID = true
break
}
diff --git a/lxd/db/networks.go b/lxd/db/networks.go
index 46186e5a2b..0cfc0d43a1 100644
--- a/lxd/db/networks.go
+++ b/lxd/db/networks.go
@@ -537,7 +537,7 @@ func networkConfigAdd(tx *sql.Tx, networkID, nodeID int64,
config map[string]str
continue
}
var nodeIDValue interface{}
- if !shared.StringInSlice(k, NetworkNodeConfigKeys) {
+ if !shared.StringInSlice(k, NodeSpecificNetworkConfig) {
nodeIDValue = nil
} else {
nodeIDValue = nodeID
@@ -595,7 +595,7 @@ func (c *Cluster) RenameNetwork(oldName string, newName
string) error {
return err
}
-// NetworkNodeConfigKeys lists all network config keys which are node-specific.
-var NetworkNodeConfigKeys = []string{
+// NodeSpecificNetworkConfig lists all network config keys which are
node-specific.
+var NodeSpecificNetworkConfig = []string{
"bridge.external_interfaces",
}
diff --git a/lxd/networks.go b/lxd/networks.go
index 46eb1c42af..9d9b27e143 100644
--- a/lxd/networks.go
+++ b/lxd/networks.go
@@ -146,7 +146,7 @@ func networksPost(d *Daemon, r *http.Request)
response.Response {
// network without actually creating it. The only legal key
// value for the storage config is 'bridge.external_interfaces'.
for key := range req.Config {
- if !shared.StringInSlice(key, db.NetworkNodeConfigKeys)
{
+ if !shared.StringInSlice(key,
db.NodeSpecificNetworkConfig) {
return response.SmartError(fmt.Errorf("Config
key '%s' may not be used as node-specific key", key))
}
}
@@ -211,7 +211,7 @@ func networksPost(d *Daemon, r *http.Request)
response.Response {
func networksPostCluster(d *Daemon, req api.NetworksPost) error {
// Check that no node-specific config key has been defined.
for key := range req.Config {
- if shared.StringInSlice(key, db.NetworkNodeConfigKeys) {
+ if shared.StringInSlice(key, db.NodeSpecificNetworkConfig) {
return fmt.Errorf("Config key '%s' is node-specific",
key)
}
}
@@ -343,7 +343,7 @@ func networkGet(d *Daemon, r *http.Request)
response.Response {
// If no target node is specified and the daemon is clustered, we omit
// the node-specific fields.
if targetNode == "" && clustered {
- for _, key := range db.NetworkNodeConfigKeys {
+ for _, key := range db.NodeSpecificNetworkConfig {
delete(n.Config, key)
}
}
@@ -565,7 +565,7 @@ func networkPut(d *Daemon, r *http.Request)
response.Response {
// If no target node is specified and the daemon is clustered, we omit
// the node-specific fields.
if targetNode == "" && clustered {
- for _, key := range db.NetworkNodeConfigKeys {
+ for _, key := range db.NodeSpecificNetworkConfig {
delete(dbInfo.Config, key)
}
}
@@ -604,7 +604,7 @@ func networkPatch(d *Daemon, r *http.Request)
response.Response {
// If no target node is specified and the daemon is clustered, we omit
// the node-specific fields.
if targetNode == "" && clustered {
- for _, key := range db.NetworkNodeConfigKeys {
+ for _, key := range db.NodeSpecificNetworkConfig {
delete(dbInfo.Config, key)
}
}
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
