@openshift-assisted/ui-lib 2.36.2 → 2.36.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/@types/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/data/formDataFromInfraEnvField.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.d.ts.map +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.d.ts +1 -1
- package/build/@types/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.d.ts.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.js +2 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/formDataFromInfraEnvField.js +25 -7
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/formDataFromInfraEnvField.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.js +10 -0
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.js.map +1 -1
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.js +2 -2
- package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.js.map +1 -1
- package/lib/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.tsx +4 -1
- package/lib/ocm/components/clusterConfiguration/staticIp/data/formDataFromInfraEnvField.ts +28 -10
- package/lib/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.ts +28 -0
- package/lib/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.ts +2 -1
- package/package.json +3 -3
package/build/@types/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonValidationSchemas.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAY,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKnD,MAAM,MAAM,0BAA0B,CAAC,UAAU,IAAI,CACnD,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,GAAG,CAAC,WAAW,EACxB,KAAK,EAAE,MAAM,KACV,MAAM,EAAE,GAAG,SAAS,CAAC;AAE1B,eAAO,MAAM,yBAAyB,
|
|
1
|
+
{"version":3,"file":"commonValidationSchemas.d.ts","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAY,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAE3B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKnD,MAAM,MAAM,0BAA0B,CAAC,UAAU,IAAI,CACnD,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,GAAG,CAAC,WAAW,EACxB,KAAK,EAAE,MAAM,KACV,MAAM,EAAE,GAAG,SAAS,CAAC;AAE1B,eAAO,MAAM,yBAAyB,wJA2BrC,CAAC;AAgDF,eAAO,MAAM,4BAA4B,oBAAqB,eAAe,uEAY5E,CAAC;AAEF,eAAO,MAAM,oCAAoC,qBAAsB,eAAe,uEAsCrF,CAAC;AAEF,eAAO,MAAM,qBAAqB,gBAAiB,QAAQ,YAE1D,CAAC;AAWF,eAAO,MAAM,0BAA0B,qBAAsB,eAAe,uEAkB3E,CAAC;AAEF,eAAO,MAAM,2BAA2B,qBAAsB,eAAe,uEAkB5E,CAAC;AAEF,eAAO,MAAM,oCAAoC,oBAC9B,eAAe,UACxB,MAAM,uEAyBf,CAAC;AAEF,eAAO,MAAM,yCAAyC,oBACnC,eAAe,UACxB,MAAM,uEAgBf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formDataFromInfraEnvField.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/data/formDataFromInfraEnvField.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAC;AAE/F,OAAO,EAIL,cAAc,EAEf,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"formDataFromInfraEnvField.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/data/formDataFromInfraEnvField.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAC;AAE/F,OAAO,EAIL,cAAc,EAEf,MAAM,aAAa,CAAC;AAkLrB,eAAO,MAAM,yBAAyB,sBACjB,uBAAuB,EAAE,KAC3C,cAkCF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formDataToInfraEnvField.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,QAAQ,EACR,eAAe,EAChB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAEL,YAAY,EACZ,yBAAyB,EAG1B,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"formDataToInfraEnvField.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,QAAQ,EACR,eAAe,EAChB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAEL,YAAY,EACZ,yBAAyB,EAG1B,MAAM,aAAa,CAAC;AAqLrB,eAAO,MAAM,kBAAkB,SAAU,YAAY,oBAyBpD,CAAC;AAEF,eAAO,MAAM,4BAA4B,oBACtB,QAAQ,iBACV,YAAY,EAAE,KAC5B,uBAAuB,EAWzB,CAAC;AAaF,eAAO,MAAM,0BAA0B,oBACpB,QAAQ,eACZ,yBAAyB,KACrC,uBAAuB,EAYzB,CAAC"}
|
|
@@ -12,6 +12,6 @@ export declare const getMachineNetworks: (comments: string[]) => MachineNetworks
|
|
|
12
12
|
export declare const getProtocolType: (comments: string[]) => StaticProtocolType | null;
|
|
13
13
|
export declare const getNmstateProtocolConfig: (ipAddress: string, prefixLength: number) => NmstateProtocolConfig;
|
|
14
14
|
export declare const getDnsSection: (dns: string) => NmstateDns;
|
|
15
|
-
export declare const getInterface: (nicName: string, protocolConfigs: NmstateProtocolConfigs, networkWide: FormViewNetworkWideValues, bondType?: string, hasBondsConfigured?: boolean) => NmstateInterface;
|
|
15
|
+
export declare const getInterface: (nicName: string, protocolConfigs: NmstateProtocolConfigs, networkWide: FormViewNetworkWideValues, bondType?: string, hasBondsConfigured?: boolean, createBondInterface?: boolean) => NmstateInterface;
|
|
16
16
|
export declare const getRouteConfig: (protocolVersion: ProtocolVersion, gatewayAddress: string, nicName: string) => NmstateRoutesConfig;
|
|
17
17
|
//# sourceMappingURL=nmstateYaml.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nmstateYaml.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,UAAU,EACV,gBAAgB,EAEhB,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,yBAAyB,EACzB,eAAe,EACf,eAAe,EACf,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAWrB,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,gBAAgB,8BAA8B,CAAC;AAE5D,eAAO,MAAM,0BAA0B,oBAAqB,eAAe,KAAG,MAE7E,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,MAAM,UAAU,MAAM,WAA2B,CAAC;AAE1F,eAAO,MAAM,qBAAqB,oBAAqB,eAAe,KAAG,MAExE,CAAC;AAEF,eAAO,MAAM,mBAAmB,SAAU,MAAM,KAAG,OAElD,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAAM,EAIpD,CAAC;AAEF,eAAO,MAAM,kBAAkB,SAAU,MAAM,YAAY,MAAM,EAAE,WAGlE,CAAC;AASF,eAAO,MAAM,kBAAkB,aAAc,MAAM,EAAE,KAAG,eAKvD,CAAC;AAEF,eAAO,MAAM,eAAe,aAAc,MAAM,EAAE,KAAG,kBAAkB,GAAG,IASzE,CAAC;AAEF,eAAO,MAAM,wBAAwB,cACxB,MAAM,gBACH,MAAM,KACnB,qBAWF,CAAC;AAEF,eAAO,MAAM,aAAa,QAAS,MAAM,KAAG,UAG3C,CAAC;AAEF,eAAO,MAAM,YAAY,YACd,MAAM,mBACE,sBAAsB,eAC1B,yBAAyB,aAC3B,MAAM,uBACI,OAAO,
|
|
1
|
+
{"version":3,"file":"nmstateYaml.d.ts","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,UAAU,EACV,gBAAgB,EAEhB,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,yBAAyB,EACzB,eAAe,EACf,eAAe,EACf,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAWrB,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,gBAAgB,8BAA8B,CAAC;AAE5D,eAAO,MAAM,0BAA0B,oBAAqB,eAAe,KAAG,MAE7E,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,MAAM,UAAU,MAAM,WAA2B,CAAC;AAE1F,eAAO,MAAM,qBAAqB,oBAAqB,eAAe,KAAG,MAExE,CAAC;AAEF,eAAO,MAAM,mBAAmB,SAAU,MAAM,KAAG,OAElD,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAAM,EAIpD,CAAC;AAEF,eAAO,MAAM,kBAAkB,SAAU,MAAM,YAAY,MAAM,EAAE,WAGlE,CAAC;AASF,eAAO,MAAM,kBAAkB,aAAc,MAAM,EAAE,KAAG,eAKvD,CAAC;AAEF,eAAO,MAAM,eAAe,aAAc,MAAM,EAAE,KAAG,kBAAkB,GAAG,IASzE,CAAC;AAEF,eAAO,MAAM,wBAAwB,cACxB,MAAM,gBACH,MAAM,KACnB,qBAWF,CAAC;AAEF,eAAO,MAAM,aAAa,QAAS,MAAM,KAAG,UAG3C,CAAC;AAEF,eAAO,MAAM,YAAY,YACd,MAAM,mBACE,sBAAsB,eAC1B,yBAAyB,aAC3B,MAAM,uBACI,OAAO,wBACN,OAAO,KAC5B,gBA+BF,CAAC;AAEF,eAAO,MAAM,cAAc,oBACR,eAAe,kBAChB,MAAM,WACb,MAAM,KACd,mBAOF,CAAC"}
|
|
@@ -23,7 +23,8 @@ const getUniqueValidationSchema = (uniqueStringArrayExtractor) => {
|
|
|
23
23
|
message: 'Unexpected error: Failed to get values to test uniqueness',
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
|
-
return values.filter((currentValue) => currentValue === value
|
|
26
|
+
return (values.filter((currentValue) => currentValue.toLowerCase() === (value === null || value === void 0 ? void 0 : value.toLowerCase()))
|
|
27
|
+
.length === 1);
|
|
27
28
|
});
|
|
28
29
|
};
|
|
29
30
|
exports.getUniqueValidationSchema = getUniqueValidationSchema;
|
package/build/cjs/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonValidationSchemas.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.tsx"],"names":[],"mappings":";;;;AAAA,2CAAgD;AAChD,+CAA0C;AAC1C,iDAA2B;AAC3B,4DAA0D;AAC1D,gDAAmD;AACnD,+CAAmD;AAEnD,MAAM,YAAY,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;AAQvE,MAAM,yBAAyB,GAAG,CACvC,0BAAkE,EAClE,EAAE;IACF,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CACtB,QAAQ,EACR,sBAAsB,EACtB,CAAC,KAAK,EAAE,WAA4B,EAAE,EAAE;QACtC,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,OAAoD,CAAC;QACzF,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/B,OAAO,WAAW,CAAC,WAAW,CAAC;gBAC7B,OAAO,EAAE,+DAA+D;aACzE,CAAC,CAAC;SACJ;QAED,MAAM,MAAM,GAAG,0BAA0B,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,KAAe,CAAC,CAAC;QAExF,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,WAAW,CAAC,WAAW,CAAC;gBAC7B,OAAO,EAAE,2DAA2D;aACrE,CAAC,CAAC;SACJ;QACD,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,KAAK,KAAK,
|
|
1
|
+
{"version":3,"file":"commonValidationSchemas.js","sourceRoot":"","sources":["../../../../../../lib/ocm/components/clusterConfiguration/staticIp/commonValidationSchemas.tsx"],"names":[],"mappings":"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"}
|
package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/formDataFromInfraEnvField.js
CHANGED
|
@@ -8,8 +8,8 @@ const protocolVersion_1 = require("./protocolVersion");
|
|
|
8
8
|
const emptyData_1 = require("./emptyData");
|
|
9
9
|
const nmstateTypes_1 = require("./nmstateTypes");
|
|
10
10
|
const dummyData_1 = require("./dummyData");
|
|
11
|
-
const
|
|
12
|
-
return interfaces.
|
|
11
|
+
const findAllRealInterfaces = (interfaces) => {
|
|
12
|
+
return interfaces.filter((currentInterface) => !(0, dummyData_1.isDummyInterface)(currentInterface.name));
|
|
13
13
|
};
|
|
14
14
|
const parseYaml = (yaml) => {
|
|
15
15
|
const lines = yaml.split('\n');
|
|
@@ -83,8 +83,23 @@ const getFormViewHost = (infraEnvHost, protocolType) => {
|
|
|
83
83
|
throw `Static network config is missing mac address`;
|
|
84
84
|
}
|
|
85
85
|
const { nmstate } = parseYaml(infraEnvHost.networkYaml);
|
|
86
|
-
const
|
|
87
|
-
|
|
86
|
+
const realInterfaces = findAllRealInterfaces(nmstate.interfaces);
|
|
87
|
+
const firstInterface = realInterfaces[0];
|
|
88
|
+
const secondInterface = realInterfaces[1]; // Puede ser undefined
|
|
89
|
+
let bondInterface;
|
|
90
|
+
let nonBondInterface;
|
|
91
|
+
if (firstInterface) {
|
|
92
|
+
if (firstInterface.type === nmstateTypes_1.NmstateInterfaceType.BOND) {
|
|
93
|
+
bondInterface = firstInterface;
|
|
94
|
+
nonBondInterface = secondInterface;
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
nonBondInterface = firstInterface;
|
|
98
|
+
bondInterface =
|
|
99
|
+
(secondInterface === null || secondInterface === void 0 ? void 0 : secondInterface.type) === nmstateTypes_1.NmstateInterfaceType.BOND ? secondInterface : undefined;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
if (realInterfaces.length === 0) {
|
|
88
103
|
//handle case 2
|
|
89
104
|
return null;
|
|
90
105
|
}
|
|
@@ -100,14 +115,17 @@ const getFormViewHost = (infraEnvHost, protocolType) => {
|
|
|
100
115
|
bondSecondaryInterface: '',
|
|
101
116
|
useBond: false,
|
|
102
117
|
};
|
|
103
|
-
if (
|
|
118
|
+
if ((bondInterface === null || bondInterface === void 0 ? void 0 : bondInterface.type) === nmstateTypes_1.NmstateInterfaceType.BOND) {
|
|
104
119
|
ret.useBond = true;
|
|
105
|
-
ret.bondType =
|
|
120
|
+
ret.bondType = bondInterface['link-aggregation'].mode;
|
|
106
121
|
ret.bondPrimaryInterface = (_a = infraEnvHost.macInterfaceMap[0].macAddress) !== null && _a !== void 0 ? _a : '';
|
|
107
122
|
ret.bondSecondaryInterface = (_b = infraEnvHost.macInterfaceMap[1].macAddress) !== null && _b !== void 0 ? _b : '';
|
|
108
123
|
}
|
|
109
124
|
for (const protocolVersion of (0, protocolVersion_1.getShownProtocolVersions)(protocolType)) {
|
|
110
|
-
|
|
125
|
+
const interfaceToUse = nonBondInterface || bondInterface;
|
|
126
|
+
if (interfaceToUse) {
|
|
127
|
+
ret.ips[protocolVersion] = getIpAddress(interfaceToUse, protocolVersion);
|
|
128
|
+
}
|
|
111
129
|
}
|
|
112
130
|
return ret;
|
|
113
131
|
};
|
package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/formDataFromInfraEnvField.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formDataFromInfraEnvField.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/data/formDataFromInfraEnvField.ts"],"names":[],"mappings":";;;;AASA,0FAAuD;AACvD,+CAMuB;AAEvB,uDAA6D;AAC7D,2CAAgE;AAChE,iDAQwB;AACxB,2CAA+C;AAa/C,MAAM,
|
|
1
|
+
{"version":3,"file":"formDataFromInfraEnvField.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/data/formDataFromInfraEnvField.ts"],"names":[],"mappings":"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"}
|
package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.js
CHANGED
|
@@ -34,6 +34,11 @@ const getNmstateObject = (networkWide, hostIps, bondType, hasBondsConfigured) =>
|
|
|
34
34
|
if (hostIp) {
|
|
35
35
|
nicName = bondType && hasBondsConfigured ? BOND_NIC_NAME : REAL_NIC_NAME;
|
|
36
36
|
realProtocolConfigs[protocolVersion] = (0, nmstateYaml_1.getNmstateProtocolConfig)(hostIp, getPrefixLength(networkWide, protocolVersion));
|
|
37
|
+
if (networkWide.useVlan && networkWide.vlanId) {
|
|
38
|
+
if (bondType && hasBondsConfigured) {
|
|
39
|
+
interfaces.push((0, nmstateYaml_1.getInterface)(BOND_NIC_NAME, realProtocolConfigs, networkWide, bondType, hasBondsConfigured, true));
|
|
40
|
+
}
|
|
41
|
+
}
|
|
37
42
|
}
|
|
38
43
|
else {
|
|
39
44
|
//this happens when a host was particall configured, or not configured at all
|
|
@@ -42,6 +47,11 @@ const getNmstateObject = (networkWide, hostIps, bondType, hasBondsConfigured) =>
|
|
|
42
47
|
};
|
|
43
48
|
nicName = (0, dummyData_1.getDummyNicName)(protocolVersion);
|
|
44
49
|
interfaces.push((0, nmstateYaml_1.getInterface)(nicName, protocolConfigs, networkWide, bondType, hasBondsConfigured));
|
|
50
|
+
if (bondType && hasBondsConfigured) {
|
|
51
|
+
interfaces.push((0, nmstateYaml_1.getInterface)(BOND_NIC_NAME, protocolConfigs, networkWide, bondType, hasBondsConfigured, true));
|
|
52
|
+
}
|
|
53
|
+
// eslint-disable-next-line no-console
|
|
54
|
+
console.log(interfaces);
|
|
45
55
|
}
|
|
46
56
|
routeConfigs.push((0, nmstateYaml_1.getRouteConfig)(protocolVersion, networkWide.ipConfigs[protocolVersion].gateway, networkWide.useVlan && networkWide.vlanId
|
|
47
57
|
? (0, nmstateYaml_1.getVlanNicName)(nicName, networkWide.vlanId)
|
package/build/cjs/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formDataToInfraEnvField.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.ts"],"names":[],"mappings":";;;AAAA,qCAA+B;AAa/B,+CASuB;AACvB,uDAA6D;AAO7D,2EAAwE;AACxE,iDAAwD;AACxD,2CAAgG;AAChG,qDAAyD;AACzD,2CAA8C;AAE9C,MAAM,aAAa,GAAG,MAAM,CAAC;AAC7B,MAAM,eAAe,GAAG,MAAM,CAAC;AAC/B,MAAM,aAAa,GAAG,OAAO,CAAC;AAE9B,MAAM,eAAe,GAAG,CACtB,WAAsC,EACtC,eAAgC,EACxB,EAAE;IACV,MAAM,cAAc,GAAG,WAAW,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,cAAc,CAAC;IAC7E,IAAI,cAAc,CAAC,YAAY,KAAK,EAAE,EAAE;QACtC,MAAM,8CAA8C,CAAC;KACtD;IACD,OAAO,cAAc,CAAC,YAAY,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,QAAkB,EAAE,EAAE;IAC9D,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,+BAAiB,GAAG,OAAO,EAAE,CAAC,CAAC;IACjF,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAA,cAAI,EAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;AACvE,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CACvB,WAAsC,EACtC,OAAyB,EACzB,QAAiB,EACjB,kBAA4B,EACnB,EAAE;IACX,MAAM,UAAU,GAAuB,EAAE,CAAC;IAC1C,MAAM,YAAY,GAA0B,EAAE,CAAC;IAC/C,MAAM,GAAG,GAAG,IAAA,2BAAa,EAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,mBAAmB,GAA2B,EAAE,CAAC;IAEvD,KAAK,MAAM,eAAe,IAAI,IAAA,0CAAwB,EAAC,WAAW,CAAC,YAAY,CAAC,EAAE;QAChF,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QACxC,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,MAAM,EAAE;YACV,OAAO,GAAG,QAAQ,IAAI,kBAAkB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC;YACzE,mBAAmB,CAAC,eAAe,CAAC,GAAG,IAAA,sCAAwB,EAC7D,MAAM,EACN,eAAe,CAAC,WAAW,EAAE,eAAe,CAAC,CAC9C,CAAC;
|
|
1
|
+
{"version":3,"file":"formDataToInfraEnvField.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/data/formDataToInfraEnvField.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,8 +80,8 @@ const getDnsSection = (dns) => {
|
|
|
80
80
|
return { config: { server: dnsServers } };
|
|
81
81
|
};
|
|
82
82
|
exports.getDnsSection = getDnsSection;
|
|
83
|
-
const getInterface = (nicName, protocolConfigs, networkWide, bondType, hasBondsConfigured) => {
|
|
84
|
-
if (networkWide.useVlan && networkWide.vlanId) {
|
|
83
|
+
const getInterface = (nicName, protocolConfigs, networkWide, bondType, hasBondsConfigured, createBondInterface) => {
|
|
84
|
+
if (networkWide.useVlan && networkWide.vlanId && !createBondInterface) {
|
|
85
85
|
return Object.assign({ name: (0, exports.getVlanNicName)(nicName, networkWide.vlanId), type: nmstateTypes_1.NmstateInterfaceType.VLAN, state: 'up', vlan: { 'base-iface': nicName, id: networkWide.vlanId } }, protocolConfigs);
|
|
86
86
|
}
|
|
87
87
|
else if (bondType && hasBondsConfigured) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nmstateYaml.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"nmstateYaml.js","sourceRoot":"","sources":["../../../../../../../lib/ocm/components/clusterConfiguration/staticIp/data/nmstateYaml.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,10 @@ export const getUniqueValidationSchema = <FormValues,>(
|
|
|
34
34
|
message: 'Unexpected error: Failed to get values to test uniqueness',
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
|
-
return
|
|
37
|
+
return (
|
|
38
|
+
values.filter((currentValue) => currentValue.toLowerCase() === value?.toLowerCase())
|
|
39
|
+
.length === 1
|
|
40
|
+
);
|
|
38
41
|
},
|
|
39
42
|
);
|
|
40
43
|
};
|
|
@@ -40,12 +40,9 @@ type ParsedFormViewYaml = {
|
|
|
40
40
|
nmstate: Nmstate;
|
|
41
41
|
};
|
|
42
42
|
|
|
43
|
-
const
|
|
44
|
-
return interfaces.
|
|
45
|
-
(currentInterface) => !isDummyInterface(currentInterface.name),
|
|
46
|
-
) as unknown as NmstateInterface | undefined;
|
|
43
|
+
const findAllRealInterfaces = (interfaces: NmstateInterface[]): NmstateInterface[] => {
|
|
44
|
+
return interfaces.filter((currentInterface) => !isDummyInterface(currentInterface.name));
|
|
47
45
|
};
|
|
48
|
-
|
|
49
46
|
const parseYaml = (yaml: string): ParsedFormViewYaml => {
|
|
50
47
|
const lines = yaml.split('\n');
|
|
51
48
|
const lastCommentIdx = findLastIndex(lines, (line) => line.startsWith(YAML_COMMENT_CHAR));
|
|
@@ -133,9 +130,26 @@ const getFormViewHost = (
|
|
|
133
130
|
}
|
|
134
131
|
|
|
135
132
|
const { nmstate } = parseYaml(infraEnvHost.networkYaml);
|
|
136
|
-
const realInterface = findFirstRealInterface(nmstate.interfaces);
|
|
137
133
|
|
|
138
|
-
|
|
134
|
+
const realInterfaces = findAllRealInterfaces(nmstate.interfaces);
|
|
135
|
+
const firstInterface = realInterfaces[0];
|
|
136
|
+
const secondInterface = realInterfaces[1]; // Puede ser undefined
|
|
137
|
+
|
|
138
|
+
let bondInterface: NmstateInterface | undefined;
|
|
139
|
+
let nonBondInterface: NmstateInterface | undefined;
|
|
140
|
+
|
|
141
|
+
if (firstInterface) {
|
|
142
|
+
if (firstInterface.type === NmstateInterfaceType.BOND) {
|
|
143
|
+
bondInterface = firstInterface;
|
|
144
|
+
nonBondInterface = secondInterface;
|
|
145
|
+
} else {
|
|
146
|
+
nonBondInterface = firstInterface;
|
|
147
|
+
bondInterface =
|
|
148
|
+
secondInterface?.type === NmstateInterfaceType.BOND ? secondInterface : undefined;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
if (realInterfaces.length === 0) {
|
|
139
153
|
//handle case 2
|
|
140
154
|
return null;
|
|
141
155
|
}
|
|
@@ -153,16 +167,20 @@ const getFormViewHost = (
|
|
|
153
167
|
useBond: false,
|
|
154
168
|
};
|
|
155
169
|
|
|
156
|
-
if (
|
|
170
|
+
if (bondInterface?.type === NmstateInterfaceType.BOND) {
|
|
157
171
|
ret.useBond = true;
|
|
158
|
-
ret.bondType =
|
|
172
|
+
ret.bondType = bondInterface['link-aggregation'].mode;
|
|
159
173
|
ret.bondPrimaryInterface = infraEnvHost.macInterfaceMap[0].macAddress ?? '';
|
|
160
174
|
ret.bondSecondaryInterface = infraEnvHost.macInterfaceMap[1].macAddress ?? '';
|
|
161
175
|
}
|
|
162
176
|
|
|
163
177
|
for (const protocolVersion of getShownProtocolVersions(protocolType)) {
|
|
164
|
-
|
|
178
|
+
const interfaceToUse = nonBondInterface || bondInterface;
|
|
179
|
+
if (interfaceToUse) {
|
|
180
|
+
ret.ips[protocolVersion] = getIpAddress(interfaceToUse, protocolVersion);
|
|
181
|
+
}
|
|
165
182
|
}
|
|
183
|
+
|
|
166
184
|
return ret;
|
|
167
185
|
};
|
|
168
186
|
|
|
@@ -74,6 +74,20 @@ const getNmstateObject = (
|
|
|
74
74
|
hostIp,
|
|
75
75
|
getPrefixLength(networkWide, protocolVersion),
|
|
76
76
|
);
|
|
77
|
+
if (networkWide.useVlan && networkWide.vlanId) {
|
|
78
|
+
if (bondType && hasBondsConfigured) {
|
|
79
|
+
interfaces.push(
|
|
80
|
+
getInterface(
|
|
81
|
+
BOND_NIC_NAME,
|
|
82
|
+
realProtocolConfigs,
|
|
83
|
+
networkWide,
|
|
84
|
+
bondType,
|
|
85
|
+
hasBondsConfigured,
|
|
86
|
+
true,
|
|
87
|
+
),
|
|
88
|
+
);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
77
91
|
} else {
|
|
78
92
|
//this happens when a host was particall configured, or not configured at all
|
|
79
93
|
const protocolConfigs = {
|
|
@@ -86,6 +100,20 @@ const getNmstateObject = (
|
|
|
86
100
|
interfaces.push(
|
|
87
101
|
getInterface(nicName, protocolConfigs, networkWide, bondType, hasBondsConfigured),
|
|
88
102
|
);
|
|
103
|
+
if (bondType && hasBondsConfigured) {
|
|
104
|
+
interfaces.push(
|
|
105
|
+
getInterface(
|
|
106
|
+
BOND_NIC_NAME,
|
|
107
|
+
protocolConfigs,
|
|
108
|
+
networkWide,
|
|
109
|
+
bondType,
|
|
110
|
+
hasBondsConfigured,
|
|
111
|
+
true,
|
|
112
|
+
),
|
|
113
|
+
);
|
|
114
|
+
}
|
|
115
|
+
// eslint-disable-next-line no-console
|
|
116
|
+
console.log(interfaces);
|
|
89
117
|
}
|
|
90
118
|
|
|
91
119
|
routeConfigs.push(
|
|
@@ -104,8 +104,9 @@ export const getInterface = (
|
|
|
104
104
|
networkWide: FormViewNetworkWideValues,
|
|
105
105
|
bondType?: string,
|
|
106
106
|
hasBondsConfigured?: boolean,
|
|
107
|
+
createBondInterface?: boolean,
|
|
107
108
|
): NmstateInterface => {
|
|
108
|
-
if (networkWide.useVlan && networkWide.vlanId) {
|
|
109
|
+
if (networkWide.useVlan && networkWide.vlanId && !createBondInterface) {
|
|
109
110
|
return {
|
|
110
111
|
name: getVlanNicName(nicName, networkWide.vlanId),
|
|
111
112
|
type: NmstateInterfaceType.VLAN,
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@openshift-assisted/locales": "2.36.
|
|
4
|
-
"@openshift-assisted/types": "2.36.
|
|
3
|
+
"@openshift-assisted/locales": "2.36.4",
|
|
4
|
+
"@openshift-assisted/types": "2.36.4",
|
|
5
5
|
"@openshift-console/dynamic-plugin-sdk": "0.0.3",
|
|
6
6
|
"@patternfly/patternfly": "5.2.0",
|
|
7
7
|
"@patternfly/react-code-editor": "5.2.0",
|
|
@@ -139,5 +139,5 @@
|
|
|
139
139
|
]
|
|
140
140
|
}
|
|
141
141
|
},
|
|
142
|
-
"version": "2.36.
|
|
142
|
+
"version": "2.36.4"
|
|
143
143
|
}
|