OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4460 #4424 Adding Exit() to the gRPC interface plus implemented test framework

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-06-04 12:59:06 +02:00
parent 930abbf02f
commit 3530c8b3de
17 changed files with 146 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/GrpcInterface/Python/rips/AppInfo.py → ApplicationCode/GrpcInterface/Python/rips/App.py
View File

@@ -6,14 +6,14 @@ sys.path.insert(1, os.path.join(sys.path[0], '../generated'))
from Empty_pb2 import Empty
import AppInfo_pb2
import AppInfo_pb2_grpc
import App_pb2
import App_pb2_grpc
class AppInfo:
class App:
def __init__(self, channel):
self.appInfo = AppInfo_pb2_grpc.AppInfoStub(channel)
self.app = App_pb2_grpc.AppStub(channel)
def versionMessage(self):
return self.appInfo.GetVersion(Empty())
return self.app.GetVersion(Empty())
def majorVersion(self):
return self.versionMessage().major_version
def minorVersion(self):
@@ -22,4 +22,5 @@ class AppInfo:
return self.versionMessage().patch_version
def versionString(self):
return str(self.majorVersion()) + "." + str(self.minorVersion()) + "." + str(self.patchVersion())
def exit(self):
return self.app.Exit(Empty())

2
ApplicationCode/GrpcInterface/Python/rips/Case.py
View File

@@ -20,7 +20,7 @@ class Case:
self.type = info.type
self.properties = Properties(self)
self.request = Case_pb2.CaseRequest(id=self.id)
def gridCount(self):
try:
return self.stub.GetGridCount(self.request).count

8
ApplicationCode/GrpcInterface/Python/rips/Instance.py
View File

@@ -8,7 +8,7 @@ sys.path.insert(1, os.path.join(sys.path[0], '../generated'))
import RiaVersionInfo
from .AppInfo import AppInfo
from .App import App
from .Commands import Commands
from .Project import Project
@@ -60,10 +60,10 @@ class Instance:
self.channel = grpc.insecure_channel(location)
# Main version check package
self.appInfo = AppInfo(self.channel)
self.app = App(self.channel)
try:
majorVersionOk = self.appInfo.majorVersion() == int(RiaVersionInfo.RESINSIGHT_MAJOR_VERSION)
minorVersionOk = self.appInfo.minorVersion() == int(RiaVersionInfo.RESINSIGHT_MINOR_VERSION)
majorVersionOk = self.app.majorVersion() == int(RiaVersionInfo.RESINSIGHT_MAJOR_VERSION)
minorVersionOk = self.app.minorVersion() == int(RiaVersionInfo.RESINSIGHT_MINOR_VERSION)
if not (majorVersionOk and minorVersionOk):
raise Exception('Version of ResInsight does not match version of Python API')
except grpc.RpcError as e:

4
ApplicationCode/GrpcInterface/Python/rips/Project.py
View File

@@ -44,3 +44,7 @@ class Project:
return case
except grpc.RpcError as e:
return None
def loadCase(self, path):
return Commands(self.channel).loadCase(path)