From 4745065b9f844f9b06ad782451cf24792eec4686 Mon Sep 17 00:00:00 2001 From: Etienne Rossignon Date: Tue, 19 Jun 2018 18:41:41 +0200 Subject: [PATCH] rename getPrivateNamespace => getOwnNamespace --- documentation/sample_server.js | 2 +- ...sample_server_with_historizing_variable.js | 2 +- documentation/server_with_da_variables.js | 2 +- documentation/server_with_method.js | 2 +- documentation/weather.js | 2 +- .../address_space_for_conformance_testing.js | 10 +++--- .../src/address_space.js | 27 +++++++------- .../src/address_space_add_enumeration_type.js | 2 +- .../src/address_space_add_event_type.js | 2 +- .../src/address_space_add_method.js | 4 +-- .../acknowledgeable_condition.js | 2 +- .../alarms_and_conditions/alarm_condition.js | 2 +- .../src/alarms_and_conditions/condition.js | 2 +- .../alarms_and_conditions/discrete_alarm.js | 2 +- .../exclusive_deviation_alarm.js | 2 +- .../exclusive_level_alarm.js | 2 +- .../exclusive_limit_alarm.js | 2 +- .../src/alarms_and_conditions/limit_alarm.js | 2 +- .../non_exclusive_deviation_alarm.js | 2 +- .../non_exclusive_limit_alarm.js | 2 +- .../alarms_and_conditions/off_normal_alarm.js | 2 +- .../node-opcua-address-space/src/base_node.js | 11 +++--- .../address_space_add_AnalogItem.js | 4 +-- .../address_space_add_MultiStateDiscrete.js | 2 +- ...dress_space_add_MultiStateValueDiscrete.js | 2 +- .../address_space_add_TwoStateDiscrete.js | 2 +- .../address_space_add_YArrayItem.js | 2 +- .../src/loader/load_nodeset2.js | 35 +++++++++++++++++-- .../node-opcua-address-space/src/namespace.js | 33 ++++++++--------- .../address_space_state_machine.js | 8 ++--- .../src/ua_object_type.js | 2 +- .../src/ua_two_state_variable.js | 2 +- .../src/ua_variable_type.js | 2 +- .../test_alarms_and_conditions.js | 2 +- .../utest_acknowledgeable_condition.js | 2 +- .../alarms_and_conditions/utest_condition.js | 34 +++++++++--------- .../utest_off_normal_alarm.js | 2 +- .../data_access/subtest_Y_array_item_type.js | 2 +- .../subtest_analog_item_semantic_changed.js | 2 +- .../data_access/subtest_analog_item_type.js | 2 +- .../subtest_data_item_PercentDeadband.js | 2 +- .../subtest_multi_state_discrete_type.js | 4 +-- ...subtest_multi_state_value_discrete_type.js | 4 +-- .../subtest_two_state_discrete_type.js | 2 +- .../test_finite_state_machine.js | 2 +- .../test/fixture_camera_type.js | 2 +- .../test/fixture_temperature_sensor_type.js | 2 +- ...test_address_space_historical_data_node.js | 10 +++--- ...accessLevel_userAccessLevel_pullrequest.js | 2 +- .../test/test_address_space.js | 2 +- ...test_address_space_add_enumeration_type.js | 2 +- .../test/test_address_space_add_event_type.js | 10 +++--- .../test_address_space_add_object_type.js | 4 +-- .../test_address_space_add_variable_type.js | 2 +- .../test/test_address_space_browse_path.js | 2 +- .../test_address_space_model_change_event.js | 4 +-- ...test_address_space_object_instantiation.js | 4 +-- ...automatic_generation_of_string_node_ids.js | 6 ++-- .../test/test_base_node.js | 2 +- .../test/test_boiler.js | 2 +- .../test/test_datatype.js | 2 +- .../test/test_findReferenceEx.js | 2 +- .../test/test_issue_105.js | 4 +-- .../test/test_issue_108.js | 4 +-- .../test/test_issue_162.js | 2 +- .../test/test_issue_337.js | 2 +- .../test/test_issue_449.js | 2 +- .../test/test_load_nodeset2.js | 6 ++++ .../test/test_method.js | 2 +- .../test/test_nodeset_to_xml.js | 16 ++++----- .../test/test_object_type.js | 8 ++--- .../test/test_referencetype.js | 2 +- .../test/test_variable.js | 12 +++---- .../test/test_variable_type.js | 20 +++++------ .../add_event_generator_object.js | 2 +- .../alarms_and_conditions_demo.js | 2 +- .../test_helpers/boiler_system.js | 4 +-- .../test_e2e_server_with_analyser_device.js | 4 +-- .../test_e2e_connection_reconnection.js | 2 +- ..._e2e_issue171_control_user_access_level.js | 2 +- .../test_e2e_issue405_control_user_role.js | 2 +- .../test_e2e_limited_number_of_nodes.js | 2 +- .../u_test_e2e_SubscriptionUseCase.js | 2 +- .../test/end_to_end/u_test_e2e_issue_123.js | 2 +- ...2e_issue_135_currentMonitoredItemsCount.js | 2 +- .../test/end_to_end/u_test_e2e_issue_141.js | 2 +- .../test/end_to_end/u_test_e2e_issue_156.js | 2 +- .../test/end_to_end/u_test_e2e_issue_163.js | 2 +- .../test/end_to_end/u_test_e2e_issue_377.js | 2 +- ...le_server_with_custom_extension_objects.js | 2 +- .../build_server_with_temperature_device.js | 4 +-- .../test_helpers/hvac_system.js | 2 +- packages/node-opcua-samples/bin/di_server.js | 2 +- .../node-opcua-samples/bin/simple_server.js | 2 +- .../node-opcua-server/src/server_session.js | 4 +-- .../test/test_raise_event.js | 2 +- .../test/test_server_engine.js | 12 +++---- .../test/test_server_engine_add_method.js | 2 +- .../test/test_server_engine_view.js | 2 +- .../test/test_subscription.js | 2 +- .../test_subscription_with_monitored_items.js | 4 +-- ...nitored_items_boolean_string_bytestring.js | 2 +- .../src/vendor_diagnostic_nodes.js | 2 +- 103 files changed, 252 insertions(+), 208 deletions(-) diff --git a/documentation/sample_server.js b/documentation/sample_server.js index 6191a3f71d..d610658034 100644 --- a/documentation/sample_server.js +++ b/documentation/sample_server.js @@ -17,7 +17,7 @@ function post_initialize() { function construct_my_address_space(server) { const addressSpace = server.engine.addressSpace; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); // declare a new object const device = namespace.addObject({ diff --git a/documentation/sample_server_with_historizing_variable.js b/documentation/sample_server_with_historizing_variable.js index b64185a749..10bff2e5fc 100644 --- a/documentation/sample_server_with_historizing_variable.js +++ b/documentation/sample_server_with_historizing_variable.js @@ -11,7 +11,7 @@ const server = new opcua.OPCUAServer({ }); function construct_address_space(server) { const addressSpace = server.engine.addressSpace; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const vessel = namespace.addObject({ browseName: "Vessel", organizedBy: addressSpace.rootFolder.objects diff --git a/documentation/server_with_da_variables.js b/documentation/server_with_da_variables.js index 4ac8b2cba8..c11d3cebfa 100644 --- a/documentation/server_with_da_variables.js +++ b/documentation/server_with_da_variables.js @@ -9,7 +9,7 @@ const server = new opcua.OPCUAServer({ function post_initialize() { const addressSpace = server.engine.addressSpace; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const myDevice = namespace.addObject({ organizedBy: addressSpace.rootFolder.objects, diff --git a/documentation/server_with_method.js b/documentation/server_with_method.js index 5c53576a1b..aa7a240330 100644 --- a/documentation/server_with_method.js +++ b/documentation/server_with_method.js @@ -9,7 +9,7 @@ const server = new opcua.OPCUAServer({ function post_initialize() { const addressSpace = server.engine.addressSpace; - const namespace =addressSpace.getPrivateNamespace(); + const namespace =addressSpace.getOwnNamespace(); const myDevice = namespace.addObject({ organizedBy: addressSpace.rootFolder.objects, diff --git a/documentation/weather.js b/documentation/weather.js index c7f2a4c5aa..6bbf22d81f 100644 --- a/documentation/weather.js +++ b/documentation/weather.js @@ -80,7 +80,7 @@ function post_initialize() { function construct_my_address_space(server) { // declare some folders const addressSpace = server.engine.addressSpace; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const citiesNode = namespace.addFolder("ObjectsFolder",{ browseName: "Cities"}); function create_CityNode(city_name) { // declare the city node diff --git a/packages/node-opcua-address-space-for-conformance-testing/src/address_space_for_conformance_testing.js b/packages/node-opcua-address-space-for-conformance-testing/src/address_space_for_conformance_testing.js index df995cc9cd..45a8fa785a 100644 --- a/packages/node-opcua-address-space-for-conformance-testing/src/address_space_for_conformance_testing.js +++ b/packages/node-opcua-address-space-for-conformance-testing/src/address_space_for_conformance_testing.js @@ -143,7 +143,7 @@ function makeVariant(dataTypeName, isArray, current_value) { function _add_variable(namespace, parent, varName, dataTypeName, current_value, isArray, extra_name) { - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(typeof extra_name === "string"); assert(addressSpace instanceof AddressSpace); @@ -440,7 +440,7 @@ function add_simulation_variables(namespace, scalarFolder) { }); install_Timer(); - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; addressSpace.registerShutdownTask(tearDown_Timer); } @@ -1164,7 +1164,7 @@ function add_ObjectWithMethod(namespace, parentFolder) { function add_enumeration_variable(namespaceDemo, parentFolder) { - const addressSpace = namespaceDemo.__addressSpace; + const addressSpace = namespaceDemo.addressSpace; const myEnumType = namespaceDemo.addEnumerationType({ browseName: "SimulationEnumerationType", @@ -1193,7 +1193,7 @@ function add_enumeration_variable(namespaceDemo, parentFolder) { function add_trigger_nodes(namespace, parentFolder) { - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; // add 2 nodes that generate an event when ever they are written to. function _add_trigger_node(browseName, nodeId) { @@ -1245,7 +1245,7 @@ function add_trigger_nodes(namespace, parentFolder) { function add_sampleView(namespace) { - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; namespace.addView({ organizedBy: addressSpace.rootFolder.views, browseName: "SampleView", diff --git a/packages/node-opcua-address-space/src/address_space.js b/packages/node-opcua-address-space/src/address_space.js index 80ef5eeb34..a1efa7c0bb 100644 --- a/packages/node-opcua-address-space/src/address_space.js +++ b/packages/node-opcua-address-space/src/address_space.js @@ -126,7 +126,7 @@ AddressSpace.prototype.getNamespace = function (namespaceIndexOrName) { AddressSpace.prototype.getDefaultNamespace= function() { return this.getNamespace(0); }; -AddressSpace.prototype.getPrivateNamespace= function() { +AddressSpace.prototype.getOwnNamespace= function() { const self = this; if (this._private_namespaceIndex>=self._namespaceArray.length){ @@ -149,12 +149,15 @@ AddressSpace.prototype.registerNamespace = function (namespaceUri) { const self = this; let index = this._namespaceArray.findIndex(ns=> ns.namespaceUri === namespaceUri); - if (index !== -1) { return self._namespaceArray[index]; } + if (index !== -1) { + assert(self._namespaceArray[index].addressSpace === self); + return self._namespaceArray[index]; + } index= self._namespaceArray.length; self._namespaceArray.push(new Namespace({ namespaceUri: namespaceUri, - addressSpace:self, + addressSpace: self, index: index, version: "undefined", publicationDate: new Date() @@ -639,7 +642,7 @@ AddressSpace.prototype._build_new_NodeId = function () { if (this._namespaceArray.length <= 1) { throw new Error("Please create a private namespace"); } - const privateNamespace = this.getPrivateNamespace(); + const privateNamespace = this.getOwnNamespace(); return privateNamespace._build_new_NodeId(); }; @@ -950,11 +953,11 @@ function _increase_version_number(node) { AddressSpace.prototype._resolveRequestedNamespace = function(options) { if (!options.nodeId) { - return this.getPrivateNamespace(); + return this.getOwnNamespace(); } if (typeof options.nodeId === "string"){ if (options.nodeId.match(/^(i|s|g|b)=/)) { - options.nodeId = this.getPrivateNamespace()._construct_nodeId(options); + options.nodeId = this.getOwnNamespace()._construct_nodeId(options); } } options.nodeId = resolveNodeId(options.nodeId); @@ -966,21 +969,21 @@ AddressSpace.prototype.addObject =function(options) { return this._resolveRequestedNamespace(options).addObject(options); }; -utils.setDeprecated(AddressSpace,"addObject","use addressSpace.getPrivateNamespace().addObject(..) instead"); +utils.setDeprecated(AddressSpace,"addObject","use addressSpace.getOwnNamespace().addObject(..) instead"); AddressSpace.prototype.addVariable =function(options) { return this._resolveRequestedNamespace(options).addVariable(options); }; -utils.setDeprecated(AddressSpace,"addVariable","use addressSpace.getPrivateNamespace().addVariable(..) instead"); +utils.setDeprecated(AddressSpace,"addVariable","use addressSpace.getOwnNamespace().addVariable(..) instead"); AddressSpace.prototype.addObjectType =function(options) { return this._resolveRequestedNamespace(options).addObjectType(options); }; -utils.setDeprecated(AddressSpace,"addObjectType","use addressSpace.getPrivateNamespace().addObjectType() instead"); +utils.setDeprecated(AddressSpace,"addObjectType","use addressSpace.getOwnNamespace().addObjectType() instead"); AddressSpace.prototype.addVariableType =function(options) { return this._resolveRequestedNamespace(options).addVariableType(options); }; -utils.setDeprecated(AddressSpace,"addVariableType","use addressSpace.getPrivateNamespace().addVariableType() instead"); +utils.setDeprecated(AddressSpace,"addVariableType","use addressSpace.getOwnNamespace().addVariableType() instead"); /** * @@ -993,9 +996,9 @@ utils.setDeprecated(AddressSpace,"addVariableType","use addressSpace.getPrivateN * @return {BaseNode} */ AddressSpace.prototype.addFolder = function (parentFolder, options) { - return this.getPrivateNamespace().addFolder(parentFolder, options); + return this.getOwnNamespace().addFolder(parentFolder, options); }; -utils.setDeprecated(AddressSpace,"addFolder","use addressSpace.getPrivateNamespace().addFolder(..) instead"); +utils.setDeprecated(AddressSpace,"addFolder","use addressSpace.getOwnNamespace().addFolder(..) instead"); /** diff --git a/packages/node-opcua-address-space/src/address_space_add_enumeration_type.js b/packages/node-opcua-address-space/src/address_space_add_enumeration_type.js index c6c0785ad5..aaf50401d9 100644 --- a/packages/node-opcua-address-space/src/address_space_add_enumeration_type.js +++ b/packages/node-opcua-address-space/src/address_space_add_enumeration_type.js @@ -103,7 +103,7 @@ exports.install = function (AddressSpace) { assert(_.isString(options.browseName)); assert(_.isArray(options.enumeration)); - const addressSpace = self.__addressSpace; + const addressSpace = self.addressSpace; let definition; const enumerationType = addressSpace.findDataType("Enumeration"); assert(enumerationType.nodeId instanceof NodeId); diff --git a/packages/node-opcua-address-space/src/address_space_add_event_type.js b/packages/node-opcua-address-space/src/address_space_add_event_type.js index a6b19b66a9..2cfa7669f4 100644 --- a/packages/node-opcua-address-space/src/address_space_add_event_type.js +++ b/packages/node-opcua-address-space/src/address_space_add_event_type.js @@ -158,7 +158,7 @@ exports.install = function (AddressSpace) { * */ AddressSpace.prototype.addEventType = function (options) { - console.log("AddressSpace#addEventType is deprecated. please use addressSpace.getPrivateNamespace().addEventType() instead"); + console.log("AddressSpace#addEventType is deprecated. please use addressSpace.getOwnNamespace().addEventType() instead"); return this._resolveRequestedNamespace(options).addEventType(options); }; diff --git a/packages/node-opcua-address-space/src/address_space_add_method.js b/packages/node-opcua-address-space/src/address_space_add_method.js index 4c0460021f..714a824999 100644 --- a/packages/node-opcua-address-space/src/address_space_add_method.js +++ b/packages/node-opcua-address-space/src/address_space_add_method.js @@ -28,7 +28,7 @@ exports.install = function (AddressSpace) { const self = this; - const addressSpace = self.__addressSpace; + const addressSpace = self.addressSpace; assert(isNonEmptyQualifiedName(options.browseName)); @@ -72,7 +72,7 @@ exports.install = function (AddressSpace) { Namespace.prototype.addMethod = function (parentObject, options) { const self = this; - const addressSpace = self.__addressSpace; + const addressSpace = self.addressSpace; assert(_.isObject(parentObject) && parentObject instanceof BaseNode,"expecting a valid parent object"); diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/acknowledgeable_condition.js b/packages/node-opcua-address-space/src/alarms_and_conditions/acknowledgeable_condition.js index f10647ce78..ee44c0cd44 100644 --- a/packages/node-opcua-address-space/src/alarms_and_conditions/acknowledgeable_condition.js +++ b/packages/node-opcua-address-space/src/alarms_and_conditions/acknowledgeable_condition.js @@ -327,7 +327,7 @@ UAAcknowledgeableConditionBase.instantiate = function instantiate(namespace,cond //xx assert(options.conditionOf,"must provide a conditionOf Node"); - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; const conditionNode = UAConditionBase.instantiate(namespace, conditionTypeId, options, data); Object.setPrototypeOf(conditionNode,UAAcknowledgeableConditionBase.prototype); diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/alarm_condition.js b/packages/node-opcua-address-space/src/alarms_and_conditions/alarm_condition.js index d47e261d5c..2db18eb4c1 100644 --- a/packages/node-opcua-address-space/src/alarms_and_conditions/alarm_condition.js +++ b/packages/node-opcua-address-space/src/alarms_and_conditions/alarm_condition.js @@ -710,7 +710,7 @@ exports.UAAlarmConditionBase = UAAlarmConditionBase; UAAlarmConditionBase.instantiate = function (namespace, alarmConditionTypeId, options, data) { assert(namespace instanceof Namespace); - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; //xx assert(options.hasOwnProperty("conditionOf")); // must provide a conditionOf assert(options.hasOwnProperty("inputNode")); // must provide a inputNode diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/condition.js b/packages/node-opcua-address-space/src/alarms_and_conditions/condition.js index 821042f6aa..f084c328e5 100644 --- a/packages/node-opcua-address-space/src/alarms_and_conditions/condition.js +++ b/packages/node-opcua-address-space/src/alarms_and_conditions/condition.js @@ -1722,7 +1722,7 @@ function _getCompositeKey(node, key) { UAConditionBase.instantiate = function(namespace, conditionTypeId, options, data) { /* eslint max-statements: ["error", 100] */ assert(namespace instanceof Namespace); - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; const conditionType = addressSpace.findEventType(conditionTypeId); diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/discrete_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/discrete_alarm.js index aaa946597c..08dd957947 100644 --- a/packages/node-opcua-address-space/src/alarms_and_conditions/discrete_alarm.js +++ b/packages/node-opcua-address-space/src/alarms_and_conditions/discrete_alarm.js @@ -58,7 +58,7 @@ util.inherits(UADiscreteAlarm, UAAlarmConditionBase); UADiscreteAlarm.instantiate = function(namespace, discreteAlarmTypeId, options, data) { assert(namespace instanceof Namespace); - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(addressSpace instanceof AddressSpace); const discreteAlarmType = addressSpace.findEventType(discreteAlarmTypeId); diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_deviation_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_deviation_alarm.js index b04e5b7884..7dfdd5142e 100644 --- a/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_deviation_alarm.js +++ b/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_deviation_alarm.js @@ -52,7 +52,7 @@ exports.UAExclusiveDeviationAlarm = UAExclusiveDeviationAlarm; UAExclusiveDeviationAlarm.instantiate = function(namespace, type,options,data ){ assert(namespace instanceof Namespace); - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(addressSpace instanceof AddressSpace); const exclusiveDeviationAlarmType = addressSpace.findEventType("ExclusiveDeviationAlarmType"); diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_level_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_level_alarm.js index fe38f44c5f..dbcc1b6130 100644 --- a/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_level_alarm.js +++ b/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_level_alarm.js @@ -22,7 +22,7 @@ exports.UAExclusiveLevelAlarm =UAExclusiveLevelAlarm; UAExclusiveLevelAlarm.instantiate = function(namespace,type,option,data) { assert(namespace instanceof Namespace); - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(addressSpace instanceof AddressSpace); return UAExclusiveLimitAlarm.instantiate(namespace, type, option, data); diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_limit_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_limit_alarm.js index d756fe8c37..4f5d486f99 100644 --- a/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_limit_alarm.js +++ b/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_limit_alarm.js @@ -101,7 +101,7 @@ exports.UAExclusiveLimitAlarm = UAExclusiveLimitAlarm; UAExclusiveLimitAlarm.instantiate = function (namespace, type, options, data) { assert(namespace instanceof Namespace); - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(addressSpace instanceof AddressSpace); //xx assert(options.conditionOf,"must provide a conditionOf Node"); diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/limit_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/limit_alarm.js index a75a1c755f..3144594287 100644 --- a/packages/node-opcua-address-space/src/alarms_and_conditions/limit_alarm.js +++ b/packages/node-opcua-address-space/src/alarms_and_conditions/limit_alarm.js @@ -163,7 +163,7 @@ exports.UALimitAlarm = UALimitAlarm; */ UALimitAlarm.instantiate = function (namespace, limitAlarmTypeId, options, data) { assert(namespace instanceof Namespace); - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(addressSpace instanceof AddressSpace); /* eslint max-instructions: off */ diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/non_exclusive_deviation_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/non_exclusive_deviation_alarm.js index 666e2f4ff7..688da75ebc 100644 --- a/packages/node-opcua-address-space/src/alarms_and_conditions/non_exclusive_deviation_alarm.js +++ b/packages/node-opcua-address-space/src/alarms_and_conditions/non_exclusive_deviation_alarm.js @@ -60,7 +60,7 @@ UANonExclusiveDeviationAlarm.instantiate = function(namespace, type,options,data assert(namespace instanceof Namespace); - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(addressSpace instanceof AddressSpace); const nonExclusiveDeviationAlarmType = addressSpace.findEventType("NonExclusiveDeviationAlarmType"); diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/non_exclusive_limit_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/non_exclusive_limit_alarm.js index 15c28c0c13..f04ba2d015 100644 --- a/packages/node-opcua-address-space/src/alarms_and_conditions/non_exclusive_limit_alarm.js +++ b/packages/node-opcua-address-space/src/alarms_and_conditions/non_exclusive_limit_alarm.js @@ -151,7 +151,7 @@ exports.UANonExclusiveLimitAlarm = UANonExclusiveLimitAlarm; UANonExclusiveLimitAlarm.instantiate = function (namespace, type, options, data) { assert(namespace instanceof Namespace); - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(addressSpace instanceof AddressSpace); options.optionals = options.optionals || []; diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/off_normal_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/off_normal_alarm.js index dccefa2df5..07dbac391e 100644 --- a/packages/node-opcua-address-space/src/alarms_and_conditions/off_normal_alarm.js +++ b/packages/node-opcua-address-space/src/alarms_and_conditions/off_normal_alarm.js @@ -145,7 +145,7 @@ UAOffNormalAlarm.prototype._onNormalStateDataValueChange = function (dataValue) UAOffNormalAlarm.instantiate = function (namespace, limitAlarmTypeId, options, data) { assert(namespace instanceof Namespace); - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(addressSpace instanceof AddressSpace); const offNormalAlarmType = addressSpace.findEventType("OffNormalAlarmType"); diff --git a/packages/node-opcua-address-space/src/base_node.js b/packages/node-opcua-address-space/src/base_node.js index df6c316a51..dcdc9e185f 100644 --- a/packages/node-opcua-address-space/src/base_node.js +++ b/packages/node-opcua-address-space/src/base_node.js @@ -115,7 +115,7 @@ function BaseNode(options) { this.browseName = _get_QualifiedBrowseName(options.browseName); // re-use browseName as displayName if displayName is missing - options.displayName = options.displayName || options.browseName.toString(); + options.displayName = options.displayName || options.browseName.name.toString(); this._setDisplayName(options.displayName); @@ -1311,12 +1311,15 @@ BaseNode.prototype.full_name = function () { return this.browseName.toString(); }; +BaseNode.prototype.ownReferences = function () { + const self = this; + const _private = BaseNode_getPrivate(self); + return _.map(_private._referenceIdx); +}; BaseNode.prototype.allReferences = function () { - const self = this; const _private = BaseNode_getPrivate(self); return [].concat(_.map(_private._referenceIdx), _.map(_private._back_referenceIdx)); - }; @@ -1968,7 +1971,7 @@ BaseNode.prototype._clone = function (Constructor, options, optionalFilter, extr Namespace._process_modelling_rule(options.references, options.modellingRule); } - options.nodeId = self.addressSpace.getPrivateNamespace()._construct_nodeId(options); + options.nodeId = self.addressSpace.getOwnNamespace()._construct_nodeId(options); assert(options.nodeId instanceof NodeId); diff --git a/packages/node-opcua-address-space/src/data_access/address_space_add_AnalogItem.js b/packages/node-opcua-address-space/src/data_access/address_space_add_AnalogItem.js index b3c527db0b..e768e621b1 100644 --- a/packages/node-opcua-address-space/src/data_access/address_space_add_AnalogItem.js +++ b/packages/node-opcua-address-space/src/data_access/address_space_add_AnalogItem.js @@ -35,7 +35,7 @@ exports.install = function (AddressSpace) { Namespace.prototype.addDataItem = function(options) { const namespace = this; - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(addressSpace instanceof AddressSpace); const dataType = options.dataType || "Number"; @@ -107,7 +107,7 @@ exports.install = function (AddressSpace) { Namespace.prototype.addAnalogDataItem = function (options) { const namespace = this; - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(options.hasOwnProperty("engineeringUnitsRange"), "expecting engineeringUnitsRange"); diff --git a/packages/node-opcua-address-space/src/data_access/address_space_add_MultiStateDiscrete.js b/packages/node-opcua-address-space/src/data_access/address_space_add_MultiStateDiscrete.js index f0288c55fc..35554320a2 100644 --- a/packages/node-opcua-address-space/src/data_access/address_space_add_MultiStateDiscrete.js +++ b/packages/node-opcua-address-space/src/data_access/address_space_add_MultiStateDiscrete.js @@ -77,7 +77,7 @@ module.exports.install = function(AddressSpace) { Namespace.prototype.addMultiStateDiscrete = function(options) { const namespace = this; - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(addressSpace instanceof AddressSpace); assert(options.hasOwnProperty("enumStrings")); assert(!options.hasOwnProperty("ValuePrecision")); diff --git a/packages/node-opcua-address-space/src/data_access/address_space_add_MultiStateValueDiscrete.js b/packages/node-opcua-address-space/src/data_access/address_space_add_MultiStateValueDiscrete.js index b00f5d44bf..8d251a8e67 100644 --- a/packages/node-opcua-address-space/src/data_access/address_space_add_MultiStateValueDiscrete.js +++ b/packages/node-opcua-address-space/src/data_access/address_space_add_MultiStateValueDiscrete.js @@ -94,7 +94,7 @@ module.exports.install = function (AddressSpace) { assert(!options.hasOwnProperty("ValuePrecision")); const namespace = this; - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; const multiStateValueDiscreteType = addressSpace.findVariableType("MultiStateValueDiscreteType"); assert(multiStateValueDiscreteType, "expecting MultiStateValueDiscreteType to be defined , check nodeset xml file"); diff --git a/packages/node-opcua-address-space/src/data_access/address_space_add_TwoStateDiscrete.js b/packages/node-opcua-address-space/src/data_access/address_space_add_TwoStateDiscrete.js index 2eaf8cb3de..88645849f4 100644 --- a/packages/node-opcua-address-space/src/data_access/address_space_add_TwoStateDiscrete.js +++ b/packages/node-opcua-address-space/src/data_access/address_space_add_TwoStateDiscrete.js @@ -26,7 +26,7 @@ module.exports.install = function (AddressSpace) { Namespace.prototype.addTwoStateDiscrete = function (options) { const namespace = this; - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(!options.hasOwnProperty("ValuePrecision")); diff --git a/packages/node-opcua-address-space/src/data_access/address_space_add_YArrayItem.js b/packages/node-opcua-address-space/src/data_access/address_space_add_YArrayItem.js index 17107c375b..f6cedd5135 100644 --- a/packages/node-opcua-address-space/src/data_access/address_space_add_YArrayItem.js +++ b/packages/node-opcua-address-space/src/data_access/address_space_add_YArrayItem.js @@ -64,7 +64,7 @@ module.exports.install = function(AddressSpace) { assert(options.hasOwnProperty("axisScaleType"), "expecting axisScaleType"); assert(_.isObject(options.xAxisDefinition), "expecting a xAxisDefinition"); - const addressSpace = this.__addressSpace; + const addressSpace = this.addressSpace; const YArrayItemType = addressSpace.findVariableType("YArrayItemType"); assert(YArrayItemType, "expecting YArrayItemType to be defined , check nodeset xml file"); diff --git a/packages/node-opcua-address-space/src/loader/load_nodeset2.js b/packages/node-opcua-address-space/src/loader/load_nodeset2.js index 1359f07b6c..552233af14 100644 --- a/packages/node-opcua-address-space/src/loader/load_nodeset2.js +++ b/packages/node-opcua-address-space/src/loader/load_nodeset2.js @@ -493,6 +493,26 @@ function generate_address_space(addressSpace, xmlFiles, callback) { } }; + const Range_parser = { + "Range": { + init: function() { + this.range ={}; + }, + parser: { + "Low": { + finish: function () { + this.parent.range.low = parseFloat(this.text); + } + }, + "High": { + finish: function () { + this.parent.range.high = parseFloat(this.text); + } + } + } + } + }; + const EUInformation_parser = { "EUInformation": { init: function () { @@ -538,11 +558,17 @@ function generate_address_space(addressSpace, xmlFiles, callback) { switch (typeId) { case "i=297": // Argument + case "ns=0;i=297": // Argument break; + case "ns=0;i=7616": // EnumValueType case "i=7616": // EnumValueType break; + case "ns=0;i=888": // EnumValueType case "i=888": // EUInformation break; + case "ns=0;i=885": // Range + case "i=885": // Range + break; default: console.warn("loadnodeset2 ( checking identifier type) : unsupported typeId in ExtensionObject " + typeId); break; @@ -555,7 +581,8 @@ function generate_address_space(addressSpace, xmlFiles, callback) { parser: { "Argument": argument_parser.Argument, "EnumValueType": enumValueType_parser.EnumValueType, - "EUInformation": EUInformation_parser.EUInformation + "EUInformation": EUInformation_parser.EUInformation, + "Range": Range_parser.Range }, finish: function () { const self = this.parent; @@ -573,8 +600,12 @@ function generate_address_space(addressSpace, xmlFiles, callback) { self.extensionObject = self.parser.Body.parser.EUInformation.euInformation; assert(_.isObject(self.extensionObject)); break; + case "i=885": // Range + case "ns=0;i=885": + self.extensionObject = self.parser.Body.parser.Range.range; + assert(_.isObject(self.extensionObject)); + break; default: - // to do: implement a post action to create and bind extension object console.log("loadnodeset2: unsupported typeId in ExtensionObject " + self.typeId.toString()); break; diff --git a/packages/node-opcua-address-space/src/namespace.js b/packages/node-opcua-address-space/src/namespace.js index 8e163881ca..86d7f5849a 100644 --- a/packages/node-opcua-address-space/src/namespace.js +++ b/packages/node-opcua-address-space/src/namespace.js @@ -44,8 +44,9 @@ function UANamespace(options) { assert(typeof options.namespaceUri === "string"); assert(options.addressSpace.constructor.name === "AddressSpace"); assert(typeof options.index === "number"); + self.namespaceUri = options.namespaceUri; - self.__addressSpace = options.addressSpace; + self.addressSpace = options.addressSpace; self.index = options.index; self._nodeid_index = {}; self._internal_id_counter = 1000; @@ -59,7 +60,7 @@ function UANamespace(options) { } UANamespace.prototype.getDefaultNamespace = function () { - return (this.index === 0) ? this : this.__addressSpace.getDefaultNamespace(); + return (this.index === 0) ? this : this.addressSpace.getDefaultNamespace(); }; UANamespace.prototype.dispose = function () { @@ -69,7 +70,7 @@ UANamespace.prototype.dispose = function () { node.dispose(); }); self._nodeid_index = null; - self.__addressSpace = null; + self.addressSpace = null; self._aliases = null; @@ -104,7 +105,7 @@ UANamespace.prototype.findNode = function (nodeId) { function _adjust_options(self, options) { - const ns = self.__addressSpace.getNamespaceIndex(self.namespaceUri); + const ns = self.addressSpace.getNamespaceIndex(self.namespaceUri); if (!options.nodeId) { const id = self._getNextAvailableId(); options.nodeId = new NodeId(NodeId.NodeIdType.NUMERIC, id, ns); @@ -327,7 +328,7 @@ const regExp1 = /^(s|i|b|g)=/; UANamespace.prototype._construct_nodeId = function (options) { const self = this; - const addressSpace = self.__addressSpace; + const addressSpace = self.addressSpace; let nodeId = options.nodeId; if (!nodeId) { @@ -406,7 +407,7 @@ UANamespace.prototype._createNode = function (options) { throw new Error(" missing constructor for NodeClass " + options.nodeClass.key); } - options.addressSpace = this.__addressSpace; + options.addressSpace = self.addressSpace; const node = new Constructor(options); assert(node.nodeId); @@ -429,7 +430,7 @@ UANamespace.prototype._addVariable = function (options) { const self = this; - const addressSpace = self.__addressSpace; + const addressSpace = self.addressSpace; const baseDataVariableTypeId = addressSpace.findVariableType("BaseDataVariableType").nodeId; assert(options.hasOwnProperty("browseName"), "options.browseName must be provided"); @@ -508,7 +509,7 @@ UANamespace.prototype.addVariable = function (options) { UANamespace.prototype._addObjectOrVariableType = function (options, topMostBaseType, nodeClass) { const self = this; - const addressSpace = self.__addressSpace; + const addressSpace = self.addressSpace; assert(typeof topMostBaseType === "string"); assert(nodeClass === NodeClass.ObjectType || nodeClass === NodeClass.VariableType); @@ -599,7 +600,7 @@ UANamespace.prototype.addVariableType = function (options) { // dataType options.dataType = options.dataType || "Int32"; - options.dataType = self.__addressSpace._coerce_DataType(options.dataType); + options.dataType = self.addressSpace._coerce_DataType(options.dataType); // valueRank options.valueRank = utils.isNullOrUndefined(options.valueRank) ? -1 : options.valueRank; @@ -630,7 +631,7 @@ UANamespace.prototype.addView = function (options) { const browseName = options.browseName; assert(typeof browseName === "string"); - const addressSpace = self.__addressSpace; + const addressSpace = self.addressSpace; const baseDataVariableTypeId = addressSpace.findVariableType("BaseDataVariableType").nodeId; // ------------------------------------------ TypeDefinition @@ -684,7 +685,7 @@ UANamespace.prototype.addFolder = function (parentFolder, options) { options = {browseName: options}; } - const addressSpace = self.__addressSpace; + const addressSpace = self.addressSpace; assert(!options.typeDefinition, "addFolder does not expect typeDefinition to be defined "); const typeDefinition = addressSpace._coerceTypeDefinition("FolderType"); @@ -708,7 +709,7 @@ UANamespace.prototype.addFolder = function (parentFolder, options) { UANamespace.prototype.addReferenceType = function (options) { const namespace = this; - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; options.nodeClass = NodeClass.ReferenceType; options.references = options.references || []; @@ -752,7 +753,7 @@ UANamespace.prototype.createDataType = function (options) { if (options.references.length === 0) { assert(options.hasOwnProperty("superType"), "must provide a superType"); - options.superType = this.__addressSpace.findDataType(options.superType); + options.superType = this.addressSpace.findDataType(options.superType); assert(options.superType); options.references.push({ referenceType: "HasSubtype", isForward: false, nodeId: options.superType.nodeId @@ -868,7 +869,7 @@ function _handle_node_version(node, options) { if (options.nodeVersion) { assert(node.nodeClass === NodeClass.Variable || node.nodeClass === NodeClass.Object); - const nodeVersion = node.addressSpace.getPrivateNamespace().addVariable({ + const nodeVersion = node.addressSpace.getOwnNamespace().addVariable({ propertyOf: node, browseName: "NodeVersion", dataType: "String" @@ -918,7 +919,7 @@ UANamespace.prototype.createNode = function (options) { const self = this; let node = null; - const addressSpace = self.__addressSpace; + const addressSpace = self.addressSpace; addressSpace.modelChangeTransaction(function () { @@ -982,7 +983,7 @@ UANamespace.prototype.deleteNode = function (nodeOrNodeId) { throw new Error("this node doesn't belong to this namespace"); } - const addressSpace = self.__addressSpace; + const addressSpace = self.addressSpace; addressSpace.modelChangeTransaction(function () { diff --git a/packages/node-opcua-address-space/src/state_machine/address_space_state_machine.js b/packages/node-opcua-address-space/src/state_machine/address_space_state_machine.js index 93fcd4c947..336720663f 100644 --- a/packages/node-opcua-address-space/src/state_machine/address_space_state_machine.js +++ b/packages/node-opcua-address-space/src/state_machine/address_space_state_machine.js @@ -25,13 +25,13 @@ exports.install = function (AddressSpace) { * @return {UAObject} {StateType|InitialStateType} */ AddressSpace.prototype.addState = function (component, stateName, stateNumber, isInitialState) { - return this.getPrivateNamespace().addState(component, stateName, stateNumber, isInitialState); + return this.getOwnNamespace().addState(component, stateName, stateNumber, isInitialState); }; Namespace.prototype.addState = function (component, stateName, stateNumber, isInitialState) { const namespace = this; - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; isInitialState = !!isInitialState; @@ -72,13 +72,13 @@ exports.install = function (AddressSpace) { * @return {UAObject} TransitionType */ AddressSpace.prototype.addTransition = function (component, fromState, toState, transitionNumber) { - this.getPrivateNamespace().addTransition(component, fromState, toState, transitionNumber); + this.getOwnNamespace().addTransition(component, fromState, toState, transitionNumber); }; Namespace.prototype.addTransition = function (component, fromState, toState, transitionNumber) { const namespace = this; - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; assert(component instanceof UAObjectType); assert(_.isString(fromState)); diff --git a/packages/node-opcua-address-space/src/ua_object_type.js b/packages/node-opcua-address-space/src/ua_object_type.js index f94e523e38..110e749f8d 100644 --- a/packages/node-opcua-address-space/src/ua_object_type.js +++ b/packages/node-opcua-address-space/src/ua_object_type.js @@ -116,7 +116,7 @@ UAObjectType.prototype.instantiate = function (options) { modellingRule : options.modellingRule }; - const namespace = self.addressSpace.getPrivateNamespace(); + const namespace = self.addressSpace.getOwnNamespace(); const instance = namespace.addObject(opts); diff --git a/packages/node-opcua-address-space/src/ua_two_state_variable.js b/packages/node-opcua-address-space/src/ua_two_state_variable.js index b1379dd05c..03240316fc 100644 --- a/packages/node-opcua-address-space/src/ua_two_state_variable.js +++ b/packages/node-opcua-address-space/src/ua_two_state_variable.js @@ -339,7 +339,7 @@ exports.install = function (AddressSpace) { const namespace = this; assert(options.browseName," a browseName is required"); - const addressSpace = namespace.__addressSpace; + const addressSpace = namespace.addressSpace; const twoStateVariableType = addressSpace.findVariableType("TwoStateVariableType"); diff --git a/packages/node-opcua-address-space/src/ua_variable_type.js b/packages/node-opcua-address-space/src/ua_variable_type.js index 35edb57432..548553ea80 100644 --- a/packages/node-opcua-address-space/src/ua_variable_type.js +++ b/packages/node-opcua-address-space/src/ua_variable_type.js @@ -658,7 +658,7 @@ UAVariableType.prototype.instantiate = function (options) { minimumSamplingInterval: options.minimumSamplingInterval }; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const instance = namespace.addVariable(opts); //xx assert(instance.minimumSamplingInterval === options.minimumSamplingInterval); diff --git a/packages/node-opcua-address-space/test/alarms_and_conditions/test_alarms_and_conditions.js b/packages/node-opcua-address-space/test/alarms_and_conditions/test_alarms_and_conditions.js index ed6f8c86c8..474dc7c73a 100644 --- a/packages/node-opcua-address-space/test/alarms_and_conditions/test_alarms_and_conditions.js +++ b/packages/node-opcua-address-space/test/alarms_and_conditions/test_alarms_and_conditions.js @@ -32,7 +32,7 @@ describe("AddressSpace : Conditions ", function () { const FolderTypeId = addressSpace.findNode("FolderType").nodeId; const BaseDataVariableTypeId = addressSpace.findNode("BaseDataVariableType").nodeId; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); addressSpace.installAlarmsAndConditionsService(); diff --git a/packages/node-opcua-address-space/test/alarms_and_conditions/utest_acknowledgeable_condition.js b/packages/node-opcua-address-space/test/alarms_and_conditions/utest_acknowledgeable_condition.js index 69f185ec5f..713f632163 100644 --- a/packages/node-opcua-address-space/test/alarms_and_conditions/utest_acknowledgeable_condition.js +++ b/packages/node-opcua-address-space/test/alarms_and_conditions/utest_acknowledgeable_condition.js @@ -41,7 +41,7 @@ module.exports = function (test) { it("should instantiate AcknowledgeableConditionType (variation 2)", function (done) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition("AcknowledgeableConditionType", { componentOf: source, diff --git a/packages/node-opcua-address-space/test/alarms_and_conditions/utest_condition.js b/packages/node-opcua-address-space/test/alarms_and_conditions/utest_condition.js index db6c502ae6..3183e46888 100644 --- a/packages/node-opcua-address-space/test/alarms_and_conditions/utest_condition.js +++ b/packages/node-opcua-address-space/test/alarms_and_conditions/utest_condition.js @@ -50,7 +50,7 @@ module.exports = function (test) { let myCustomConditionType; before(function (done) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const conditionType = addressSpace.findEventType("ConditionType"); // create a custom conditionType @@ -64,7 +64,7 @@ module.exports = function (test) { it("should instantiate a custom ConditionType", function () { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { organizedBy: addressSpace.rootFolder.objects, conditionSource: null, @@ -77,7 +77,7 @@ module.exports = function (test) { it("should be possible to enable and disable a condition using the enable & disable methods ( as a client would do)", function (done) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { browseName: "MyCustomCondition2", conditionSource: null, @@ -164,7 +164,7 @@ module.exports = function (test) { describe("Testing Branches ",function() { let condition; before(function() { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); condition = namespace.instantiateCondition(myCustomConditionType, { browseName: "MyCustomCondition2B", @@ -254,7 +254,7 @@ module.exports = function (test) { // return a status of Bad_ConditionDisabled. The Event that reports the Disabled state // should report the properties as NULL or with a status of Bad_ConditionDisabled. - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { browseName: "MyCustomCondition2", @@ -362,7 +362,7 @@ module.exports = function (test) { it("should be possible to activate the EnabledState.TransitionTime optional property", function (done) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { organizedBy: addressSpace.rootFolder.objects, @@ -384,7 +384,7 @@ module.exports = function (test) { it("should be possible to activate the EnabledState.EffectiveTransitionTime optional property", function (done) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { organizedBy: addressSpace.rootFolder.objects, @@ -407,7 +407,7 @@ module.exports = function (test) { it("should be possible to activate the EnabledState.EffectiveDisplayName optional property", function (done) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { organizedBy: addressSpace.rootFolder.objects, @@ -435,7 +435,7 @@ module.exports = function (test) { it("should be possible to set the comment of a condition using the addComment method of the condition instance", function (done) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { organizedBy: addressSpace.rootFolder.objects, conditionSource: null, @@ -466,7 +466,7 @@ module.exports = function (test) { }); it("should be possible to set the comment of a condition using the addComment method of the conditionType", function (done) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { organizedBy: addressSpace.rootFolder.objects, @@ -499,7 +499,7 @@ module.exports = function (test) { }); it("should install the conditionSource in SourceNode and SourceName", function () { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { organizedBy: addressSpace.rootFolder.objects, @@ -516,7 +516,7 @@ module.exports = function (test) { }); it("initial value of lastSeverity should be zero", function () { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { organizedBy: addressSpace.rootFolder.objects, browseName: "MyCustomCondition_last_severity_initial_value", @@ -531,7 +531,7 @@ module.exports = function (test) { it("setting severity should record lastSeverity", function () { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { organizedBy: addressSpace.rootFolder.objects, browseName: "MyCustomCondition_last_severity_recorded", @@ -552,7 +552,7 @@ module.exports = function (test) { it("should produce eventData ",function() { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { organizedBy: addressSpace.rootFolder.objects, browseName: "MyCustomCondition_last_severity_recorded", @@ -611,7 +611,7 @@ module.exports = function (test) { it("should raise a new condition ", function () { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { organizedBy: addressSpace.rootFolder.objects, browseName: "MyCustomCondition3", @@ -696,7 +696,7 @@ module.exports = function (test) { it("should be possible to create several branches of a condition state", function () { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { organizedBy: addressSpace.rootFolder.objects, browseName: "MyCustomCondition_branch", @@ -734,7 +734,7 @@ module.exports = function (test) { it("should be possible to refresh a condition", function () { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const condition = namespace.instantiateCondition(myCustomConditionType, { organizedBy: addressSpace.rootFolder.objects, browseName: "MyCustomCondition_to_test_condition_refresh", diff --git a/packages/node-opcua-address-space/test/alarms_and_conditions/utest_off_normal_alarm.js b/packages/node-opcua-address-space/test/alarms_and_conditions/utest_off_normal_alarm.js index 250ea4ead7..feda8b0526 100644 --- a/packages/node-opcua-address-space/test/alarms_and_conditions/utest_off_normal_alarm.js +++ b/packages/node-opcua-address-space/test/alarms_and_conditions/utest_off_normal_alarm.js @@ -15,7 +15,7 @@ module.exports = function (test) { before(function () { addressSpace = test.addressSpace; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); source = test.source; engine = test.engine; diff --git a/packages/node-opcua-address-space/test/data_access/subtest_Y_array_item_type.js b/packages/node-opcua-address-space/test/data_access/subtest_Y_array_item_type.js index 83d992efd9..0386ce2b87 100644 --- a/packages/node-opcua-address-space/test/data_access/subtest_Y_array_item_type.js +++ b/packages/node-opcua-address-space/test/data_access/subtest_Y_array_item_type.js @@ -19,7 +19,7 @@ module.exports = function(maintest) { let addressSpace,namespace; before(function() { addressSpace = maintest.addressSpace; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); should(addressSpace).be.instanceof(AddressSpace); }); diff --git a/packages/node-opcua-address-space/test/data_access/subtest_analog_item_semantic_changed.js b/packages/node-opcua-address-space/test/data_access/subtest_analog_item_semantic_changed.js index db02b2b805..e4a2a7c79a 100644 --- a/packages/node-opcua-address-space/test/data_access/subtest_analog_item_semantic_changed.js +++ b/packages/node-opcua-address-space/test/data_access/subtest_analog_item_semantic_changed.js @@ -34,7 +34,7 @@ module.exports = function (maintest) { const fakeValue = 1; - analogItem = addressSpace.getPrivateNamespace().addAnalogDataItem({ + analogItem = addressSpace.getOwnNamespace().addAnalogDataItem({ organizedBy: objectsFolder, diff --git a/packages/node-opcua-address-space/test/data_access/subtest_analog_item_type.js b/packages/node-opcua-address-space/test/data_access/subtest_analog_item_type.js index 81269b5e39..16b1af594d 100644 --- a/packages/node-opcua-address-space/test/data_access/subtest_analog_item_type.js +++ b/packages/node-opcua-address-space/test/data_access/subtest_analog_item_type.js @@ -27,7 +27,7 @@ module.exports = function (maintest) { let addressSpace,namespace; before(function() { addressSpace = maintest.addressSpace; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); should(addressSpace).be.instanceof(AddressSpace); }); diff --git a/packages/node-opcua-address-space/test/data_access/subtest_data_item_PercentDeadband.js b/packages/node-opcua-address-space/test/data_access/subtest_data_item_PercentDeadband.js index 3f27ab2521..93d1110f39 100644 --- a/packages/node-opcua-address-space/test/data_access/subtest_data_item_PercentDeadband.js +++ b/packages/node-opcua-address-space/test/data_access/subtest_data_item_PercentDeadband.js @@ -21,7 +21,7 @@ module.exports = function (maintest) { let addressSpace,namespace; before(function() { addressSpace = maintest.addressSpace; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); should(addressSpace).be.instanceof(AddressSpace); }); diff --git a/packages/node-opcua-address-space/test/data_access/subtest_multi_state_discrete_type.js b/packages/node-opcua-address-space/test/data_access/subtest_multi_state_discrete_type.js index ec6aeeae3a..6f8c4fe293 100644 --- a/packages/node-opcua-address-space/test/data_access/subtest_multi_state_discrete_type.js +++ b/packages/node-opcua-address-space/test/data_access/subtest_multi_state_discrete_type.js @@ -31,7 +31,7 @@ module.exports = function(maintest) { it("should add a MultiStateDiscreteType variable",function() { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const objectsFolder = addressSpace.findNode("ObjectsFolder"); objectsFolder.browseName.toString().should.eql("Objects"); @@ -59,7 +59,7 @@ module.exports = function(maintest) { let multiState; before(function() { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const objectsFolder = addressSpace.findNode("ObjectsFolder"); objectsFolder.browseName.toString().should.eql("Objects"); diff --git a/packages/node-opcua-address-space/test/data_access/subtest_multi_state_value_discrete_type.js b/packages/node-opcua-address-space/test/data_access/subtest_multi_state_value_discrete_type.js index ff14a52dfd..9ed3ab915c 100644 --- a/packages/node-opcua-address-space/test/data_access/subtest_multi_state_value_discrete_type.js +++ b/packages/node-opcua-address-space/test/data_access/subtest_multi_state_value_discrete_type.js @@ -20,7 +20,7 @@ module.exports = function(maintest) { let addressSpace, namespace; before(function() { addressSpace = maintest.addressSpace; - namespace =addressSpace.getPrivateNamespace(); + namespace =addressSpace.getOwnNamespace(); should(addressSpace).be.instanceof(AddressSpace); }); @@ -141,7 +141,7 @@ module.exports = function(maintest) { it("ZZ2 should instantiate a DataType containing a MultiStateValueDiscreteType",function(done) { - const namespace= addressSpace.getPrivateNamespace(); + const namespace= addressSpace.getOwnNamespace(); // create a new DataType const myObjectType = namespace.addObjectType({ browseName: "MyObjectWithMultiStateValueDiscreteType" diff --git a/packages/node-opcua-address-space/test/data_access/subtest_two_state_discrete_type.js b/packages/node-opcua-address-space/test/data_access/subtest_two_state_discrete_type.js index 3f6ed1357e..6ba1024966 100644 --- a/packages/node-opcua-address-space/test/data_access/subtest_two_state_discrete_type.js +++ b/packages/node-opcua-address-space/test/data_access/subtest_two_state_discrete_type.js @@ -15,7 +15,7 @@ module.exports = function(maintest) { it("should add a TwoStateDiscreteType variable",function() { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const objectsFolder = addressSpace.findNode("ObjectsFolder"); objectsFolder.browseName.toString().should.eql("Objects"); diff --git a/packages/node-opcua-address-space/test/finite_state_machine/test_finite_state_machine.js b/packages/node-opcua-address-space/test/finite_state_machine/test_finite_state_machine.js index 5c05a24a7b..8f25f1aeb1 100644 --- a/packages/node-opcua-address-space/test/finite_state_machine/test_finite_state_machine.js +++ b/packages/node-opcua-address-space/test/finite_state_machine/test_finite_state_machine.js @@ -233,7 +233,7 @@ describe("Testing Finite State Machine", function () { */ - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const myFiniteStateMachine = namespace.addObjectType({ browseName: "MyFiniteStateMachine", diff --git a/packages/node-opcua-address-space/test/fixture_camera_type.js b/packages/node-opcua-address-space/test/fixture_camera_type.js index 0441d770f6..e0b2a64327 100644 --- a/packages/node-opcua-address-space/test/fixture_camera_type.js +++ b/packages/node-opcua-address-space/test/fixture_camera_type.js @@ -8,7 +8,7 @@ const QualifiedName = require("node-opcua-data-model").QualifiedName; exports.createCameraType = function createCameraType(addressSpace) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); let cameraType = namespace.findObjectType("1:CameraType"); if (cameraType) { return cameraType; } diff --git a/packages/node-opcua-address-space/test/fixture_temperature_sensor_type.js b/packages/node-opcua-address-space/test/fixture_temperature_sensor_type.js index 0527605ad5..6347d6b595 100644 --- a/packages/node-opcua-address-space/test/fixture_temperature_sensor_type.js +++ b/packages/node-opcua-address-space/test/fixture_temperature_sensor_type.js @@ -8,7 +8,7 @@ const Variant = require("node-opcua-variant").Variant; function createTemperatureSensorType(addressSpace) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); // TemperatureSensorType const temperatureSensorTypeNode = namespace.addObjectType({browseName: "TemperatureSensorType"}); diff --git a/packages/node-opcua-address-space/test/historical_access/test_address_space_historical_data_node.js b/packages/node-opcua-address-space/test/historical_access/test_address_space_historical_data_node.js index 4ecfd0bf54..cb863be765 100644 --- a/packages/node-opcua-address-space/test/historical_access/test_address_space_historical_data_node.js +++ b/packages/node-opcua-address-space/test/historical_access/test_address_space_historical_data_node.js @@ -51,7 +51,7 @@ describe("Testing Historical Data Node", function () { it("should create a 'HA Configuration' node", function () { - const node = addressSpace.getPrivateNamespace().addVariable({ + const node = addressSpace.getOwnNamespace().addVariable({ browseName: "MyVar", dataType: "Double", componentOf: addressSpace.rootFolder.objects.server.vendorServerInfo @@ -69,7 +69,7 @@ describe("Testing Historical Data Node", function () { it("should keep values in memory to provide historical reads", function (done) { - const node = addressSpace.getPrivateNamespace().addVariable({ + const node = addressSpace.getOwnNamespace().addVariable({ browseName: "MyVar", dataType: "Double", componentOf: addressSpace.rootFolder.objects.server.vendorServerInfo @@ -125,7 +125,7 @@ describe("Testing Historical Data Node", function () { it("should keep values up to options.maxOnlineValues to provide historical reads", function (done) { - const node = addressSpace.getPrivateNamespace().addVariable({ + const node = addressSpace.getOwnNamespace().addVariable({ browseName: "MyVar", dataType: "Double", componentOf: addressSpace.rootFolder.objects.server.vendorServerInfo @@ -259,7 +259,7 @@ describe("Testing Historical Data Node", function () { }); it("should store initial dataValue when historical stuff is set", function (done) { - const node = addressSpace.getPrivateNamespace().addVariable({ + const node = addressSpace.getOwnNamespace().addVariable({ browseName: "MyVar42", dataType: "Double", componentOf: addressSpace.rootFolder.objects.server.vendorServerInfo @@ -320,7 +320,7 @@ describe("Testing Historical Data Node", function () { // unseting the historizing flag shall suspend value being collected - const node = addressSpace.getPrivateNamespace().addVariable({ + const node = addressSpace.getOwnNamespace().addVariable({ browseName: "MyVar", dataType: "Double", componentOf: addressSpace.rootFolder.objects.server.vendorServerInfo diff --git a/packages/node-opcua-address-space/test/test_accessLevel_userAccessLevel_pullrequest.js b/packages/node-opcua-address-space/test/test_accessLevel_userAccessLevel_pullrequest.js index d585a808b2..eae7f1e6c5 100644 --- a/packages/node-opcua-address-space/test/test_accessLevel_userAccessLevel_pullrequest.js +++ b/packages/node-opcua-address-space/test/test_accessLevel_userAccessLevel_pullrequest.js @@ -13,7 +13,7 @@ describe("testing Variables ", function () { beforeEach(function(done){ get_mini_address_space(function (err, __addressSpace__) { addressSpace = __addressSpace__; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); done(err); }); }); diff --git a/packages/node-opcua-address-space/test/test_address_space.js b/packages/node-opcua-address-space/test/test_address_space.js index f70f031018..a042d94150 100644 --- a/packages/node-opcua-address-space/test/test_address_space.js +++ b/packages/node-opcua-address-space/test/test_address_space.js @@ -24,7 +24,7 @@ describe("testing address space", function () { addressSpace.getNamespaceArray().length.should.eql(2); - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); namespace.index.should.eql(1); rootFolder = addressSpace.findNode("RootFolder"); diff --git a/packages/node-opcua-address-space/test/test_address_space_add_enumeration_type.js b/packages/node-opcua-address-space/test/test_address_space_add_enumeration_type.js index ccfd8cfaee..6a8d1cc3f4 100644 --- a/packages/node-opcua-address-space/test/test_address_space_add_enumeration_type.js +++ b/packages/node-opcua-address-space/test/test_address_space_add_enumeration_type.js @@ -20,7 +20,7 @@ describe("AddressSpace : testing add enumeration type", function () { before(function (done) { get_mini_address_space(function (err, __addressSpace__) { addressSpace = __addressSpace__; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); done(err); }); diff --git a/packages/node-opcua-address-space/test/test_address_space_add_event_type.js b/packages/node-opcua-address-space/test/test_address_space_add_event_type.js index 637c05de72..a76d971c31 100644 --- a/packages/node-opcua-address-space/test/test_address_space_add_event_type.js +++ b/packages/node-opcua-address-space/test/test_address_space_add_event_type.js @@ -25,7 +25,7 @@ describe("AddressSpace : add event type ", function () { get_mini_address_space(function (err, __addressSpace__) { addressSpace = __addressSpace__; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); const eventType = namespace.addEventType({ browseName: "MyCustomEvent", @@ -87,7 +87,7 @@ describe("AddressSpace : add event type ", function () { }); eventType.browseName.toString().should.eql("1:__EventTypeForTest1"); - const privateNamespace = addressSpace.getPrivateNamespace(); + const privateNamespace = addressSpace.getOwnNamespace(); const reloaded = addressSpace.findEventType("__EventTypeForTest1",privateNamespace.index); @@ -98,11 +98,11 @@ describe("AddressSpace : add event type ", function () { it("should retrieve EventType in several ways", function () { - const namespaceIndex= addressSpace.getPrivateNamespace().index; + const namespaceIndex= addressSpace.getOwnNamespace().index; namespaceIndex.should.eql(1); const eventType1 = addressSpace.findEventType("MyCustomEvent",namespaceIndex); - const eventType2 = addressSpace.getPrivateNamespace().findObjectType("MyCustomEvent"); + const eventType2 = addressSpace.getOwnNamespace().findObjectType("MyCustomEvent"); const eventType3 = addressSpace.findEventType("1:MyCustomEvent"); eventType1.should.eql(eventType2); @@ -112,7 +112,7 @@ describe("AddressSpace : add event type ", function () { it("added EventType should be abstract by default", function () { - const namespaceIndex= addressSpace.getPrivateNamespace().index; + const namespaceIndex= addressSpace.getOwnNamespace().index; const eventType = addressSpace.findEventType("MyCustomEvent",namespaceIndex); eventType.isAbstract.should.eql(true); diff --git a/packages/node-opcua-address-space/test/test_address_space_add_object_type.js b/packages/node-opcua-address-space/test/test_address_space_add_object_type.js index 46e546a105..1520027593 100644 --- a/packages/node-opcua-address-space/test/test_address_space_add_object_type.js +++ b/packages/node-opcua-address-space/test/test_address_space_add_object_type.js @@ -22,7 +22,7 @@ describe("testing add new ObjectType ", function () { addressSpace = __addressSpace__; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); done(err); @@ -107,7 +107,7 @@ describe("testing add new ObjectType ", function () { function createSpecialTempSensorType(addressSpace) { - const namespace= addressSpace.getPrivateNamespace(); + const namespace= addressSpace.getOwnNamespace(); const temperatureSensorType = addressSpace.findObjectType("1:TemperatureSensorType"); should.exist(temperatureSensorType); diff --git a/packages/node-opcua-address-space/test/test_address_space_add_variable_type.js b/packages/node-opcua-address-space/test/test_address_space_add_variable_type.js index affc686b91..f8aef885c1 100644 --- a/packages/node-opcua-address-space/test/test_address_space_add_variable_type.js +++ b/packages/node-opcua-address-space/test/test_address_space_add_variable_type.js @@ -18,7 +18,7 @@ describe("testing add new ObjectType ", function () { before(function (done) { get_mini_address_space(function (err, __addressSpace__) { addressSpace = __addressSpace__; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); done(err); }); diff --git a/packages/node-opcua-address-space/test/test_address_space_browse_path.js b/packages/node-opcua-address-space/test/test_address_space_browse_path.js index 95e66904e3..c24fde2c4e 100644 --- a/packages/node-opcua-address-space/test/test_address_space_browse_path.js +++ b/packages/node-opcua-address-space/test/test_address_space_browse_path.js @@ -20,7 +20,7 @@ describe("AddressSpace#browsePath", function () { get_mini_address_space(function (err, data) { addressSpace = data; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); namespace.namespaceUri.should.eql("http://MYNAMESPACE"); // Add EventGeneratorObject diff --git a/packages/node-opcua-address-space/test/test_address_space_model_change_event.js b/packages/node-opcua-address-space/test/test_address_space_model_change_event.js index 319f6d7cd1..adb15d2300 100644 --- a/packages/node-opcua-address-space/test/test_address_space_model_change_event.js +++ b/packages/node-opcua-address-space/test/test_address_space_model_change_event.js @@ -95,7 +95,7 @@ describe("address_space ModelChangeEvent", function () { generate_address_space(addressSpace, xml_files, function (err) { namespace = addressSpace.registerNamespace("PRIVATENAMESPACE"); namespace.index.should.eql(1); - should.exist(addressSpace.getPrivateNamespace()); + should.exist(addressSpace.getOwnNamespace()); done(err); }); }); @@ -216,7 +216,7 @@ describe("address_space ModelChangeEvent", function () { it("addressSpace#modelChangeTransactions should compress model change events ", function () { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); // ------------------------------------------------------------------------------------------------------------- // Given : a version-able node containing a component // ------------------------------------------------------------------------------------------------------------- diff --git a/packages/node-opcua-address-space/test/test_address_space_object_instantiation.js b/packages/node-opcua-address-space/test/test_address_space_object_instantiation.js index b20257a6f6..73f7a206c0 100644 --- a/packages/node-opcua-address-space/test/test_address_space_object_instantiation.js +++ b/packages/node-opcua-address-space/test/test_address_space_object_instantiation.js @@ -29,7 +29,7 @@ describe("testing add new ObjectType ", function () { it("should instantiate a objectType that uses custom HasChild Property",function() { - const namespace =addressSpace.getPrivateNamespace(); + const namespace =addressSpace.getOwnNamespace(); // ------------ Add a new aggregate const weezbeChildType = namespace.addReferenceType({ browseName: "HasWeezbe", @@ -75,7 +75,7 @@ describe("testing add new ObjectType ", function () { it("should be possible to choose which optional item to instantiate in sub objects",function() { - const namespace =addressSpace.getPrivateNamespace(); + const namespace =addressSpace.getOwnNamespace(); function constructObjectType() { diff --git a/packages/node-opcua-address-space/test/test_automatic_generation_of_string_node_ids.js b/packages/node-opcua-address-space/test/test_automatic_generation_of_string_node_ids.js index 078e3febf1..d358d793d9 100644 --- a/packages/node-opcua-address-space/test/test_automatic_generation_of_string_node_ids.js +++ b/packages/node-opcua-address-space/test/test_automatic_generation_of_string_node_ids.js @@ -28,7 +28,7 @@ describe("Automatic Generation of string nodeId", function () { " the nodeId of the parent node and the browse name of the child.\n" ,function() { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const objNode1 = namespace.addObject({ nodeId: "s=abcdef", @@ -68,7 +68,7 @@ describe("Automatic Generation of string nodeId", function () { const createCameraType = require("../test/fixture_camera_type").createCameraType; const cameraType = createCameraType(addressSpace); - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); namespace.index.should.eql(1); const camera1 = cameraType.instantiate({ @@ -109,7 +109,7 @@ describe("Automatic Generation of string nodeId", function () { let objectType, objectType2; before(function() { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); objectType = namespace.addObjectType({ browseName: "MyObjectType", diff --git a/packages/node-opcua-address-space/test/test_base_node.js b/packages/node-opcua-address-space/test/test_base_node.js index 26b8ddd41f..683bdcf60e 100644 --- a/packages/node-opcua-address-space/test/test_base_node.js +++ b/packages/node-opcua-address-space/test/test_base_node.js @@ -24,7 +24,7 @@ describe("Testing UAObject", function () { before(function (done) { get_mini_address_space(function (err, data) { addressSpace = data; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); rootFolder = addressSpace.findNode("RootFolder"); organizesReferenceType = addressSpace.findReferenceType("Organizes"); hasTypeDefinitionReferenceType = addressSpace.findReferenceType("HasTypeDefinition"); diff --git a/packages/node-opcua-address-space/test/test_boiler.js b/packages/node-opcua-address-space/test/test_boiler.js index 79e1ca2195..32562a2217 100644 --- a/packages/node-opcua-address-space/test/test_boiler.js +++ b/packages/node-opcua-address-space/test/test_boiler.js @@ -59,7 +59,7 @@ describe("Testing Boiler System", function () { it("XX should handle StateMachine derived from ProgramStateMachine", function () { - const namespace= addressSpace.getPrivateNamespace(); + const namespace= addressSpace.getOwnNamespace(); const myProgramStateMachine = namespace.addObjectType({ browseName: "MyProgramStateMachine", diff --git a/packages/node-opcua-address-space/test/test_datatype.js b/packages/node-opcua-address-space/test/test_datatype.js index 5547bcdb4d..a298c198b9 100644 --- a/packages/node-opcua-address-space/test/test_datatype.js +++ b/packages/node-opcua-address-space/test/test_datatype.js @@ -41,7 +41,7 @@ describe("testing UADataype - Attribute", function () { it("UADataType#readAttribute", function () { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const dataType = namespace.createDataType({ browseName: "MyDataType", diff --git a/packages/node-opcua-address-space/test/test_findReferenceEx.js b/packages/node-opcua-address-space/test/test_findReferenceEx.js index 4af2dbf4a4..59d819c8b2 100644 --- a/packages/node-opcua-address-space/test/test_findReferenceEx.js +++ b/packages/node-opcua-address-space/test/test_findReferenceEx.js @@ -66,7 +66,7 @@ describe("testing findReferenceEx",function() { const optionals = [].concat(r1_child.sort(),r2_child.sort()); console.log("optionals ",topologyElementType.browseName.toString(), ": ", optionals.join(" ").yellow.bold); - const valveType = addressSpace.getPrivateNamespace().addObjectType({ + const valveType = addressSpace.getOwnNamespace().addObjectType({ browseName: "ValveType", subtypeOf: deviceType, }); diff --git a/packages/node-opcua-address-space/test/test_issue_105.js b/packages/node-opcua-address-space/test/test_issue_105.js index 245eb1d34f..f3e042e2a6 100644 --- a/packages/node-opcua-address-space/test/test_issue_105.js +++ b/packages/node-opcua-address-space/test/test_issue_105.js @@ -16,7 +16,7 @@ describe("testing github issue https://github.com/node-opcua/node-opcua/issues/1 before(function (done) { get_mini_address_space(function (err, __addressSpace__) { addressSpace = __addressSpace__; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); // lets declare a custom folder Type const myFolderType = namespace.addObjectType({browseName: "MyFolderType", subtypeOf: "FolderType"}); @@ -41,7 +41,7 @@ describe("testing github issue https://github.com/node-opcua/node-opcua/issues/1 //xx var folderType = addressSpace.findObjectType("FolderType"); - const myFolderType = addressSpace.findObjectType("MyFolderType",addressSpace.getPrivateNamespace().index); + const myFolderType = addressSpace.findObjectType("MyFolderType",addressSpace.getOwnNamespace().index); // now create a folder of type MyFolderType inside the Objects Folder const myFolder = myFolderType.instantiate({browseName: "MyFolder", organizedBy: "ObjectsFolder"}); diff --git a/packages/node-opcua-address-space/test/test_issue_108.js b/packages/node-opcua-address-space/test/test_issue_108.js index e5a7572e9c..64c8139fd1 100644 --- a/packages/node-opcua-address-space/test/test_issue_108.js +++ b/packages/node-opcua-address-space/test/test_issue_108.js @@ -44,7 +44,7 @@ describe("testing add new DataType ", function () { const baseObjectType = addressSpace.findObjectType("BaseObjectType"); const baseDataVariableType = addressSpace.findVariableType("BaseDataVariableType"); - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); // -------------------------------------------- MachineType const customTypeNode = namespace.addObjectType({browseName: "CustomType"}); @@ -130,7 +130,7 @@ describe("testing add new DataType ", function () { const ftnirInstance = ftnirType.instantiate({browseName: "MyFTNIR", organizedBy: deviceSet}); - ftnirInstance.nodeId.namespace.should.eql(addressSpace.getPrivateNamespace().index); + ftnirInstance.nodeId.namespace.should.eql(addressSpace.getOwnNamespace().index); addressSpace.dispose(); diff --git a/packages/node-opcua-address-space/test/test_issue_162.js b/packages/node-opcua-address-space/test/test_issue_162.js index da9524d7dc..e43465968c 100644 --- a/packages/node-opcua-address-space/test/test_issue_162.js +++ b/packages/node-opcua-address-space/test/test_issue_162.js @@ -47,7 +47,7 @@ describe("Issue 162 : demonstrate how to modify an instantiate object variable", if (!myCustomObjectType) { - const namespace= addressSpace.getPrivateNamespace(); + const namespace= addressSpace.getOwnNamespace(); myCustomObjectType = namespace.addObjectType({ browseName: "MyCustomObjectType" diff --git a/packages/node-opcua-address-space/test/test_issue_337.js b/packages/node-opcua-address-space/test/test_issue_337.js index 15a6deaff8..004d5bcd40 100644 --- a/packages/node-opcua-address-space/test/test_issue_337.js +++ b/packages/node-opcua-address-space/test/test_issue_337.js @@ -29,7 +29,7 @@ describe("Testing bug found in #337", function () { it("should handle Matrix ", function () { - const namespace =addressSpace.getPrivateNamespace(); + const namespace =addressSpace.getOwnNamespace(); const n = namespace.addVariable({ organizedBy: addressSpace.rootFolder.objects, diff --git a/packages/node-opcua-address-space/test/test_issue_449.js b/packages/node-opcua-address-space/test/test_issue_449.js index 1ab9c08b0d..b2a840e9a1 100644 --- a/packages/node-opcua-address-space/test/test_issue_449.js +++ b/packages/node-opcua-address-space/test/test_issue_449.js @@ -31,7 +31,7 @@ describe("testing github issue https://github.com/node-opcua/node-opcua/issues/4 it("#449 should be possible to access this in UAVariable get/set value accessor", function (done) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); let node; const counterVar = { browseName: "TEST", diff --git a/packages/node-opcua-address-space/test/test_load_nodeset2.js b/packages/node-opcua-address-space/test/test_load_nodeset2.js index b68c0db7a4..9af78e10d2 100644 --- a/packages/node-opcua-address-space/test/test_load_nodeset2.js +++ b/packages/node-opcua-address-space/test/test_load_nodeset2.js @@ -48,6 +48,9 @@ describe("testing NodeSet XML file loading", function () { generate_address_space(addressSpace, xml_file, function (err) { const namespace0 = addressSpace.getDefaultNamespace(); + + namespace0.addressSpace.should.eql(addressSpace); + Object.keys(namespace0._aliases).length.should.be.greaterThan(10); Object.keys(namespace0._variableTypeMap).length.should.be.greaterThan(3); Object.keys(namespace0._referenceTypeMap).length.should.be.greaterThan(10); @@ -69,6 +72,7 @@ describe("testing NodeSet XML file loading", function () { generate_address_space(addressSpace, xml_file, function (err) { const namespace0 = addressSpace.getDefaultNamespace(); + namespace0.addressSpace.should.eql(addressSpace); Object.keys(namespace0._aliases).length.should.be.greaterThan(10); Object.keys(namespace0._variableTypeMap).length.should.be.greaterThan(10); @@ -93,6 +97,7 @@ describe("testing NodeSet XML file loading", function () { const namespace0 = addressSpace.getDefaultNamespace(); namespace0.namespaceUri.should.eql("http://opcfoundation.org/UA/"); + namespace0.addressSpace.should.eql(addressSpace); Object.keys(namespace0._aliases).length.should.be.greaterThan(10); Object.keys(namespace0._variableTypeMap).length.should.be.greaterThan(10); @@ -102,6 +107,7 @@ describe("testing NodeSet XML file loading", function () { const namespace1 = addressSpace.getNamespace(1); namespace1.namespaceUri.should.eql("http://opcfoundation.org/UA/DI/"); + namespace1.addressSpace.should.eql(addressSpace); Object.keys(namespace1._aliases).length.should.be.eql(0); Object.keys(namespace1._variableTypeMap).length.should.be.greaterThan(0); diff --git a/packages/node-opcua-address-space/test/test_method.js b/packages/node-opcua-address-space/test/test_method.js index 8449085eab..b2f287c4ed 100644 --- a/packages/node-opcua-address-space/test/test_method.js +++ b/packages/node-opcua-address-space/test/test_method.js @@ -26,7 +26,7 @@ describe("testing Method - Attribute UserExecutable & Executable on Method ", f before(function (done) { get_mini_address_space(function(err,_addressSpace){ addressSpace = _addressSpace; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); namespace.index.should.eql(1); done(err); diff --git a/packages/node-opcua-address-space/test/test_nodeset_to_xml.js b/packages/node-opcua-address-space/test/test_nodeset_to_xml.js index 139bf59d31..806febc78d 100644 --- a/packages/node-opcua-address-space/test/test_nodeset_to_xml.js +++ b/packages/node-opcua-address-space/test/test_nodeset_to_xml.js @@ -7,9 +7,9 @@ const DataType = require("node-opcua-variant").DataType; const Variant = require("node-opcua-variant").Variant; const _ = require("underscore"); - const dumpXml = require("../src/nodeset_to_xml").dumpXml; const get_mini_address_space = require("../test_helpers/get_mini_address_space").get_mini_address_space; +const generateAddressSpace = require("..").generate_address_space; const doDebug = false; @@ -21,7 +21,7 @@ describe("testing nodeset to xml", function () { addressSpace = __addressSpace__; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); done(err); }); @@ -71,8 +71,8 @@ describe("testing nodeset to xml", function () { console.log(str); } str.should.match(/RUNNING/); - str.should.match(//); - str.should.match(//); + str.should.match(//); + str.should.match(//); }); it("€€ should output a custom Enum node to xml (MyEnumType) - Form2 ( with EnumValues )", function () { @@ -92,8 +92,8 @@ describe("testing nodeset to xml", function () { console.log(str); } str.should.match(/RUNNING/); - str.should.match(//); - str.should.match(//); + str.should.match(//); + str.should.match(//); }); @@ -109,7 +109,7 @@ describe("testing nodeset to xml", function () { it("should output a instance of a new ObjectType to xml", function () { - const namespace= addressSpace.getPrivateNamespace(); + const namespace= addressSpace.getOwnNamespace(); // TemperatureSensorType const temperatureSensorType = namespace.addObjectType({browseName: "TemperatureSensorType"}); @@ -165,7 +165,7 @@ describe("testing nodeset to xml", function () { it("should output an instance of variable type to xml", function () { - const namespace= addressSpace.getPrivateNamespace(); + const namespace= addressSpace.getOwnNamespace(); const variableType = namespace.addVariableType({browseName: 'MyCustomVariableType'}); const str = dumpXml(variableType, {}); diff --git a/packages/node-opcua-address-space/test/test_object_type.js b/packages/node-opcua-address-space/test/test_object_type.js index 0a179efdbb..9bff44d72d 100644 --- a/packages/node-opcua-address-space/test/test_object_type.js +++ b/packages/node-opcua-address-space/test/test_object_type.js @@ -37,7 +37,7 @@ describe("testing UAObjectType", function () { it("should read Attribute IsAbstract on UAObjectType ", function () { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const objType = namespace.addObjectType({ browseName: "MyObject", isAbstract: false @@ -52,7 +52,7 @@ describe("testing UAObjectType", function () { }); it("should read Attribute IsAbstract on Abstract UAObjectType ", function () { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const objType = namespace.addObjectType({ browseName: "MyObject2", isAbstract: true @@ -72,7 +72,7 @@ describe("testing UAObjectType", function () { it("UAObjectType#instantiate should be possible to instantiate a ObjectType (nodeid not specified)",function() { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const objType = namespace.addObjectType({ browseName: "MyObject3", subtypeOf: "BaseObjectType", @@ -91,7 +91,7 @@ describe("testing UAObjectType", function () { it("UAObjectType#instantiate should be possible to instantiate a ObjectType and specify its nodeId)",function() { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const objType = namespace.addObjectType({ browseName: "MyObject4", subtypeOf: "BaseObjectType", diff --git a/packages/node-opcua-address-space/test/test_referencetype.js b/packages/node-opcua-address-space/test/test_referencetype.js index 7d47a9fa76..3fb534a5ee 100644 --- a/packages/node-opcua-address-space/test/test_referencetype.js +++ b/packages/node-opcua-address-space/test/test_referencetype.js @@ -599,7 +599,7 @@ describe(" improving performance of isSupertypeOf", function () { hasTypeDefinition.isSupertypeOf(nhr).should.eql(true); nhr.isSupertypeOf(hasTypeDefinition).should.eql(false); - const flowTo = addressSpace.getPrivateNamespace().addReferenceType({ + const flowTo = addressSpace.getOwnNamespace().addReferenceType({ browseName: "FlowTo", inverseName: "FlowFrom", isAbstract: false, diff --git a/packages/node-opcua-address-space/test/test_variable.js b/packages/node-opcua-address-space/test/test_variable.js index bd24419ab4..922cb9ac26 100644 --- a/packages/node-opcua-address-space/test/test_variable.js +++ b/packages/node-opcua-address-space/test/test_variable.js @@ -232,7 +232,7 @@ describe("testing Variable#bindVariable", function () { addressSpace.registerNamespace("Private"); - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); namespace.index.should.eql(1); rootFolder = addressSpace.findNode("RootFolder"); @@ -789,7 +789,7 @@ describe("testing Variable#writeValue Scalar", function () { namespace = addressSpace.registerNamespace("Private"); namespace.index.should.eql(1); - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); rootFolder = addressSpace.findNode("RootFolder"); @@ -862,12 +862,12 @@ describe("testing Variable#writeValue Array", function () { addressSpace = new address_space.AddressSpace(); generate_address_space(addressSpace, nodeset_filename, function () { addressSpace.registerNamespace("Private"); - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); rootFolder = addressSpace.findNode("RootFolder"); - variable = addressSpace.getPrivateNamespace().addVariable({ + variable = addressSpace.getOwnNamespace().addVariable({ browseName: "some variable", minimumSamplingInterval: 100, userAccessLevel: "CurrentRead | CurrentWrite", @@ -1194,7 +1194,7 @@ describe("testing Variable#writeValue on Integer", function () { generate_address_space(addressSpace, nodeset_filename, function () { addressSpace.registerNamespace("Private"); - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); rootFolder = addressSpace.findNode("RootFolder"); @@ -1339,7 +1339,7 @@ describe("testing UAVariable ", function () { addressSpace.registerNamespace("Private"); - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); if (!err) { addressSpace.registerNamespace("Private"); diff --git a/packages/node-opcua-address-space/test/test_variable_type.js b/packages/node-opcua-address-space/test/test_variable_type.js index 91f3633f0d..11b0610d8e 100644 --- a/packages/node-opcua-address-space/test/test_variable_type.js +++ b/packages/node-opcua-address-space/test/test_variable_type.js @@ -37,7 +37,7 @@ describe("testing UAVariableType", function () { it("should read Attribute IsAbstract on UAVariableType ", function () { - const variableType = addressSpace.getPrivateNamespace().addVariableType({ + const variableType = addressSpace.getOwnNamespace().addVariableType({ browseName: "MyVariableType1", isAbstract: false }); @@ -51,7 +51,7 @@ describe("testing UAVariableType", function () { }); it("should read Attribute IsAbstract on Abstract UAVariableType ", function () { - const variableType = addressSpace.getPrivateNamespace().addVariableType({ + const variableType = addressSpace.getOwnNamespace().addVariableType({ browseName: "MyVariable2", isAbstract: true }); @@ -70,7 +70,7 @@ describe("testing UAVariableType", function () { it("UAVariableType#instantiate should be possible to instantiate a VariableType (nodeid not specified)", function () { - const variableType = addressSpace.getPrivateNamespace().addVariableType({ + const variableType = addressSpace.getOwnNamespace().addVariableType({ browseName: "MyVariable3", subtypeOf: "BaseVariableType", isAbstract: false @@ -90,7 +90,7 @@ describe("testing UAVariableType", function () { it("UAVariableType#instantiate should be possible to instantiate a VariableType and specify its nodeId)", function () { - const variableType = addressSpace.getPrivateNamespace().addVariableType({ + const variableType = addressSpace.getOwnNamespace().addVariableType({ browseName: "MyVariable4", subtypeOf: "BaseVariableType", isAbstract: false @@ -111,12 +111,12 @@ describe("testing UAVariableType", function () { addressSpace.rootFolder.browseName.toString().should.eql("RootFolder"); - const myFolder = addressSpace.getPrivateNamespace().addObject({ + const myFolder = addressSpace.getOwnNamespace().addObject({ browseName: "MyFolder", organizedBy: addressSpace.rootFolder.objects }); - const variableType = addressSpace.getPrivateNamespace().addVariableType({ + const variableType = addressSpace.getOwnNamespace().addVariableType({ browseName: "MyVariable5", subtypeOf: "BaseVariableType", isAbstract: false @@ -135,12 +135,12 @@ describe("testing UAVariableType", function () { addressSpace.rootFolder.browseName.toString().should.eql("RootFolder"); - const myFolder = addressSpace.getPrivateNamespace().addObject({ + const myFolder = addressSpace.getOwnNamespace().addObject({ browseName: "MyFolder2", organizedBy: addressSpace.rootFolder.objects }); - const variableType = addressSpace.getPrivateNamespace().addVariableType({ + const variableType = addressSpace.getOwnNamespace().addVariableType({ browseName: "MyVariable6", subtypeOf: "BaseVariableType", isAbstract: false @@ -159,7 +159,7 @@ describe("testing UAVariableType", function () { it("UAVariableType#instantiate with valueRank and arrayDimension", function () { - const variableType = addressSpace.getPrivateNamespace().addVariableType({ + const variableType = addressSpace.getOwnNamespace().addVariableType({ browseName: "My3x3MatrixVariableType", subtypeOf: "BaseVariableType", isAbstract: false, @@ -194,7 +194,7 @@ describe("testing UAVariableType", function () { const postInstantiateFunc = sinon.spy(); - const variableType = addressSpace.getPrivateNamespace().addVariableType({ + const variableType = addressSpace.getOwnNamespace().addVariableType({ browseName: "MyVariable10", subtypeOf: "BaseVariableType", isAbstract: false, diff --git a/packages/node-opcua-address-space/test_helpers/add_event_generator_object.js b/packages/node-opcua-address-space/test_helpers/add_event_generator_object.js index bf730e9c0b..74e75e742a 100644 --- a/packages/node-opcua-address-space/test_helpers/add_event_generator_object.js +++ b/packages/node-opcua-address-space/test_helpers/add_event_generator_object.js @@ -46,7 +46,7 @@ function add_eventGeneratorObject(namespace, parentFolder) { const message = inputArguments[0].value || "Hello from Event Generator Object"; const severity = inputArguments[1].value || 0; - const myEventType = namespace.__addressSpace.findEventType("MyEventType",namespace.index); + const myEventType = namespace.addressSpace.findEventType("MyEventType",namespace.index); context.object.raiseEvent(myEventType, { message: { dataType: DataType.LocalizedText, diff --git a/packages/node-opcua-address-space/test_helpers/alarms_and_conditions_demo.js b/packages/node-opcua-address-space/test_helpers/alarms_and_conditions_demo.js index 58ec5a58ca..766cee64fa 100644 --- a/packages/node-opcua-address-space/test_helpers/alarms_and_conditions_demo.js +++ b/packages/node-opcua-address-space/test_helpers/alarms_and_conditions_demo.js @@ -5,7 +5,7 @@ function construct_demo_alarm_in_address_space(test,addressSpace) { addressSpace.installAlarmsAndConditionsService(); - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const tank = namespace.addObject({ browseName: "Tank", diff --git a/packages/node-opcua-address-space/test_helpers/boiler_system.js b/packages/node-opcua-address-space/test_helpers/boiler_system.js index 1963f32bc5..5bb86ac92c 100644 --- a/packages/node-opcua-address-space/test_helpers/boiler_system.js +++ b/packages/node-opcua-address-space/test_helpers/boiler_system.js @@ -79,7 +79,7 @@ function addRelation(srcNode,referenceType, targetNode) { exports.createBoilerType = function createBoilerType(addressSpace) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); if (namespace.findReferenceType("FlowTo")) { console.warn("createBoilerType has already been called"); return; @@ -457,7 +457,7 @@ exports.createBoilerType = function createBoilerType(addressSpace) { exports.makeBoiler = function makeBoiler(addressSpace, options) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); //xx assert( addressSpace instanceof AddressSpace); assert(options); let boilerType = addressSpace.findObjectType("BoilerType",namespace.index); diff --git a/packages/node-opcua-end2end-test/test/end_to_end/companions/analyser_device_integration/test_e2e_server_with_analyser_device.js b/packages/node-opcua-end2end-test/test/end_to_end/companions/analyser_device_integration/test_e2e_server_with_analyser_device.js index c52824edc1..5018fbc58a 100644 --- a/packages/node-opcua-end2end-test/test/end_to_end/companions/analyser_device_integration/test_e2e_server_with_analyser_device.js +++ b/packages/node-opcua-end2end-test/test/end_to_end/companions/analyser_device_integration/test_e2e_server_with_analyser_device.js @@ -32,7 +32,7 @@ function create_analyser_device(addressSpace) { const analyserDeviceType = addressSpace.findObjectType("AnalyserDeviceType", adi_namespace); //xx console.log(analyserDeviceType.toString()); - const myAnalyserDeviceType = addressSpace.getPrivateNamespace().addObjectType({ + const myAnalyserDeviceType = addressSpace.getOwnNamespace().addObjectType({ browseName: "MyAnalyserDeviceType", subtypeOf: analyserDeviceType }); @@ -109,7 +109,7 @@ describe("ADI - Testing a server that exposes Analyser Devices", function () { const di_namespace = addressSpace.getNamespaceIndex("http://opcfoundation.org/UA/DI/"); const deviceType = addressSpace.findObjectType("DeviceType", di_namespace); - const myDeviceType = addressSpace.getPrivateNamespace().addObjectType({ + const myDeviceType = addressSpace.getOwnNamespace().addObjectType({ browseName: "MyDeviceType", subtypeOf: addressSpace.findObjectType("DeviceType") }); diff --git a/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_connection_reconnection.js b/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_connection_reconnection.js index 9608d7ed6e..5c4ebc06e7 100644 --- a/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_connection_reconnection.js +++ b/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_connection_reconnection.js @@ -359,7 +359,7 @@ describe("KJH2 testing ability for client to reconnect when server close connect endpointUrl = server.endpoints[0].endpointDescriptions()[0].endpointUrl; temperatureVariableId = server.temperatureVariableId; - const namespace = server.engine.addressSpace.getPrivateNamespace(); + const namespace = server.engine.addressSpace.getOwnNamespace(); if (!err) { let c = 0; diff --git a/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_issue171_control_user_access_level.js b/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_issue171_control_user_access_level.js index 491aa7c167..76dae75e1f 100644 --- a/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_issue171_control_user_access_level.js +++ b/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_issue171_control_user_access_level.js @@ -74,7 +74,7 @@ describe("testing Client-Server with UserName/Password identity token", function server.userManager = userManager; const addressSpace = server.engine.addressSpace; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); // create a variable that can only be read and written by admin node1 = namespace.addVariable({ diff --git a/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_issue405_control_user_role.js b/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_issue405_control_user_role.js index 74bb647e78..bda9ab18e9 100644 --- a/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_issue405_control_user_role.js +++ b/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_issue405_control_user_role.js @@ -80,7 +80,7 @@ describe("testing Client-Server with UserName/Password identity token", function server.userManager = userManager; const addressSpace = server.engine.addressSpace; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); // create a variable that can be read and written by admins // and read/nowrite by operators // and noRead/noWrite by guests diff --git a/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_limited_number_of_nodes.js b/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_limited_number_of_nodes.js index 2036077b94..a90858a0d6 100644 --- a/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_limited_number_of_nodes.js +++ b/packages/node-opcua-end2end-test/test/end_to_end/test_e2e_limited_number_of_nodes.js @@ -260,7 +260,7 @@ describe("testing server with low maxNodesPerRead and maxNodesPerBrowse", functi xit("should crawl a server cyclic-node ", function (done) { - const namespace = server.engine.addresSpaec.getPrivateNamespace(); + const namespace = server.engine.addresSpaec.getOwnNamespace(); // TODO server.subFolder1 = namespace.addFolder("ObjectsFolder", "SubFolder1"); server.subFolder2 = namespace.addFolder(server.subFolder1, "SubFolder2"); diff --git a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_SubscriptionUseCase.js b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_SubscriptionUseCase.js index 56b1dda0ad..3624813302 100644 --- a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_SubscriptionUseCase.js +++ b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_SubscriptionUseCase.js @@ -1361,7 +1361,7 @@ module.exports = function (test) { endpointUrl = test.endpointUrl; temperatureVariableId = server.temperatureVariableId; - const namespace = server.engine.addressSpace.getPrivateNamespace(); + const namespace = server.engine.addressSpace.getOwnNamespace(); const rootFolder = server.engine.addressSpace.rootFolder; const objectsFolder = rootFolder.objects; diff --git a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_123.js b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_123.js index 271fa67ae7..4559e5c915 100644 --- a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_123.js +++ b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_123.js @@ -26,7 +26,7 @@ module.exports = function (test) { const refreshRate = 100; let counter = 1; - const namespace = server.engine.addressSpace.getPrivateNamespace(); + const namespace = server.engine.addressSpace.getOwnNamespace(); const variableToMonitor = namespace.addVariable({ organizedBy: server.engine.addressSpace.rootFolder.objects, diff --git a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_135_currentMonitoredItemsCount.js b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_135_currentMonitoredItemsCount.js index f4ff273fa2..fbd9ad1362 100644 --- a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_135_currentMonitoredItemsCount.js +++ b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_135_currentMonitoredItemsCount.js @@ -26,7 +26,7 @@ module.exports = function (test) { const refreshRate = 500; let counter = 1; - const slowVar = server.engine.addressSpace.getPrivateNamespace().addVariable({ + const slowVar = server.engine.addressSpace.getOwnNamespace().addVariable({ organizedBy: server.engine.addressSpace.rootFolder.objects, browseName: "SlowVariable", dataType: "UInt32", diff --git a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_141.js b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_141.js index 628e48fc39..1817c0004c 100644 --- a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_141.js +++ b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_141.js @@ -90,7 +90,7 @@ module.exports = function (test) { it("#141-B client should raise an event to observer when a request has timed out ( timeoutHint exhausted without response)", function (done) { - const node = server.engine.addressSpace.getPrivateNamespace().addVariable({ + const node = server.engine.addressSpace.getOwnNamespace().addVariable({ browseName: "MySlowVariable", dataType: "Int32", diff --git a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_156.js b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_156.js index 378263fdfa..94c14c7d69 100644 --- a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_156.js +++ b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_156.js @@ -28,7 +28,7 @@ module.exports = function (test) { const refreshRate = 500; - const namespace = server.engine.addressSpace.getPrivateNamespace(); + const namespace = server.engine.addressSpace.getOwnNamespace(); let counter = 1; const slowVar = namespace.addVariable({ diff --git a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_163.js b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_163.js index 007bbf3c2d..02e5683879 100644 --- a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_163.js +++ b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_163.js @@ -33,7 +33,7 @@ module.exports = function (test) { let variable2 = 16.0; const addressSpace = server.engine.addressSpace; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const the_Variable = namespace.addVariable({ organizes: addressSpace.rootFolder.objects, diff --git a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_377.js b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_377.js index 4fb2904716..de1aa15d6e 100644 --- a/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_377.js +++ b/packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_issue_377.js @@ -17,7 +17,7 @@ module.exports = function (test) { const server = test.server; const addressSpace = server.engine.addressSpace; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const nodeId = new opcua.NodeId(opcua.NodeIdType.STRING, "1cf5e1fa-202a-2ab8-0440-c4fc2f22f2bf",1); namespace.addObject({ diff --git a/packages/node-opcua-end2end-test/test_helpers/bin/simple_server_with_custom_extension_objects.js b/packages/node-opcua-end2end-test/test_helpers/bin/simple_server_with_custom_extension_objects.js index 376339fa78..56040f181e 100644 --- a/packages/node-opcua-end2end-test/test_helpers/bin/simple_server_with_custom_extension_objects.js +++ b/packages/node-opcua-end2end-test/test_helpers/bin/simple_server_with_custom_extension_objects.js @@ -58,7 +58,7 @@ server.on("post_initialize", function () { const rootFolder = addressSpace.findNode("RootFolder"); - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const myDevices = namespace.addFolder(rootFolder.objects, {browseName: "MyDevices"}); diff --git a/packages/node-opcua-end2end-test/test_helpers/build_server_with_temperature_device.js b/packages/node-opcua-end2end-test/test_helpers/build_server_with_temperature_device.js index 0ded42786b..ab01cbba1c 100644 --- a/packages/node-opcua-end2end-test/test_helpers/build_server_with_temperature_device.js +++ b/packages/node-opcua-end2end-test/test_helpers/build_server_with_temperature_device.js @@ -31,7 +31,7 @@ function addTestUAAnalogItem(parentNode) { //xx assert(parentNode instanceof opcua.BaseNode); const addressSpace = parentNode.addressSpace; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); // add a UAAnalogItem namespace.addAnalogDataItem({ @@ -111,7 +111,7 @@ function build_server_with_temperature_device(options, done) { const addressSpace = server.engine.addressSpace; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const myDevices = namespace.addFolder("ObjectsFolder", {browseName: "MyDevices"}); assert(myDevices.browseName.toString() === "1:MyDevices"); diff --git a/packages/node-opcua-end2end-test/test_helpers/hvac_system.js b/packages/node-opcua-end2end-test/test_helpers/hvac_system.js index c453878871..d03ca608ca 100644 --- a/packages/node-opcua-end2end-test/test_helpers/hvac_system.js +++ b/packages/node-opcua-end2end-test/test_helpers/hvac_system.js @@ -53,7 +53,7 @@ const doDebug = false; exports.createHVACSystem = function (addressSpace) { - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const HVACEnabledEventType = namespace.addEventType({ browseName: "HVACEnabledEventType" diff --git a/packages/node-opcua-samples/bin/di_server.js b/packages/node-opcua-samples/bin/di_server.js index 10c5beec5d..d126835f9f 100644 --- a/packages/node-opcua-samples/bin/di_server.js +++ b/packages/node-opcua-samples/bin/di_server.js @@ -107,7 +107,7 @@ server.on("post_initialize", function () { const addressSpace = server.engine.addressSpace; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const rootFolder = addressSpace.findNode("RootFolder"); assert(rootFolder.browseName.toString() === "Root"); diff --git a/packages/node-opcua-samples/bin/simple_server.js b/packages/node-opcua-samples/bin/simple_server.js index 365178242b..965e58043b 100644 --- a/packages/node-opcua-samples/bin/simple_server.js +++ b/packages/node-opcua-samples/bin/simple_server.js @@ -160,7 +160,7 @@ server.on("post_initialize", function () { const rootFolder = addressSpace.findNode("RootFolder"); assert(rootFolder.browseName.toString() === "Root"); - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const myDevices = namespace.addFolder(rootFolder.objects, {browseName: "MyDevices"}); diff --git a/packages/node-opcua-server/src/server_session.js b/packages/node-opcua-server/src/server_session.js index 366949c601..bb5ffc3f56 100644 --- a/packages/node-opcua-server/src/server_session.js +++ b/packages/node-opcua-server/src/server_session.js @@ -83,7 +83,7 @@ function ServerSession(parent, sessionTimeout) { session.authenticationToken = new NodeId(NodeIdType.BYTESTRING, authenticationTokenBuf); // the sessionId - const ownNamespaceIndex = 1; // addressSpace.getPrivateNamespace().index; + const ownNamespaceIndex = 1; // addressSpace.getOwnNamespace().index; session.nodeId = new NodeId(NodeIdType.GUID, ec.randomGuid(), ownNamespaceIndex); assert(session.authenticationToken instanceof NodeId); @@ -324,7 +324,7 @@ ServerSession.prototype._createSessionObjectInAddressSpace = function () { references.push({referenceType: "HasTypeDefinition", isForward: true, nodeId: sessionDiagnosticsObjectType}); } - const namespace = session.addressSpace.getPrivateNamespace(); + const namespace = session.addressSpace.getOwnNamespace(); session.sessionObject = namespace.createNode({ nodeId: session.nodeId, nodeClass: NodeClass.Object, diff --git a/packages/node-opcua-server/test/test_raise_event.js b/packages/node-opcua-server/test/test_raise_event.js index ed51853138..dc0f62aa34 100644 --- a/packages/node-opcua-server/test/test_raise_event.js +++ b/packages/node-opcua-server/test/test_raise_event.js @@ -34,7 +34,7 @@ describe("testing Events ", function () { before(function (done) { get_mini_address_space(function (err,__addressSpace__) { addressSpace =__addressSpace__; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); eventType = namespace.addEventType({browseName: "SomeEventType"}); done(err); diff --git a/packages/node-opcua-server/test/test_server_engine.js b/packages/node-opcua-server/test/test_server_engine.js index f948d8770f..c293501511 100644 --- a/packages/node-opcua-server/test/test_server_engine.js +++ b/packages/node-opcua-server/test/test_server_engine.js @@ -71,7 +71,7 @@ describe("testing ServerEngine", function () { engine.initialize({nodeset_filename: server_engine.mini_nodeset_filename}, function () { const addressSpace = engine.addressSpace; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); FolderTypeId = addressSpace.findObjectType("FolderType").nodeId; BaseDataVariableTypeId = addressSpace.findVariableType("BaseDataVariableType").nodeId; @@ -226,7 +226,7 @@ describe("testing ServerEngine", function () { }); it("should be possible to create a new folder under the 'Root' folder", function () { - const namespace = engine.addressSpace.getPrivateNamespace(); + const namespace = engine.addressSpace.getOwnNamespace(); // find 'Objects' folder const objects = engine.addressSpace.rootFolder.objects; @@ -243,7 +243,7 @@ describe("testing ServerEngine", function () { }); it("should be possible to find a newly created folder by nodeId", function () { - const namespace = engine.addressSpace.getPrivateNamespace(); + const namespace = engine.addressSpace.getOwnNamespace(); const newFolder = namespace.addFolder("ObjectsFolder", "MyNewFolder"); @@ -258,7 +258,7 @@ describe("testing ServerEngine", function () { it("should be possible to find a newly created folder by 'browse name'", function () { - const namespace = engine.addressSpace.getPrivateNamespace(); + const namespace = engine.addressSpace.getOwnNamespace(); const newFolder = namespace.addFolder("ObjectsFolder", "MySecondNewFolder"); const result = engine.addressSpace.rootFolder.objects.getFolderElementByName("MySecondNewFolder"); @@ -268,7 +268,7 @@ describe("testing ServerEngine", function () { xit("should not be possible to create a object with an existing 'browse name'", function () { - const namespace = engine.addressSpace.getPrivateNamespace(); + const namespace = engine.addressSpace.getOwnNamespace(); const newFolder1 = namespace.addFolder("ObjectsFolder", "NoUniqueName"); @@ -283,7 +283,7 @@ describe("testing ServerEngine", function () { it("should be possible to create a variable in a folder", function (done) { const addressSpace = engine.addressSpace; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const newFolder = namespace.addFolder("ObjectsFolder", "MyNewFolder1"); diff --git a/packages/node-opcua-server/test/test_server_engine_add_method.js b/packages/node-opcua-server/test/test_server_engine_add_method.js index 9568edc09b..7b945c85ae 100644 --- a/packages/node-opcua-server/test/test_server_engine_add_method.js +++ b/packages/node-opcua-server/test/test_server_engine_add_method.js @@ -29,7 +29,7 @@ describe("ServerEngine - addMethod", function () { engine.initialize({nodeset_filename: server_engine.mini_nodeset_filename}, function () { addressSpace = engine.addressSpace; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); FolderTypeId = addressSpace.findObjectType("FolderType").nodeId; BaseDataVariableTypeId = addressSpace.findVariableType("BaseDataVariableType").nodeId; diff --git a/packages/node-opcua-server/test/test_server_engine_view.js b/packages/node-opcua-server/test/test_server_engine_view.js index ad53efade6..39b9a29c84 100644 --- a/packages/node-opcua-server/test/test_server_engine_view.js +++ b/packages/node-opcua-server/test/test_server_engine_view.js @@ -26,7 +26,7 @@ describe("Testing the server engine - View related ", function () { const viewsFolder = engine.addressSpace.findNode("ViewsFolder"); - const namespace = engine.addressSpace.getPrivateNamespace(); + const namespace = engine.addressSpace.getOwnNamespace(); const view = namespace.addView({ organizedBy: viewsFolder, diff --git a/packages/node-opcua-server/test/test_subscription.js b/packages/node-opcua-server/test/test_subscription.js index e0fb40ba9d..8c331042f9 100644 --- a/packages/node-opcua-server/test/test_subscription.js +++ b/packages/node-opcua-server/test/test_subscription.js @@ -364,7 +364,7 @@ describe("Subscriptions", function () { engine = new server_engine.ServerEngine(); engine.initialize({nodeset_filename: server_engine.mini_nodeset_filename}, function () { addressSpace = engine.addressSpace; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); const node = namespace.addVariable({ componentOf: "RootFolder", diff --git a/packages/node-opcua-server/test/test_subscription_with_monitored_items.js b/packages/node-opcua-server/test/test_subscription_with_monitored_items.js index b354584bf9..3687982788 100644 --- a/packages/node-opcua-server/test/test_subscription_with_monitored_items.js +++ b/packages/node-opcua-server/test/test_subscription_with_monitored_items.js @@ -114,7 +114,7 @@ describeWithLeakDetector("Subscriptions and MonitoredItems", function () { engine.initialize({nodeset_filename: server_engine.nodeset_filename}, function () { addressSpace = engine.addressSpace; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); // build_address_space_for_conformance_testing(engine, {mass_variables: false}); @@ -1414,7 +1414,7 @@ describe("monitoredItem advanced", function () { engine.initialize({nodeset_filename: server_engine.mini_nodeset_filename}, function () { addressSpace = engine.addressSpace; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); const node = namespace.addVariable({ diff --git a/packages/node-opcua-server/test/test_subscription_with_monitored_items_boolean_string_bytestring.js b/packages/node-opcua-server/test/test_subscription_with_monitored_items_boolean_string_bytestring.js index 4b0a4c7e18..32bd96e43e 100644 --- a/packages/node-opcua-server/test/test_subscription_with_monitored_items_boolean_string_bytestring.js +++ b/packages/node-opcua-server/test/test_subscription_with_monitored_items_boolean_string_bytestring.js @@ -91,7 +91,7 @@ describe("Subscriptions and MonitoredItems", function () { engine.initialize({nodeset_filename: server_engine.nodeset_filename}, function () { addressSpace = engine.addressSpace; - namespace = addressSpace.getPrivateNamespace(); + namespace = addressSpace.getOwnNamespace(); function addVar(typeName, value) { namespace.addVariable({ diff --git a/packages/node-opcua-vendor-diagnostic/src/vendor_diagnostic_nodes.js b/packages/node-opcua-vendor-diagnostic/src/vendor_diagnostic_nodes.js index 0f757edee2..d924941acd 100644 --- a/packages/node-opcua-vendor-diagnostic/src/vendor_diagnostic_nodes.js +++ b/packages/node-opcua-vendor-diagnostic/src/vendor_diagnostic_nodes.js @@ -69,7 +69,7 @@ function install_optional_cpu_and_memory_usage_node(server) { const addressSpace = engine.addressSpace; - const namespace = addressSpace.getPrivateNamespace(); + const namespace = addressSpace.getOwnNamespace(); const folder = addressSpace.findNode(ObjectIds.Server_VendorServerInfo);