Skip to content

Commit d424e6f

Browse files
harmish-modialexweav
authored andcommitted
Fix CAR-724333, Provide examples in OPC UA swagger document.
1 parent 7c0f82d commit d424e6f

File tree

1 file changed

+151
-12
lines changed

1 file changed

+151
-12
lines changed

opcclient/niopcclient.yml

Lines changed: 151 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ paths:
145145
type: array
146146
items:
147147
type: string
148+
example: ["NI SystemLink OPC UA Connector (1FA889F76A1DEE5DAB2B5880CC6BFE248F12A8EB).der", "zc39017b236b8b67785c4a1b"]
148149
responses:
149150
200:
150151
description: Partial success
@@ -238,6 +239,11 @@ paths:
238239
default: false
239240
description: If set to true it will remove tags for this session's monitored items from taghistorian
240241
required: [sessionId]
242+
example:
243+
- sessionId: 5c39017b236b8b67785c4a1b
244+
removeTags: false
245+
- sessionId: zc39017b236b8b67785c4a1b
246+
removeTags: false
241247
responses:
242248
200:
243249
description: Partial success
@@ -445,6 +451,7 @@ paths:
445451
type: array
446452
items:
447453
type: string
454+
example: [ "6c3907c6236b8b67785c4a1c", "zc39017b236b8b67785c4a1b" ]
448455
responses:
449456
200:
450457
description: Partial success
@@ -476,6 +483,7 @@ paths:
476483
type: array
477484
items:
478485
type: string
486+
example: [ "6c3907c6236b8b67785c4a1c", "zc39017b236b8b67785c4a1b" ]
479487
responses:
480488
200:
481489
description: Partial success
@@ -545,6 +553,23 @@ definitions:
545553
type: array
546554
items:
547555
$ref: '#/definitions/SessionUserToken'
556+
example:
557+
securityMode: "SIGN_AND_ENCRYPT"
558+
securityPolicy: "Basic256Sha256"
559+
certificateInfo:
560+
id: null
561+
name: ""
562+
isCertificateTrusted: true
563+
issuerName: "[email protected], OU=OPC UA, O=One-Way Automation, L=Edmonton, S=Alberta, C=CA, DC=opcuaserver.com"
564+
subjectName: "[email protected], OU=OPC UA, O=One-Way Automation, L=Edmonton, S=Alberta, C=CA, DC=opcuaserver.com"
565+
thumbprint: "83A0C843ECC0D3EA7C858CC76D671DC14E2A2DE4"
566+
validFrom: "1/24/2018 5:29:36 PM"
567+
validTo: "1/23/2023 5:29:36 PM"
568+
supportedUserIdentities:
569+
- tokenType: "USERNAME"
570+
userTokenSecurityPolicy: "http://opcfoundation.org/UA/SecurityPolicy#Basic256"
571+
- tokenType: "ANONYMOUS"
572+
userTokenSecurityPolicy: null
548573

549574
SslCertificateInfoModel:
550575
type: object
@@ -574,6 +599,15 @@ definitions:
574599
isCertificateTrusted:
575600
type: boolean
576601
description: 'true, if the certificate is trusted by the SystemLink server'
602+
example:
603+
id: "NI SystemLink OPC UA Connector [1FA889F76A1DEE5DAB2B5880CC6BFE248F12A8EB].der"
604+
name: "NI SystemLink OPC UA Connector [1FA889F76A1DEE5DAB2B5880CC6BFE248F12A8EB].der"
605+
isCertificateTrusted: true
606+
issuerName: "CN=NI SystemLink OPC UA Connector"
607+
subjectName: "CN=NI SystemLink OPC UA Connector"
608+
thumbprint: "1FA889F76A1DEE5DAB2B5880CC6BFE248F12A8EB"
609+
validFrom: "10/31/2018 4:59:04 PM"
610+
validTo: "10/31/2019 4:59:04 PM"
577611

578612
SessionUserToken:
579613
type: object
@@ -584,6 +618,9 @@ definitions:
584618
userTokenSecurityPolicy:
585619
type: string
586620
description: Security policy to use when communicating the user identification information
621+
example:
622+
tokenType: USERNAME
623+
userTokenSecurityPolicy: "http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256"
587624

