pmcf 1.47.0 → 1.47.2

package/bin/pmcf-host-defs

@@ -105,7 +105,7 @@ async function generateNetworkDefs(host, dir) {
           })
         );
 
-        if (ni.arpbridge.length) {
+        if (ni.arpbridge) {
           networkSections.push(
             "",
             sectionLines("Link", { Promiscuous: "yes" })

package/package.json

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

package/src/base.mjs

@@ -146,7 +146,11 @@ export class Base {
                     this.owner.typeNamed(property.type.name, value) ||
                     this.root.typeNamed(property.type.name, value); // TODO
 
-                  assign(property, object);
+                  if (object) {
+                    assign(property, object);
+                  } else {
+                    this.error("Not found", property.name, property.type.name, value);
+                  }
                 });
               }
             }

package/src/host.mjs

@@ -23,14 +23,13 @@ const HostTypeDefinition = {
     },
     services: { type: "service", collection: true, writeable: true },
     os: { type: "string", collection: false, writeable: true },
+    "machine-id": { type: "string", collection: false, writeable: true },
     distribution: { type: "string", collection: false, writeable: true },
     deployment: { type: "string", collection: false, writeable: true },
     master: { type: "boolean", collection: false, writeable: true },
-    model: { type: "string", collection: false, writeable: false },
     serial: { type: "string", collection: false, writeable: true },
     vendor: { type: "string", collection: false, writeable: true },
     chassis: { type: "string", collection: false, writeable: true },
-    isModel: { type: "boolean", collection: false, writeable: false },
     priority: { type: "number", collection: false, writeable: true },
     replaces: { type: "string", collection: true, writeable: true },
     depends: { type: "string", collection: true, writeable: true },
@@ -38,7 +37,9 @@ const HostTypeDefinition = {
     extends: { type: "host", collection: true, writeable: true },
     cidrAddresses: { type: "string", collection: true, writeable: false },
     rawAddresses: { type: "string", collection: true, writeable: false },
-    rawAddress: { type: "string", collection: false, writeable: false }
+    rawAddress: { type: "string", collection: false, writeable: false },
+    model: { type: "string", collection: false, writeable: false },
+    isModel: { type: "boolean", collection: false, writeable: false }
   }
 };
 
@@ -140,7 +141,6 @@ export class Host extends Base {
 
   get extends() {
     return this.#extends;
-    //  return this.#extends.map(e => this.expand(e));
   }
 
   set provides(value) {
@@ -247,20 +247,24 @@ export class Host extends Base {
     }
   }
 
+  typeNamed(typeName, name) {
+    if (typeName === NetworkInterfaceTypeDefinition.name) {
+      const ni = this.#networkInterfaces.get(name);
+      if (ni) {
+        return ni;
+      }
+    }
+
+    return super.typeNamed(typeName, name);
+  }
+
   get networkInterfaces() {
     return this.#networkInterfaces;
   }
 
   set networkInterfaces(networkInterface) {
     this.#networkInterfaces.set(networkInterface.name, networkInterface);
-
-    if (networkInterface.network) {
-      networkInterface.network.addObject(this);
-    }
-  }
-
-  networkInterfaceNamed(name) {
-    return this.#networkInterfaces.get(name);
+    networkInterface.network?.addObject(this);
   }
 
   *networkAddresses() {
@@ -306,8 +310,8 @@ const NetworkInterfaceTypeDefinition = {
     cidrAddresses: { type: "string", collection: true, writeable: false },
     rawAddresses: { type: "string", collection: true, writeable: false },
     network: { type: "network", collection: false, writeable: true },
-    destination: { type: "host", collection: false, writeable: true },
-    arpbridge: { type: "host", collection: true, writeable: true }
+    destination: { type: "string", collection: false, writeable: true },
+    arpbridge: { type: "network_interface", collection: true, writeable: true }
   }
 };
 
@@ -333,7 +337,6 @@ export class NetworkInterface extends Base {
   constructor(owner, data) {
     super(owner, data);
     this.read(data, NetworkInterfaceTypeDefinition);
-    //owner.addNetworkInterface(this);
   }
 
   addSubnet(address) {
@@ -404,6 +407,10 @@ export class NetworkInterface extends Base {
     return this.owner;
   }
 
+  get network_interface() {
+    return this;
+  }
+
   get network() {
     return this.#network || this.host.network;
   }

package/types/host.d.mts

@@ -51,22 +51,22 @@ export class Host extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
-            distribution: {
+            "machine-id": {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            deployment: {
+            distribution: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            master: {
+            deployment: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
             };
-            model: {
+            master: {
                 type: string;
                 collection: boolean;
                 writeable: boolean;
@@ -86,11 +86,6 @@ export class Host extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
-            isModel: {
-                type: string;
-                collection: boolean;
-                writeable: boolean;
-            };
             priority: {
                 type: string;
                 collection: boolean;
@@ -131,6 +126,16 @@ export class Host extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            model: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
+            isModel: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
         };
     };
     postinstall: any[];
@@ -168,7 +173,6 @@ export class Host extends Base {
     findServices(filter: any): Generator<any, void, unknown>;
     set networkInterfaces(networkInterface: Map<any, any>);
     get networkInterfaces(): Map<any, any>;
-    networkInterfaceNamed(name: any): any;
     networkAddresses(): Generator<{
         networkInterface: any;
         address: any;
@@ -302,6 +306,7 @@ export class NetworkInterface extends Base {
     subnetForAddress(address: any): any;
     get gateway(): any;
     get gatewayAddress(): any;
+    get network_interface(): this;
     set network(network: any);
     get network(): any;
     set scope(value: any);