refactoring SourceModeDA

src/modularPlantManager/pea/dataAssembly/ServiceControl/ServiceControl.puml

@@ -27,7 +27,7 @@
 'https://plantuml.com/class-diagram
 !include ../_extensions/wqcDA/WQC.puml
 !include ../_extensions/opMode/OpModeController.puml
-!include ../_extensions/serviceSourceModeDA/ServiceSourceModeController.puml
+!include ../_extensions/serviceSourceMode/ServiceSourceModeController.puml
 class ServiceControl{
     + readonly communication!: ServiceControlRuntime
     + readonly wqc: WQC

src/modularPlantManager/pea/dataAssembly/_extensions/basicDefinitions.puml

@@ -32,7 +32,7 @@
 !include OSLevel/OSLevel.puml
 !include resetDA/Reset.puml
 !include scaleSettingsDA/ScaleSettings.puml
-!include serviceSourceModeDA/ServiceSourceModeController.puml
+!include serviceSourceMode/ServiceSourceModeController.puml
 !include sourceModeDA/SourceModeController.puml
 !include unitDA/UnitSettings.puml
 !include valueLimitationDA/ValueLimitation.puml
@@ -48,7 +48,7 @@ DataAssemblyController "0..1" o-- OSLevel
 DataAssemblyController "0..1" o-- Reset
 DataAssemblyController "0..1" o-- ScaleSettingDA
 DataAssemblyController "0..1" o-- ServiceSourceMode
-DataAssemblyController "0..1" o-- SourceModeDA
+DataAssemblyController "0..1" o-- SourceMode
 DataAssemblyController "0..1" o-- UnitDA
 DataAssemblyController "0..1" o-- ValueLimitationDA
 DataAssemblyController "0..1" o-- WQCDA

src/modularPlantManager/pea/dataAssembly/_extensions/index.ts

@@ -30,7 +30,7 @@ export * from './opMode/OpMode';
 export * from './osLevel/OSLevel';
 export * from './reset/Reset';
 export * from './scaleSettings/ScaleSettings';
-export * from './sourceModeDA/SourceModeController';
+export * from './sourceMode/SourceModeController';
 export * from './unitDA/UnitSettings';
 export * from './valueLimitationDA/ValueLimitation';
 export * from './wqcDA/WQC';

src/modularPlantManager/pea/dataAssembly/_extensions/sourceModeDA/SourceModeDA.mockup.spec.ts → src/modularPlantManager/pea/dataAssembly/_extensions/sourceMode/SourceMode.mockup.spec.ts

@@ -26,32 +26,32 @@
 import * as chai from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import {MockupServer} from '../../../../_utils';
-import {SourceModeDAMockup} from './SourceModeDA.mockup';
+import {SourceModeMockup} from './SourceMode.mockup';
 import {OpcUaConnection} from '../../../connection';
 import {ServiceSourceMode, SourceMode} from '@p2olab/polaris-interface';
 
 chai.use(chaiAsPromised);
 const expect = chai.expect;
 
 
-describe('SourceModeDAMockup', () => {
+describe('SourceModeMockup', () => {
     describe('static', () => {
         let mockupServer: MockupServer;
         beforeEach(async()=>{
             mockupServer = new MockupServer();
             await mockupServer.initialize();
         });
 
-        it('should create SourceModeDAMockup', async () => {
-            const mockup= new SourceModeDAMockup(mockupServer.nameSpace,
+        it('should create SourceModeMockup', async () => {
+            const mockup= new SourceModeMockup(mockupServer.nameSpace,
                 mockupServer.rootObject, 'Variable');
             expect(mockup).to.not.be.undefined;
         });
 
         it('getSourceModeMockupReferenceJSON()',  () => {
-            const mockup = new SourceModeDAMockup(mockupServer.nameSpace,
+            const mockup = new SourceModeMockup(mockupServer.nameSpace,
                 mockupServer.rootObject, 'Variable');
-            const json = mockup.getSourceModeDAInstanceMockupJSON() as any;
+            const json = mockup.getSourceModeInstanceMockupJSON() as any;
             expect(Object.keys(json).length).to.equal(7);
             expect(json.SrcChannel).to.not.be.undefined;
             expect(json.SrcManAut).to.not.be.undefined;
@@ -65,14 +65,14 @@ describe('SourceModeDAMockup', () => {
     describe('dynamic', () => {
 
         let mockupServer: MockupServer;
-        let mockup: SourceModeDAMockup;
+        let mockup: SourceModeMockup;
         let connection: OpcUaConnection;
 
         beforeEach(async function () {
             this.timeout(10000);
             mockupServer = new MockupServer();
             await mockupServer.initialize();
-            mockup = new SourceModeDAMockup(mockupServer.nameSpace, mockupServer.rootObject, 'Variable');
+            mockup = new SourceModeMockup(mockupServer.nameSpace, mockupServer.rootObject, 'Variable');
             await mockupServer.start();
             connection = new OpcUaConnection();
             connection.initialize({endpoint: mockupServer.endpoint});
@@ -125,14 +125,14 @@ describe('SourceModeDAMockup', () => {
     describe('dynamic, srcChannel is true', () => {
 
         let mockupServer: MockupServer;
-        let mockup: SourceModeDAMockup;
+        let mockup: SourceModeMockup;
         let connection: OpcUaConnection;
 
         beforeEach(async function () {
             this.timeout(10000);
             mockupServer = new MockupServer();
             await mockupServer.initialize();
-            mockup = new SourceModeDAMockup(mockupServer.nameSpace,
+            mockup = new SourceModeMockup(mockupServer.nameSpace,
                 mockupServer.rootObject, 'Variable');
             mockup.srcChannel = true;
             await mockupServer.start();

src/modularPlantManager/pea/dataAssembly/_extensions/sourceModeDA/SourceModeDA.mockup.ts → src/modularPlantManager/pea/dataAssembly/_extensions/sourceMode/SourceMode.mockup.ts

@@ -26,7 +26,7 @@
 import {DataType, Namespace, StatusCodes, UAObject, Variant} from 'node-opcua';
 import {SourceMode} from '@p2olab/polaris-interface';
 
-export function getSourceModeDAMockupReferenceJSON(
+export function getSourceModeMockupReferenceJSON(
     namespace: number,
     objectBrowseName: string): object {
 
@@ -69,7 +69,7 @@ export function getSourceModeDAMockupReferenceJSON(
   });
 }
 
-export class SourceModeDAMockup {
+export class SourceModeMockup {
   srcMode: SourceMode = SourceMode.Intern;
   public srcChannel = false;
   protected srcManAut = false;
@@ -195,8 +195,8 @@ export class SourceModeDAMockup {
   }
 
 
-  public getSourceModeDAInstanceMockupJSON(): object {
-    return getSourceModeDAMockupReferenceJSON(
+  public getSourceModeInstanceMockupJSON(): object {
+    return getSourceModeMockupReferenceJSON(
         this.mockupNode.namespaceIndex,
         this.mockupNode.browseName.name as string);
   }

src/modularPlantManager/pea/dataAssembly/_extensions/sourceModeDA/SourceModeController.puml → src/modularPlantManager/pea/dataAssembly/_extensions/sourceMode/SourceModeController.puml

@@ -56,6 +56,6 @@ class SourceModeController{
 }
 
 SourceModeRuntime <-- SourceModeController
-SourceModeDASpec --> SourceModeController : <<uses>>
-SourceModeDASpec --> SourceModeDAMockup : <<uses>>
+SourceModeSpec --> SourceModeController : <<uses>>
+SourceModeSpec --> SourceModeMockup : <<uses>>
 @enduml

src/modularPlantManager/pea/dataAssembly/_extensions/sourceModeDA/SourceModeController.spec.ts → src/modularPlantManager/pea/dataAssembly/_extensions/sourceMode/SourceModeController.spec.ts

@@ -32,7 +32,7 @@ import {DataAssemblyOptions, SourceMode} from '@p2olab/polaris-interface';
 import * as baseDataAssemblyOptions from './SourceModeController.spec.json';
 import {BinManInt} from '../../operationElement';
 import {MockupServer} from '../../../../_utils';
-import {SourceModeDAMockup} from './SourceModeDA.mockup';
+import {SourceModeMockup} from './SourceMode.mockup';
 import {SourceModeController} from './SourceModeController';
 
 chai.use(chaiAsPromised);
@@ -73,7 +73,7 @@ describe('SourceModeController', () => {
 				organizedBy: mockupServer.rootObject,
 				browseName: 'Variable',
 			});
-			new SourceModeDAMockup(mockupServer.nameSpace, mockupNode,'Variable');
+			new SourceModeMockup(mockupServer.nameSpace, mockupNode,'Variable');
 			await mockupServer.start();
 			connection = new OpcUaConnection();
 			connection.initialize({endpoint: mockupServer.endpoint});
@@ -108,7 +108,7 @@ describe('SourceModeController', () => {
 	describe('dynamic functions, manual', async () => {
 		let mockupServer: MockupServer;
 		let connection: OpcUaConnection;
-		let mockup: SourceModeDAMockup;
+		let mockup: SourceModeMockup;
 		let sourceMode: SourceModeController;
 		let dataAssemblyController: any;
 
@@ -119,7 +119,7 @@ describe('SourceModeController', () => {
 				organizedBy: mockupServer.rootObject,
 				browseName: 'Variable',
 			});
-			mockup = new SourceModeDAMockup(
+			mockup = new SourceModeMockup(
 				mockupServer.nameSpace,
 				mockupNode,
 				'Variable');
@@ -185,7 +185,7 @@ describe('SourceModeController', () => {
 				organizedBy: mockupServer.rootObject,
 				browseName: 'Variable',
 			});
-			new SourceModeDAMockup(mockupServer.nameSpace, mockupNode, 'Variable');
+			new SourceModeMockup(mockupServer.nameSpace, mockupNode, 'Variable');
 			await mockupServer.start();
 
 			connection = new OpcUaConnection();

src/modularPlantManager/pea/dataAssembly/activeElement/PIDCtrl/PIDCtrl.mockup.ts

@@ -27,7 +27,7 @@ import {DataType, Namespace, StatusCodes, UAObject, Variant} from 'node-opcua';
 import {getOpModeMockupReferenceJSON, OpModeMockup} from '../../_extensions/opMode/OpMode.mockup';
 import {WQCDAMockup} from '../../_extensions/wqcDA/WQCDA.mockup';
 import {OSLevelMockup} from '../../_extensions/osLevel/OSLevel.mockup';
-import {getSourceModeDAMockupReferenceJSON, SourceModeDAMockup} from '../../_extensions/sourceModeDA/SourceModeDA.mockup';
+import {getSourceModeMockupReferenceJSON, SourceModeMockup} from '../../_extensions/sourceMode/SourceMode.mockup';
 import {getActiveElementMockupReferenceJSON} from '../ActiveElement.mockup';
 
 
@@ -37,7 +37,7 @@ export function getPIDCtrlMockupReferenceJSON(
 
 	return ({
 			...getActiveElementMockupReferenceJSON(namespace,objectBrowseName),
-			...getSourceModeDAMockupReferenceJSON(namespace,objectBrowseName),
+			...getSourceModeMockupReferenceJSON(namespace,objectBrowseName),
 			...getOpModeMockupReferenceJSON(namespace, objectBrowseName),
 			PV: {
 				namespaceIndex: `${namespace}`,
@@ -169,7 +169,7 @@ export class PIDCtrlMockup {
 	public wqc: WQCDAMockup;
 	public osLevel: OSLevelMockup;
 	public opMode: OpModeMockup;
-	public sourceMode: SourceModeDAMockup;
+	public sourceMode: SourceModeMockup;
 	public pv= 0;
 	public pvSclMin= 0;
 	public pvSclMax= 0;
@@ -212,7 +212,7 @@ export class PIDCtrlMockup {
 		this.osLevel = new OSLevelMockup(namespace, this.mockupNode, this.name);
 		this.wqc = new WQCDAMockup(namespace, this.mockupNode, this.name);
 		this.opMode = new OpModeMockup(namespace, this.mockupNode, this.name);
-		this.sourceMode = new SourceModeDAMockup(namespace, this.mockupNode, this.name);
+		this.sourceMode = new SourceModeMockup(namespace, this.mockupNode, this.name);
 
 		namespace.addVariable({
 			componentOf: this.mockupNode,

src/modularPlantManager/pea/dataAssembly/activeElement/drv/anaDrv/AnaDrv.mockup.ts

@@ -25,9 +25,9 @@
 
 import {DataType, Namespace, StatusCodes, UAObject, Variant} from 'node-opcua';
 import {
-	getSourceModeDAMockupReferenceJSON,
-	SourceModeDAMockup
-} from '../../../_extensions/sourceModeDA/SourceModeDA.mockup';
+	getSourceModeMockupReferenceJSON,
+	SourceModeMockup
+} from '../../../_extensions/sourceMode/SourceMode.mockup';
 import {DrvMockup, getDrvMockupReferenceJSON} from '../Drv.mockup';
 
 
@@ -36,7 +36,7 @@ export function getAnaDrvMockupReferenceJSON(
 	objectBrowseName: string): object {
 
 	return ({
-			...getSourceModeDAMockupReferenceJSON(namespace,objectBrowseName),
+			...getSourceModeMockupReferenceJSON(namespace,objectBrowseName),
 			...getDrvMockupReferenceJSON(namespace,objectBrowseName),
 			RpmSclMax: {
 				namespaceIndex: `${namespace}`,
@@ -99,7 +99,7 @@ export function getAnaDrvMockupReferenceJSON(
 
 export class AnaDrvMockup extends DrvMockup{
 
-	public sourceMode: SourceModeDAMockup;
+	public sourceMode: SourceModeMockup;
 
 	public rpmSclMin= 0;
 	public rpmSclMax= 0;
@@ -116,7 +116,7 @@ export class AnaDrvMockup extends DrvMockup{
 	constructor(namespace: Namespace, rootNode: UAObject, variableName: string) {
 		super(namespace, rootNode, variableName);
 
-		this.sourceMode= new SourceModeDAMockup(namespace,this.mockupNode,this.name);
+		this.sourceMode= new SourceModeMockup(namespace,this.mockupNode,this.name);
 
 		namespace.addVariable({
 			componentOf: this.mockupNode,

src/modularPlantManager/pea/dataAssembly/activeElement/vlv/anaVlv/AnaVlv.mockup.ts

@@ -25,9 +25,9 @@
 
 import {DataType, Namespace, StatusCodes, UAObject, Variant} from 'node-opcua';
 import {
-	getSourceModeDAMockupReferenceJSON,
-	SourceModeDAMockup
-} from '../../../_extensions/sourceModeDA/SourceModeDA.mockup';
+	getSourceModeMockupReferenceJSON,
+	SourceModeMockup
+} from '../../../_extensions/sourceMode/SourceMode.mockup';
 import {getVlvMockupReferenceJSON, VlvMockup} from '../Vlv.mockup';
 
 
@@ -37,7 +37,7 @@ export function getAnaVlvMockupReferenceJSON(
 
 	return ({
 			...getVlvMockupReferenceJSON(namespace, objectBrowseName),
-			...getSourceModeDAMockupReferenceJSON(namespace,objectBrowseName),
+			...getSourceModeMockupReferenceJSON(namespace,objectBrowseName),
 			Pos: {
 				namespaceIndex: `${namespace}`,
 				nodeId: `${objectBrowseName}.Pos`,
@@ -109,7 +109,7 @@ export function getAnaVlvMockupReferenceJSON(
 
 export class AnaVlvMockup extends VlvMockup{
 
-	public sourceModeMockup: SourceModeDAMockup;
+	public sourceModeMockup: SourceModeMockup;
 
 	public posSclMin = 0;
 	public posSclMax = 0;
@@ -129,7 +129,7 @@ export class AnaVlvMockup extends VlvMockup{
 
 		super(namespace, rootNode, variableName);
 
-		this.sourceModeMockup = new SourceModeDAMockup(namespace, rootNode, variableName);
+		this.sourceModeMockup = new SourceModeMockup(namespace, rootNode, variableName);
 
 		namespace.addVariable({
 			componentOf: this.mockupNode,

src/modularPlantManager/pea/dataAssembly/operationElement/man/anaMan/AnaManInt.mockup.ts

@@ -26,9 +26,9 @@
 
 import {DataType, Namespace, UAObject, Variant} from 'node-opcua';
 import {
-	getSourceModeDAMockupReferenceJSON,
-	SourceModeDAMockup
-} from '../../../_extensions/sourceModeDA/SourceModeDA.mockup';
+	getSourceModeMockupReferenceJSON,
+	SourceModeMockup
+} from '../../../_extensions/sourceMode/SourceMode.mockup';
 import {getWQCDAMockupReferenceJSON, WQCDAMockup} from '../../../_extensions/wqcDA/WQCDA.mockup';
 import {AnaManMockup, getAnaManMockupReferenceJSON} from './AnaMan.mockup';
 
@@ -39,7 +39,7 @@ export function getAnaManIntMockupReferenceJSON(
 	return ({
 			...getAnaManMockupReferenceJSON(namespace,objectBrowseName),
 			...getWQCDAMockupReferenceJSON(namespace,objectBrowseName),
-			...getSourceModeDAMockupReferenceJSON(namespace,objectBrowseName),
+			...getSourceModeMockupReferenceJSON(namespace,objectBrowseName),
 			VInt: {
 				namespaceIndex: `${namespace}`,
 				nodeId: `${objectBrowseName}.VInt`,
@@ -53,13 +53,13 @@ export class AnaManIntMockup extends AnaManMockup{
 
 	protected vInt = 0;
 	public readonly wqc: WQCDAMockup;
-	public readonly sourceMode: SourceModeDAMockup;
+	public readonly sourceMode: SourceModeMockup;
 
 	constructor(namespace: Namespace, rootNode: UAObject, variableName: string) {
 		super(namespace, rootNode, variableName);
 
 		this.wqc = new WQCDAMockup(namespace, this.mockupNode, this.name);
-		this.sourceMode = new SourceModeDAMockup(namespace, this.mockupNode, this.name);
+		this.sourceMode = new SourceModeMockup(namespace, this.mockupNode, this.name);
 
 		namespace.addVariable({
 			componentOf: this.mockupNode,

src/modularPlantManager/pea/dataAssembly/operationElement/man/binMan/BinManInt.mockup.ts

@@ -26,9 +26,9 @@
 import {DataType, Namespace, UAObject, Variant} from 'node-opcua';
 
 import {
-	getSourceModeDAMockupReferenceJSON,
-	SourceModeDAMockup
-} from '../../../_extensions/sourceModeDA/SourceModeDA.mockup';
+	getSourceModeMockupReferenceJSON,
+	SourceModeMockup
+} from '../../../_extensions/sourceMode/SourceMode.mockup';
 import {BinManMockup, getBinManMockupReferenceJSON} from './BinMan.mockup';
 import {getWQCDAMockupReferenceJSON, WQCDAMockup} from '../../../_extensions/wqcDA/WQCDA.mockup';
 
@@ -38,7 +38,7 @@ export function getBinManIntMockupReferenceJSON(
 	return ({
 			...getBinManMockupReferenceJSON(namespace, objectBrowseName),
 			...getWQCDAMockupReferenceJSON(namespace, objectBrowseName),
-			...getSourceModeDAMockupReferenceJSON(namespace,objectBrowseName),
+			...getSourceModeMockupReferenceJSON(namespace,objectBrowseName),
 			VInt: {
 				namespaceIndex: `${namespace}`,
 				nodeId: `${objectBrowseName}.VInt`,
@@ -51,13 +51,13 @@ export function getBinManIntMockupReferenceJSON(
 export class BinManIntMockup extends BinManMockup {
 	protected vInt = false;
 	public readonly wqc: WQCDAMockup;
-	public readonly sourceMode: SourceModeDAMockup;
+	public readonly sourceMode: SourceModeMockup;
 
 	constructor(namespace: Namespace, rootNode: UAObject, variableName: string) {
 		super(namespace, rootNode, variableName);
 
 		this.wqc = new WQCDAMockup(namespace, this.mockupNode, this.name);
-		this.sourceMode = new SourceModeDAMockup(namespace, this.mockupNode, this.name);
+		this.sourceMode = new SourceModeMockup(namespace, this.mockupNode, this.name);
 
 		namespace.addVariable({
 			componentOf: this.mockupNode,