588625
NewSessionRequest:
589626
type: object
@@ -610,6 +647,18 @@ definitions:
610647
- url
611648
- useDiscoveryCertificate
612649
- endpoint
650+
example:
651+
name: "opcuaserver.com-48010"
652+
url: "opc.tcp://opcuaserver.com:48010"
653+
monitoringInterval: 10000
654+
useDiscoveryCertificate: true
655+
endpoint:
656+
securityMode: "SIGN"
657+
securityPolicy: "Basic256"
658+
userTokenSecurityPolicy: "http://opcfoundation.org/UA/SecurityPolicy#Basic256"
659+
tokenType: "USERNAME"
660+
userName: "admin"
661+
password: "admin"
613662

614663
SelectedEndpointModel:
615664
type: object
@@ -643,6 +692,14 @@ definitions:
643692
- securityMode
644693
- securityPolicy
645694
- tokenType
695+
example:
696+
securityMode: "SIGN"
697+
securityPolicy: "Basic256"
698+
userTokenSecurityPolicy: "http://opcfoundation.org/UA/SecurityPolicy#Basic256"
699+
tokenType: "USERNAME"
700+
userName: "admin"
701+
password: ""
702+
x509CertificateData: ""
646703

647704
UpdateSessionRequest:
648705
type: object
@@ -661,6 +718,13 @@ definitions:
661718
- sessionId
662719
- name
663720
- monitoringInterval
721+
example:
722+
- sessionId: 5c39017b236b8b67785c4a1b
723+
name: "Renamed.opcuaserver.com-48010"
724+
monitoringInterval: 5000
725+
- sessionId: zc39017b236b8b67785c4a1b
726+
name: "Renamed.opcuaserver.com-48011"
727+
monitoringInterval: 5000
664728

665729
SessionResponse:
666730
type: object
@@ -690,6 +754,31 @@ definitions:
690754
$ref: '#/definitions/SslCertificateInfoModel'
691755
endpoint:
692756
$ref: '#/definitions/SelectedEndpointModel'
757+
example:
758+
id: "5c39017b236b8b67785c4a1b"
759+
name: "opcuaserver.com-48010"
760+
url: "opc.tcp://opcuaserver.com:48010"
761+
state: "CONNECTED"
762+
monitoringInterval: 10000
763+
numberOfMonitoredItems: 0
764+
useDiscoveryCertificate: true
765+
certificateInfo:
766+
id: null
767+
name: "18d48415-13a8-4867-9791-b7b7b4551de9.der"
768+
isCertificateTrusted: true
769+
issuerName: "[email protected], OU=OPC UA, O=One-Way Automation, L=Edmonton, S=Alberta, C=CA, DC=opcuaserver.com"
770+
subjectName: "[email protected], OU=OPC UA, O=One-Way Automation, L=Edmonton, S=Alberta, C=CA, DC=opcuaserver.com"
771+
thumbprint: "83A0C843ECC0D3EA7C858CC76D671DC14E2A2DE4"
772+
validFrom: "1/24/2018 5:29:36 PM"
773+
validTo: "1/23/2023 5:29:36 PM"
774+
endpoint:
775+
securityMode: "SIGN"
776+
securityPolicy: "Basic256"
777+
userTokenSecurityPolicy: "http://opcfoundation.org/UA/SecurityPolicy#Basic256"
778+
tokenType: "USERNAME"
779+
userName: "admin"
780+
password: ""
781+
x509CertificateData: ""
693782

694783
OpcNode:
695784
type: object
@@ -712,6 +801,22 @@ definitions:
712801
description: child nodes of the node
713802
items:
714803
$ref: '#/definitions/OpcNode'
804+
example:
805+
id: "i=87"
806+
displayName: "Views"
807+
browsePath: "/Views"
808+
isLeaf: false
809+
opcNodes:
810+
- browsePath: "/Views/3:AirConditionerView"
811+
displayName: "AirConditionerView"
812+
id: "ns=3;i=5000"
813+
isLeaf: false
814+
opcNodes: []
815+
- browsePath: "/Views/3:FurnaceView"
816+
displayName: "FurnaceView"
817+
id: "ns=3;i=5001"
818+
isLeaf: false
819+
opcNodes: []
715820

