pmcf 6.18.2 → 6.19.0

package/README.md

@@ -78,27 +78,27 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-15)
 *   [type](#type)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-16)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-17)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-18)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-18)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-19)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-20)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-20)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -293,6 +293,18 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
+## SkeletonNetworkInterface
+
+**Extends ServiceOwner**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## type
 
 Type of the group.
@@ -374,18 +386,6 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/package.json

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

package/src/network-address.mjs

@@ -14,20 +14,20 @@ import { NetworkInterface } from "./network-interfaces/network-interface.mjs";
  *
  */
 export class NetworkAddress {
-    static name = "network-address";
-    static priority = 1;
-    static key = "address";
-    static attributes = {
-      address: { ...name_attribute, name: "address" },
-      cidrAddress: { ...string_attribute, name: "cidrAddress" },
-       networkInterface: {
-        ...default_attribute,
-        name: "networkInterface",
-        type: "network_interface"
-      },
-      family: { ...string_attribute, name: "family" }
-    };
-  
+  static name = "network-address";
+  static priority = 1;
+  static key = "address";
+  static attributes = {
+    address: { ...name_attribute, name: "address" },
+    cidrAddress: { ...string_attribute, name: "cidrAddress" },
+    networkInterface: {
+      ...default_attribute,
+      name: "networkInterface",
+      type: "network_interface"
+    },
+    family: { ...string_attribute, name: "family" }
+  };
+
   static {
     addType(this);
   }
@@ -48,10 +48,18 @@ export class NetworkAddress {
     this.subnet = subnet;
   }
 
+  get host() {
+    return this.networkInterface.host;
+  }
+
   get domainNames() {
     return this.networkInterface.domainNames;
   }
 
+  get domains() {
+    return this.networkInterface.domains;
+  }
+
   get family() {
     return familyIP(this.address);
   }
@@ -60,6 +68,10 @@ export class NetworkAddress {
     return formatCIDR(this.address, this.subnet.prefixLength);
   }
 
+  get fullName() {
+    return `${this.networkInterface.fullName}/${decodeIP(this.address)}`;
+  }
+
   toString() {
     return `${this.networkInterface.fullName} ${decodeIP(this.address)}`;
   }

package/src/network-interfaces/network-interface.mjs

@@ -107,10 +107,17 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   set hostName(value) {
     this._hostName = value;
   }
+  
+  get domains() {
+    if (!this.host) {
+      return new Set();
+    }
+
+    return this.host.localDomains;
+  }
 
   get domainNames() {
-    if(!this.host) {
-      //console.log("NO HOST",this.fullName);
+    if (!this.host) {
       return new Set();
     }
     return this.hostName