pmcf 1.96.0 → 1.97.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.96.0",
+  "version": "1.97.1",
   "publishConfig": {
     "access": "public"
   },

package/src/dhcp.mjs

@@ -94,6 +94,36 @@ export class DHCPService extends Base {
       }
     };
 
+    // console.log(this.owner.name,this.owner.networks());
+    /*
+    const subnets = new Set();
+
+    for (const network of this.owner.networks()) {
+      for (const subnet of network.subnets()) {
+        subnets.add(subnet);
+      }
+    }
+
+    console.log([...subnets].map(s => s.address));
+*/
+
+    const hwmap = new Map();
+
+    for await (const {
+      networkInterface,
+      address,
+      subnet,
+      domainNames
+    } of this.owner.networkAddresses()) {
+      if (networkInterface.hwaddr) {
+        hwmap.set(networkInterface.hwaddr, networkInterface.rawAddress);
+      }
+    }
+
+    const reservations = [...hwmap].map(([k, v]) => {
+      return { "hw-address": k, "ip-address": v };
+    });
+
     const dhcp4 = {
       Dhcp4: {
         "interfaces-config": {
@@ -146,7 +176,7 @@ export class DHCPService extends Base {
                 data: "192.168.1.254"
               }
             ],
-            reservations: [
+            reservations /*: [
               {
                 "hw-address": "1a:1b:1c:1d:1e:1f",
                 "ip-address": "192.168.1.199"
@@ -156,7 +186,7 @@ export class DHCPService extends Base {
                 "ip-address": "192.168.1.198",
                 hostname: "special-snowflake"
               }
-            ]
+            ]*/
           }
         ],
         loggers

package/src/owner.mjs

@@ -200,6 +200,10 @@ export class Owner extends Base {
       yield* this.owner.subnets();
     }
     yield* this.typeList("subnet");
+
+   /* for (const network of this.networks()) {
+      yield* network.subnets();
+    }*/
   }
 
   addSubnet(address) {
@@ -416,17 +420,18 @@ export class Owner extends Base {
 
   #architectures;
 
-  set architectures(value)
-  {
+  set architectures(value) {
     if (value instanceof Set) {
-      this.#architectures = this.#architectures ? this.#architectures.union(value) : value;
+      this.#architectures = this.#architectures
+        ? this.#architectures.union(value)
+        : value;
     } else {
       this.#architectures = new Set(value);
     }
   }
 
   get architectures() {
-    if(this.#architectures) {
+    if (this.#architectures) {
       return this.#architectures;
     }