forgot to add them in last patches
---
PVE/API2/Network/Network.pm | 236 ++++++++++++++++++++++++++++++++++++++++++++
PVE/Network/Network.pm | 64 ++++++++++++
2 files changed, 300 insertions(+)
create mode 100644 PVE/API2/Network/Network.pm
create mode 100644 PVE/Network/Network.pm
diff --git a/PVE/API2/Network/Network.pm b/PVE/API2/Network/Network.pm
new file mode 100644
index 0000000..20f3574
--- /dev/null
+++ b/PVE/API2/Network/Network.pm
@@ -0,0 +1,236 @@
+package PVE::API2::Network::Network;
+
+use strict;
+use warnings;
+
+use PVE::SafeSyslog;
+use PVE::Tools qw(extract_param);
+use PVE::Cluster qw(cfs_read_file cfs_write_file);
+use PVE::Network::Network;
+use PVE::Network::Network::Plugin;
+use PVE::Network::Network::VlanPlugin;
+use PVE::Network::Network::VxlanMulticastPlugin;
+use PVE::Network::Network::VnetPlugin;
+use Storable qw(dclone);
+use PVE::JSONSchema qw(get_standard_option);
+use PVE::RPCEnvironment;
+
+use PVE::RESTHandler;
+
+use base qw(PVE::RESTHandler);
+
+my $network_type_enum = PVE::Network::Network::Plugin->lookup_types();
+
+my $api_network_config = sub {
+ my ($cfg, $networkid) = @_;
+
+ my $scfg = dclone(PVE::Network::Network::network_config($cfg, $networkid));
+ $scfg->{network} = $networkid;
+ $scfg->{digest} = $cfg->{digest};
+
+ return $scfg;
+};
+
+__PACKAGE__->register_method ({
+ name => 'index',
+ path => '',
+ method => 'GET',
+ description => "Network index.",
+ permissions => {
+ description => "Only list entries where you have 'Network.Audit' or
'Network.Allocate' permissions on '/cluster/network/<network>'",
+ user => 'all',
+ },
+ parameters => {
+ additionalProperties => 0,
+ properties => {
+ type => {
+ description => "Only list network of specific type",
+ type => 'string',
+ enum => $network_type_enum,
+ optional => 1,
+ },
+ },
+ },
+ returns => {
+ type => 'array',
+ items => {
+ type => "object",
+ properties => { network => { type => 'string'} },
+ },
+ links => [ { rel => 'child', href => "{network}" } ],
+ },
+ code => sub {
+ my ($param) = @_;
+
+ my $rpcenv = PVE::RPCEnvironment::get();
+ my $authuser = $rpcenv->get_user();
+
+
+ my $cfg = PVE::Network::Network::config();
+
+ my @sids = PVE::Network::Network::networks_ids($cfg);
+ my $res = [];
+ foreach my $networkid (@sids) {
+# my $privs = [ 'Network.Audit', 'Network.Allocate' ];
+# next if !$rpcenv->check_any($authuser,
"/cluster/network/$networkid", $privs, 1);
+
+ my $scfg = &$api_network_config($cfg, $networkid);
+ next if $param->{type} && $param->{type} ne $scfg->{type};
+ push @$res, $scfg;
+ }
+
+ return $res;
+ }});
+
+__PACKAGE__->register_method ({
+ name => 'read',
+ path => '{network}',
+ method => 'GET',
+ description => "Read network configuration.",
+# permissions => {
+# check => ['perm', '/cluster/network/{network}', ['Network.Allocate']],
+# },
+
+ parameters => {
+ additionalProperties => 0,
+ properties => {
+ network => get_standard_option('pve-network-id'),
+ },
+ },
+ returns => { type => 'object' },
+ code => sub {
+ my ($param) = @_;
+
+ my $cfg = PVE::Network::Network::config();
+
+ return &$api_network_config($cfg, $param->{network});
+ }});
+
+__PACKAGE__->register_method ({
+ name => 'create',
+ protected => 1,
+ path => '',
+ method => 'POST',
+ description => "Create a new network object.",
+# permissions => {
+# check => ['perm', '/cluster/network', ['Network.Allocate']],
+# },
+ parameters => PVE::Network::Network::Plugin->createSchema(),
+ returns => { type => 'null' },
+ code => sub {
+ my ($param) = @_;
+
+ my $type = extract_param($param, 'type');
+ my $networkid = extract_param($param, 'network');
+
+ my $plugin = PVE::Network::Network::Plugin->lookup($type);
+ my $opts = $plugin->check_config($networkid, $param, 1, 1);
+
+ PVE::Network::Network::lock_network_config(
+ sub {
+
+ my $cfg = PVE::Network::Network::config();
+
+ if (my $scfg = PVE::Network::Network::network_config($cfg,
$networkid, 1)) {
+ die "network object ID '$networkid' already defined\n";
+ }
+
+ $cfg->{ids}->{$networkid} = $opts;
+
+ #improveme:
+ #check local configuration of all nodes for conflict
+
+ PVE::Network::Network::write_config($cfg);
+
+ }, "create network object failed");
+
+ return undef;
+ }});
+
+__PACKAGE__->register_method ({
+ name => 'update',
+ protected => 1,
+ path => '{network}',
+ method => 'PUT',
+ description => "Update network object configuration.",
+# permissions => {
+# check => ['perm', '/cluster/network', ['Network.Allocate']],
+# },
+ parameters => PVE::Network::Network::Plugin->updateSchema(),
+ returns => { type => 'null' },
+ code => sub {
+ my ($param) = @_;
+
+ my $networkid = extract_param($param, 'network');
+ my $digest = extract_param($param, 'digest');
+
+ PVE::Network::Network::lock_network_config(
+ sub {
+
+ my $cfg = PVE::Network::Network::config();
+
+ PVE::SectionConfig::assert_if_modified($cfg, $digest);
+
+ my $scfg = PVE::Network::Network::network_config($cfg, $networkid);
+
+ my $plugin = PVE::Network::Network::Plugin->lookup($scfg->{type});
+ my $opts = $plugin->check_config($networkid, $param, 0, 1);
+
+ foreach my $k (%$opts) {
+ $scfg->{$k} = $opts->{$k};
+ }
+ #improveme:
+ #add vlan/vxlan check on existingvnets
+ #check local configuration of all nodes for conflict
+ PVE::Network::Network::write_config($cfg);
+
+ }, "update network object failed");
+
+ return undef;
+ }});
+
+__PACKAGE__->register_method ({
+ name => 'delete',
+ protected => 1,
+ path => '{network}', # /cluster/network/{network}
+ method => 'DELETE',
+ description => "Delete network object configuration.",
+# permissions => {
+# check => ['perm', '/cluster/network', ['Network.Allocate']],
+# },
+ parameters => {
+ additionalProperties => 0,
+ properties => {
+ network => get_standard_option('pve-network-id', {
+ completion => \&PVE::Network::Network::complete_network,
+ }),
+ },
+ },
+ returns => { type => 'null' },
+ code => sub {
+ my ($param) = @_;
+
+ my $networkid = extract_param($param, 'network');
+
+ PVE::Network::Network::lock_network_config(
+ sub {
+
+ my $cfg = PVE::Network::Network::config();
+
+ my $scfg = PVE::Network::Network::network_config($cfg,
$networkid);
+
+# my $plugin =
PVE::Network::Network::Plugin->lookup($scfg->{type});
+# $plugin->on_delete_hook($networkid, $scfg);
+
+ delete $cfg->{ids}->{$networkid};
+ #improveme:
+ #check that vnet don't use this transport
+ PVE::Network::Network::write_config($cfg);
+
+ }, "delete network object failed");
+
+
+ return undef;
+ }});
+
+1;
diff --git a/PVE/Network/Network.pm b/PVE/Network/Network.pm
new file mode 100644
index 0000000..576d135
--- /dev/null
+++ b/PVE/Network/Network.pm
@@ -0,0 +1,64 @@
+package PVE::Network::Network;
+
+use strict;
+use warnings;
+use Data::Dumper;
+use PVE::Cluster qw(cfs_read_file cfs_write_file cfs_lock_file);
+use PVE::Network::Network::Plugin;
+use PVE::Network::Network::VnetPlugin;
+use PVE::Network::Network::VlanPlugin;
+use PVE::Network::Network::VxlanMulticastPlugin;
+
+PVE::Network::Network::VnetPlugin->register();
+PVE::Network::Network::VlanPlugin->register();
+PVE::Network::Network::VxlanMulticastPlugin->register();
+PVE::Network::Network::Plugin->init();
+
+
+sub network_config {
+ my ($cfg, $networkid, $noerr) = @_;
+
+ die "no network ID specified\n" if !$networkid;
+
+ my $scfg = $cfg->{ids}->{$networkid};
+ die "network '$networkid' does not exists\n" if (!$noerr && !$scfg);
+
+ return $scfg;
+}
+
+sub config {
+
+ return cfs_read_file("networks.cfg");
+}
+
+sub write_config {
+ my ($cfg) = @_;
+
+ cfs_write_file("networks.cfg", $cfg);
+}
+
+sub lock_network_config {
+ my ($code, $errmsg) = @_;
+
+ cfs_lock_file("networks.cfg", undef, $code);
+ my $err = $@;
+ if ($err) {
+ $errmsg ? die "$errmsg: $err" : die $err;
+ }
+}
+
+sub network_ids {
+ my ($cfg) = @_;
+
+ return keys %{$cfg->{ids}};
+}
+
+sub complete_network {
+ my ($cmdname, $pname, $cvalue) = @_;
+
+ my $cfg = PVE::Network::Network::config();
+
+ return $cmdname eq 'add' ? [] : [
PVE::Network::Network::networks_ids($cfg) ];
+}
+
+1;
--
2.11.0
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
