Merge pull request #1637 from aka7/ncm_network_dhcp_false

ncm-network: set profile-name and set dhcp to disable for static config
quattor · Dec 20, 2023 · 533badd · 533badd
2 parents 8445093 + ebce675
commit 533badd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/ncm-network/src/main/perl/nmstate.pm b/ncm-network/src/main/perl/nmstate.pm
@@ -294,6 +294,7 @@ sub generate_nmstate_config
 
     $ifaceconfig->{mtu} = $iface->{mtu} if $iface->{mtu};
     $ifaceconfig->{'mac-address'} = $iface->{hwaddr} if $iface->{hwaddr};
+    $ifaceconfig->{'profile-name'} = $name;
     if ($is_eth) {
         $ifaceconfig->{type} = "ethernet";
         if ($is_bond_eth) {
@@ -334,6 +335,7 @@ sub generate_nmstate_config
 
                 # TODO: append alias ip to ip_list as array, providing ips as array of hashref.
                 $ifaceconfig->{ipv4}->{address} = [$ip_list];
+                $ifaceconfig->{ipv4}->{dhcp} = $YFALSE;
                 $ifaceconfig->{ipv4}->{enabled} = $YTRUE;
             } else {
                 # TODO: configure IPV6 enteries

diff --git a/ncm-network/src/test/perl/nmstate_simple.t b/ncm-network/src/test/perl/nmstate_simple.t
@@ -49,6 +49,7 @@ interfaces:
 - link-aggregation:
     port: []
   name: eth0
+  profile-name: eth0
   type: bond
 EOF