You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2018/08/15 13:32:31 UTC
svn commit: r1838090 - in /uima/uima-ducc/trunk/src/main/scripts:
ducc_base.py ducc_job_specification.py ducc_service_specification.py
ducc_service_status.py
Author: degenaro
Date: Wed Aug 15 13:32:31 2018
New Revision: 1838090
URL: http://svn.apache.org/viewvc?rev=1838090&view=rev
Log:
UIMA-5770 DUCC user commands to retrieve job specification, service specification & get service status
- revise DuccBase to reliably provide WS host
- use DuccBase provided WS host as default WS host for these user scripts
Modified:
uima/uima-ducc/trunk/src/main/scripts/ducc_base.py
uima/uima-ducc/trunk/src/main/scripts/ducc_job_specification.py
uima/uima-ducc/trunk/src/main/scripts/ducc_service_specification.py
uima/uima-ducc/trunk/src/main/scripts/ducc_service_status.py
Modified: uima/uima-ducc/trunk/src/main/scripts/ducc_base.py
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/scripts/ducc_base.py?rev=1838090&r1=1838089&r2=1838090&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/scripts/ducc_base.py (original)
+++ uima/uima-ducc/trunk/src/main/scripts/ducc_base.py Wed Aug 15 13:32:31 2018
@@ -60,6 +60,9 @@ class DuccBase:
self.ducc_properties.load(self.propsfile)
self.webserver_node = self.ducc_properties.get('ducc.ws.node')
+ if ( self.webserver_node == None ):
+ self.webserver_node = self.ducc_properties.get('ducc.head')
+
self.jvm = self.ducc_properties.get('ducc.jvm')
def java(self):
Modified: uima/uima-ducc/trunk/src/main/scripts/ducc_job_specification.py
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/scripts/ducc_job_specification.py?rev=1838090&r1=1838089&r2=1838090&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/scripts/ducc_job_specification.py (original)
+++ uima/uima-ducc/trunk/src/main/scripts/ducc_job_specification.py Wed Aug 15 13:32:31 2018
@@ -27,6 +27,8 @@ import urllib2
from optparse import OptionParser
from HTMLParser import HTMLParser
+from ducc_base import DuccBase
+
message = 'Python 2.7 or greater is required.'
sysinfo = sys.version_info
if(sysinfo[0] < 2):
@@ -80,14 +82,14 @@ class DuccServiceDeploymentsTabHTMLParse
job_spec_value = job_spec_value+' '+data
#print("Encountered some data :", str(row), str(column), data)
-class DuccServiceStatus():
+class DuccServiceStatus(DuccBase):
# parse command line
def parse_cmdline(self):
global options
parser = OptionParser()
parser.add_option('--scheme', action='store', dest='scheme', default='http', help='default = http')
- parser.add_option('--host', action='store', dest='host', default=None, help='required (no default)')
+ parser.add_option('--host', action='store', dest='host', default=self.webserver_node, help='default = '+self.webserver_node)
parser.add_option('--port', action='store', dest='port', default='42133', help='default = 42133')
parser.add_option('--id', action='store', dest='id', default=None, help='required (no default)')
parser.add_option('--provider', action='store_true', dest='provider', default=False, help='display provider (optional)')
Modified: uima/uima-ducc/trunk/src/main/scripts/ducc_service_specification.py
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/scripts/ducc_service_specification.py?rev=1838090&r1=1838089&r2=1838090&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/scripts/ducc_service_specification.py (original)
+++ uima/uima-ducc/trunk/src/main/scripts/ducc_service_specification.py Wed Aug 15 13:32:31 2018
@@ -27,6 +27,8 @@ import urllib2
from optparse import OptionParser
from HTMLParser import HTMLParser
+from ducc_base import DuccBase
+
message = 'Python 2.7 or greater is required.'
sysinfo = sys.version_info
if(sysinfo[0] < 2):
@@ -106,14 +108,14 @@ class DuccServiceDeploymentsTabHTMLParse
#print('Encountered some data :', str(row), str(column), data)
-class DuccServiceStatus():
+class DuccServiceStatus(DuccBase):
# parse command line
def parse_cmdline(self):
global options
parser = OptionParser()
parser.add_option('--scheme', action='store', dest='scheme', default='http', help='default = http')
- parser.add_option('--host', action='store', dest='host', default=None, help='required (no default)')
+ parser.add_option('--host', action='store', dest='host', default=self.webserver_node, help='default = '+self.webserver_node)
parser.add_option('--port', action='store', dest='port', default='42133', help='default = 42133')
parser.add_option('--name', action='store', dest='name', default=None, help='required (no default)')
parser.add_option('--provider', action='store_true', dest='provider', default=False, help='display provider (optional)')
Modified: uima/uima-ducc/trunk/src/main/scripts/ducc_service_status.py
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/src/main/scripts/ducc_service_status.py?rev=1838090&r1=1838089&r2=1838090&view=diff
==============================================================================
--- uima/uima-ducc/trunk/src/main/scripts/ducc_service_status.py (original)
+++ uima/uima-ducc/trunk/src/main/scripts/ducc_service_status.py Wed Aug 15 13:32:31 2018
@@ -27,6 +27,8 @@ import urllib2
from optparse import OptionParser
from HTMLParser import HTMLParser
+from ducc_base import DuccBase
+
row = 0
column = 0
@@ -62,14 +64,14 @@ class DuccServiceDeploymentsTabHTMLParse
pass
#print("Encountered some data :", str(row), str(column), data)
-class DuccServiceStatus():
+class DuccServiceStatus(DuccBase):
# parse command line
def parse_cmdline(self):
global options
parser = OptionParser()
parser.add_option('--scheme', action='store', dest='scheme', default='http', help='default = http')
- parser.add_option('--host', action='store', dest='host', default=None, help='required (no default)')
+ parser.add_option('--host', action='store', dest='host', default=self.webserver_node, help='default = '+self.webserver_node)
parser.add_option('--port', action='store', dest='port', default='42133', help='default = 42133')
parser.add_option('--name', action='store', dest='name', default=None, help='required (no default)')
(options, args) = parser.parse_args()