Commit 3191c580 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Modified initial redis rpc classes. 



Signed-off-by: default avatarCristiano Urban <cristiano.urban@inaf.it>
parent 0de22e29

client/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -32,4 +32,4 @@ USER client 
WORKDIR /home/client/



# Install python dependencies

RUN pip3.9 install --no-cache-dir pika tabulate
 
RUN pip3.9 install --no-cache-dir redis tabulate

client/config/vos_cli.conf

+6 −4
Original line number Diff line number Diff line 
[server]

; hostname or IP address of the machine that hosts the RabbitMQ message broker

host = rabbitmq

; port at which the broker is available, default is 5672 TCP

port = 5672

; hostname or IP address of the machine that hosts Redis

host = job_cache

; port at which Redis is available, default is 6379 TCP

port = 6379

; Redis db index, default is 0

db = 0



[vos_data]

rpc_queue = data_queue

client/vos_data

100755 → 100644
+5 −3
Original line number Diff line number Diff line
@@ -2,21 +2,22 @@ 


import sys



from amqp_client import AMQPClient

from redis_rpc_client import RedisRpcClient

from config import Config

from tabulate import tabulate





class VOSData(AMQPClient):

class VOSData(RedisRpcClient):



    def __init__(self):

        config = Config("/etc/vos_cli/vos_cli.conf")

        self.params = config.loadSection("server")

        self.host = self.params["host"]

        self.port = self.params.getint("port")

        self.db = self.params.getint("db")

        self.params = config.loadSection("vos_data")

        self.rpcQueue = self.params["rpc_queue"]

        super(VOSData, self).__init__(self.host, self.port, self.rpcQueue)

        super(VOSData, self).__init__(self.host, self.port, self.db, self.rpcQueue)



    def help(self):

        sys.exit("""
@@ -122,3 +123,4 @@ if cmd == "cstore" or cmd == "hstore": 
    vosDataCli.store(cmd, username)

else:

    vosDataCli.help()

client/vos_import

+4 −3
Original line number Diff line number Diff line
@@ -3,20 +3,21 @@ 
import os

import sys



from amqp_client import AMQPClient

from redis_rpc_client import RedisRpcClient

from config import Config





class VOSImport(AMQPClient):

class VOSImport(RedisRpcClient):



    def __init__(self):

        config = Config("/etc/vos_cli/vos_cli.conf")

        self.params = config.loadSection("server")

        self.host = self.params["host"]

        self.port = self.params.getint("port")

        self.db = self.params.getint("db")

        self.params = config.loadSection("vos_import")

        self.rpcQueue = self.params["rpc_queue"]

        super(VOSImport, self).__init__(self.host, self.port, self.rpcQueue)

        super(VOSImport, self).__init__(self.host, self.port, self.db, self.rpcQueue)



    def load(self, path, username):

        importRequest = { "requestType": "NODE_IMPORT", "path": path, "userName": username }

client/vos_job

+5 −4
Original line number Diff line number Diff line
@@ -3,22 +3,23 @@ 
import json

import sys



from amqp_client import AMQPClient

from redis_rpc_client import RedisRpcClient

from config import Config

from tabulate import tabulate





class VOSJob(AMQPClient):

class VOSJob(RedisRpcClient):



    def __init__(self):

        config = Config("/etc/vos_cli/vos_cli.conf")

        self.params = config.loadSection("server")

        self.host = self.params["host"]

        self.port = self.params.getint("port")

        self.db = self.params.getint("db")

        self.params = config.loadSection("vos_job")

        self.rpcQueue = self.params["rpc_queue"]

        self.jobPhases = ("pending", "queued", "executing", "completed", "error")

        super(VOSJob, self).__init__(self.host, self.port, self.rpcQueue)

        super(VOSJob, self).__init__(self.host, self.port, self.db, self.rpcQueue)



    def listJobs(self, jobPhase = ""):

        if not jobPhase:
@@ -90,7 +91,7 @@ NAME 
    vos_job



SYNOPSYS

    vos_data COMMAND [ARGUMENT]

    vos_job COMMAND [ARGUMENT]



DESCRIPTION

    Client tool to obtain information about jobs.