pmcf 2.6.3 → 2.6.5

package/package.json

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

package/src/base.mjs

@@ -93,6 +93,12 @@ export class Base {
   read(data, type) {
     const assign = (property, value) => {
       if (value !== undefined) {
+        if (property.values) {
+          if (property.values.indexOf(value) < 0) {
+            this.error(property.name, "unknown value", value, property.values);
+          }
+        }
+
         if (property.collection) {
           const current = this[property.name];
 
@@ -121,16 +127,6 @@ export class Base {
               break;
           }
         } else {
-          if (property.values) {
-            if (property.values.indexOf(value) < 0) {
-              this.error(
-                property.name,
-                "unknown value",
-                value,
-                property.values
-              );
-            }
-          }
           this[property.name] = value;
         }
       }

package/src/cluster.mjs

@@ -64,7 +64,7 @@ export class Cluster extends Host {
       new Set()
     )) {
       const host = ni.host;
-      const name = `keepalived-${host.name}`;
+      const name = `keepalived-${host.location.name}-${host.name}`;
       const packageStagingDir = join(stagingDir, name);
       const result = {
         sources: [
@@ -77,7 +77,8 @@ export class Cluster extends Host {
           name,
           description: `${this.typeName} definitions for ${this.fullName}`,
           access: "private",
-          dependencies: ["keepalived>=2.3.3"]
+          dependencies: ["keepalived>=2.3.3"],
+          replaces: [`keepalived-${host.name}`]
         }
       };
 

package/src/services/dhcp.mjs

@@ -47,11 +47,11 @@ export class DHCPService extends Service {
       sources: [new FileContentProvider(dir + "/")[Symbol.asyncIterator]()],
       outputs: this.outputs,
       properties: {
-        name: `kea-${name}`,
+        name: `kea-${this.location.name}-${host.name}`,
         description: `kea definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: ["kea"],
-        replaces: ["kea-SW"] // TODO remove
+        replaces: [`kea-${name}`] // TODO remove
       }
     };
 

package/types/cluster.d.mts

@@ -351,6 +351,7 @@ export class Cluster extends Host {
             description: string;
             access: string;
             dependencies: string[];
+            replaces: string[];
         };
     }, void, unknown>;
 }