Updating all Dev3.7 code to master

.gitignore

@@ -0,0 +1,75 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+*.bak
+temp
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser

LICENSE

@@ -0,0 +1,15 @@
+   Copyright 2021 National Technology & Engineering Solutions of Sandia, LLC (NTESS). 
+   Under the terms of Contract DE-NA0003525 with NTESS, the U.S. Government retains 
+   certain rights in this software.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Lib/svpdnp3/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.9.4'

Lib/svpdnp3/device_der_dnp3.py

@@ -0,0 +1,136 @@
+''' This code sits in the svpdnp3 lib of the SVP Directory.
+    The script defines different methods that can be called by the
+    SVP scripts to send requests to the DNP3 Agent.
+'''
+
+import socket
+import json
+import logging
+import sys
+import subprocess
+import os
+from os import path
+
+''' agent API definitions '''
+
+STXB = b'\x02'
+ETXB = b'\x03'
+STX = STXB[0]
+ETX = ETXB[0]
+
+OP_READ = 'read'
+OP_WRITE = 'write'
+OP_STATUS = 'status'
+OP_ADD = 'add'
+OP_SCAN = 'scan'
+OP_DEL = 'delete'
+OP_STOP = 'stop'
+
+stdout_stream = logging.StreamHandler(sys.stdout)
+stdout_stream.setFormatter(logging.Formatter('%(asctime)s\t%(name)s\t%(levelname)s\t%(message)s'))
+
+_log = logging.getLogger(__name__)
+_log.addHandler(stdout_stream)
+_log.setLevel(logging.DEBUG)
+
+class AgentClient():
+
+    ''' This class creates a TCP Client which sends requests
+        to the TCP server in the DNP3 Agent. The request is a
+        JSON encoded object of the format:
+
+        request_body = {'oid': oid,
+                        'op': op,
+                        'rid': rid,
+                        'params': params}
+    '''
+
+    def __init__(self, ip_addr=None, ip_port=None):
+        self.ip_addr = ip_addr
+        self.ip_port = ip_port
+        self.socket = None
+
+    def connect(self, ip_addr=None, ip_port=None):
+        if ip_addr is not None:
+            self.ip_addr = ip_addr
+        if ip_port is not None:
+            self.ip_port = ip_port
+
+        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.socket.connect((self.ip_addr, self.ip_port))
+
+    def status(self, rid=None):
+        ''' Request to return the status for agent and each active outstation '''
+
+        resp = self.request(op=OP_STATUS, rid=rid)
+
+        return resp
+
+    def stop_agent(self, rid=None):
+        ''' Request to stop the agent from listening further requests '''
+
+        resp = self.request(op=OP_STOP, rid=rid)
+
+        return resp
+
+    def add_outstation(self, ipaddr=None, ipport=None, outstation_addr=None, master_addr=None, scan_time=None):
+        ''' Request to add an outstation with the given configuration '''
+
+        params = {'ipaddr': ipaddr,
+                  'ipport': ipport,
+                  'outstation_addr': outstation_addr,
+                  'master_addr': master_addr,
+                  'scan_time': scan_time}
+        resp = self.request(op=OP_ADD, params=params)
+
+        return resp
+
+    def read_outstation(self, oid, rid=None, points=None):
+        ''' Request to read the points from an outstation with the given oid '''
+
+        params = {'points': points}
+        resp = self.request(oid=oid, op=OP_READ, rid=rid, params=params)
+
+        return resp
+
+    def write_outstation(self, oid, rid=None, points=None):
+        ''' Request to write data points of the outstation with the given oid '''
+
+        params = {'points': points}
+        resp = self.request(oid=oid, op=OP_WRITE, rid=rid, params=params)
+
+        return resp
+
+    def scan_outstation(self, oid, rid=None, scan_type=None):
+        ''' Request to perform a specific scan on an outstation with the given oid '''
+
+        params = {'scan_type': scan_type}
+        resp = self.request(oid=oid, op=OP_SCAN, rid=rid, params=params)
+
+        return resp
+
+    def delete_outstation(self, oid, rid=None):
+        ''' Request to delete the outstation with the given oid '''
+
+        params = {}
+        resp = self.request(oid=oid, op=OP_DEL, rid=rid, params=params)
+
+        return resp
+
+    def request(self, oid=None, op=OP_READ, rid=None, params=None):
+        ''' This method creates the request and sends it to the agent '''
+
+        req = {'oid': oid,
+               'op': op,
+               'rid': rid,
+               'params': params}
+
+        req_msg = b''.join([STXB, json.dumps(req).encode(), ETXB])
+
+        if self.socket:
+            self.socket.send(req_msg)
+
+            data = self.socket.recv(32768)
+            print('%s: received "%s"' % (self.socket.getsockname(), data))
+
+        return data