716821
ReadAttributesResponse:
717822
type: object
@@ -725,6 +830,18 @@ definitions:
725830
isCompatibleForTag:
726831
type: boolean
727832
description: 'If set to true, a monitor can be created for this node'
833+
example:
834+
attributes:
835+
BrowseName: "3:AirConditionerView"
836+
ContainsNoLoops: "True"
837+
Description: "View containing the AirConditioner objects"
838+
DisplayName: "AirConditionerView"
839+
EventNotifier: "None"
840+
NodeClass: "View"
841+
NodeId: "ns=3;i=5000"
842+
UserWriteMask: "0"
843+
WriteMask: "0"
844+
isCompatibleForTag: false
728845

729846
NewMonitoredItem:
730847
type: object
@@ -752,6 +869,12 @@ definitions:
752869
required:
753870
- displayName
754871
- opcNodeId
872+
example:
873+
displayname: "opc.opcuaserver.com-48010.Views.AirConditionerView.AirConditioner_1.Temperature"
874+
opcNodeId: "ns=3;s=AirConditioner_1.Temperature"
875+
direction: "Read"
876+
opcSamplingInterval: 1000
877+
opcQueueSize: 1000
755878

756879
MonitoredItemResponse:
757880
type: object
@@ -781,6 +904,16 @@ definitions:
781904
description: Queue size that the OPC server should reserve for this node
782905
state:
783906
$ref: '#/definitions/MonitoredItemStateEnum'
907+
example:
908+
id: "6c3907c6236b8b67785c4a1c"
909+
sessionId: "5c39017b236b8b67785c4a1b"
910+
dataType: "DOUBLE"
911+
displayName: "opc.opcuaserver.com-48010.Views.AirConditionerView.AirConditioner_1.Temperature"
912+
opcNodeId: "ns=3;s=AirConditioner_1.Temperature"
913+
direction: "READ"
914+
opcSamplingInterval: 1000
915+
opcQueueSize: 1000
916+
state: "MONITORING"
784917

785918
MonitoredItemDeleteData:
786919
type: object
@@ -795,6 +928,11 @@ definitions:
795928
default: false
796929
required:
797930
- id
931+
example:
932+
- id: "6c3907c6236b8b67785c4a1c"
933+
removeTag: false
934+
- id: "zc39017b236b8b67785c4a1b"
935+
removeTag: false
798936

799937
Error:
800938
description: Contains error information
@@ -824,18 +962,18 @@ definitions:
824962
type: array
825963
items:
826964
$ref: '#/definitions/Error'
827-
example:
828-
name: Skyline.OneOrMoreErrorsOccurred
829-
code: -251040
830-
message: One or more errors occurred. See the contained list for details of each error.
831-
args: []
832-
innerErrors:
833-
- name: OpcClientErrorCodes.OpcServerNotFound
834-
code: -251608
835-
resourceType: session
836-
resourceId: '4afb2ce3741fe11d88838cc9'
837-
message: OpcServer connection does not exist.
838-
args: ['4afb2ce3741fe11d88838cc9']
965+
example:
966+
name: Skyline.OneOrMoreErrorsOccurred
967+
code: -251040
968+
message: One or more errors occurred. See the contained list for details of each error.
969+
args: []
970+
innerErrors:
971+
- name: OpcClientErrorCodes.ResourceNotFound
972+
code: -251608
973+
resourceType: <resource_type>
974+
resourceId: 'zc39017b236b8b67785c4a1b'
975+
message: Resource with id 'zc39017b236b8b67785c4a1b' is not found.
976+
args: ['zc39017b236b8b67785c4a1b']
839977

840978
PartialSuccess:
841979
description: Partial success response
@@ -845,6 +983,7 @@ definitions:
845983
type: array
846984
items:
847985
type: string
986+
example: zc39017b236b8b67785c4a1b
848987
error:
849988
$ref: '#/definitions/Error'
850989

0 commit comments

Comments
 (0)