1)removed unnecessary files from repository

2)fixed bug in checking update of data-base

4 files changed, 2 insertions, 641 deletions

diff --git a/scripts/automation/trex_control_plane/stl/examples/scapy_server.py b/scripts/automation/trex_control_plane/stl/examples/scapy_server.py
deleted file mode 100755
index 55f7cb54..00000000
--- a/scripts/automation/trex_control_plane/stl/examples/scapy_server.py
+++ /dev/null
@@ -1,277 +0,0 @@
-import stl_path
-import trex_stl_lib
-from trex_stl_lib.api import *
-from copy import deepcopy
-import sys
-import tempfile
-import md5
-
-#print ls()
-
-from cStringIO import StringIO
-import sys
-"""
-old_stdout = sys.stdout
-sys.stdout = mystdout = StringIO()
-
-ls()
-
-sys.stdout = old_stdout
-
-a= mystdout.getvalue()
-
-f = open('scapy_supported_formats.txt','w')
-f.write(a)
-f.close()
-"""
-#-------------------------------------------------------TREE IMPLEMENTATION ------------------------
-class node(object):
-    def __init__(self, value):#, children = []):
-        self.value = value
-        self.children = []
-
-    def __str__(self, level=0):
-        ret = "\t"*level+repr(self.value)+"\n"
-        for child in self.children:
-            ret += child.__str__(level+1)
-        return ret
-#----------------------------------------------------------------------------------------------------
-
-
-def build_lib():
-    lib = protocol_struct()
-    lib = lib.split('\n')
-    all_protocols=[]
-    for entry in lib:
-        entry = entry.split(':')
-        all_protocols.append(entry[0].strip())
-    del all_protocols[len(all_protocols)-1]
-    return all_protocols
-
-def protocol_struct(protocol=''):
-    if '_' in protocol:
-        return []
-    if not protocol=='':
-        if protocol not in all_protocols:
-            return 'protocol not supported'
-        protocol = eval(protocol)
-    old_stdout = sys.stdout
-    sys.stdout = mystdout = StringIO()
-    if not protocol=='':
-        ls(protocol)
-    else:
-        ls()
-    sys.stdout = old_stdout
-    a= mystdout.getvalue()
-#   print a
-    return a
-
-def parse_description_line(line):
-    line_arr = [x.strip() for x in re.split(': | = ',line)]
-    return tuple(line_arr)
-
-def parse_entire_description(d):
-    d = d.split('\n')
-    description_list = [parse_description_line(x) for x in d]
-    del description_list[len(description_list)-1]
-    return description_list
-
-def get_protocol_details(p_name):
-    protocol_str = protocol_struct(p_name)
-    if protocol_str=='protocol not supported':
-        return 'protocol not supported'
-    if len(protocol_str) is 0:
-        return []
-    tupled_protocol = parse_entire_description(protocol_str)
-    return tupled_protocol
-
-
-class scapyRegex:
-    def __init__(self,FieldName,regex='empty'):
-        self.FieldName = FieldName
-        self.regex = regex
-
-    def stringRegex(self):
-        return self.regex
-
-all_protocols = build_lib()
-
-Raw = {'Raw':''}
-high_level_protocols = ['Raw']
-transport_protocols = {'TCP':Raw,'UDP':Raw}
-network_protocols = {'IP':transport_protocols ,'ARP':''}
-low_level_protocols = { 'Ether': network_protocols }
-regexDB= {'MACField' : scapyRegex('MACField','^([0-9a-fA-F][0-9a-fA-F]:){5}([0-9a-fA-F][0-9a-fA-F])$'),
-          'IPField' : scapyRegex('IPField','^(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])$')}
-
-
-def build_nodes(data,dictionary):
-    n = node(data)
-    if len(dictionary)==0:
-        n.children=[]
-        return n
-    for obj in dictionary.keys():
-        if not (obj==''):
-            x = build_nodes(obj,dictionary[obj])
-            n.children.append(x)
-    return n
-
-def build_tree():
-    root = node('ALL')
-    root.children = []
-    root = build_nodes('ALL',low_level_protocols)
-    return root
-
-protocol_tree = build_tree()
-
-def print_tree(root,level=0):
-    output = "\t"*level+str(root.value)
-    print output
-    if len(root.children)==0:
-        return
-    for child in root.children:
-        print_tree(child,level+1)
-
-def get_all_protocols():
-    return json.dumps(all_protocols)
-
-def get_tree():
-    old_stdout = sys.stdout
-    sys.stdout = mystdout = StringIO()
-    print_tree(t)
-    sys.stdout = old_stdout
-    a= mystdout.getvalue()
-    return json.dumps(a)
-
-def get_all_db():
-    db = {}
-    for pro in all_protocols:
-        details = get_protocol_details(pro)
-        db[pro] = json.dumps(details)
-    return db
-
-def get_all_fields():
-    fields = []
-    for pro in all_protocols:
-        details = get_protocol_details(pro)
-        for i in range(0,len(details),1):
-            if len(details[i]) is 3:
-                fields.append(details[i][1])
-    uniqeFields = list(set(fields))
-    fieldDict = {}
-    for f in uniqeFields:
-        if f in regexDB:
-            fieldDict[f] = regexDB[f].stringRegex()
-        else:
-            fieldDict[f] = scapyRegex(f).stringRegex()
-    return fieldDict
-
-
-class pktResult:
-    def __init__(self,result,errorCode,errorDesc):
-        self.result = result
-        self.errorCode = errorCode
-        self.errorDesc = errorDesc
-    
-    def convert2tuple(self):
-        return tuple([self.result,self.errorCode,self.errorDesc])
-
-
-
-# pkt_descriptor in JSON format only!
-# returned tuple in JSON format: (pktResultTuple , show2data, hexdump(buffer))
-# pktResultTuple is: ( result, errorCode, error description )
-
-def build_pkt(pkt_descriptor):
-    try:
-        pkt = eval(json.loads(pkt_descriptor))
-        old_stdout = sys.stdout
-        sys.stdout = mystdout = StringIO()
-        pkt.show2()
-        sys.stdout = old_stdout
-        show2data = mystdout.getvalue() #show2 data
-        bufferData = str(pkt) #pkt buffer
-        bufferData = bufferData.encode('base64')
-        pktRes = pktResult('Success',0,'None').convert2tuple()
-        res = [pktRes,json.dumps(show2data),json.dumps(bufferData)]
-        JSONres = json.dumps(res)
-        return JSONres
-    except:
-        pktRes = pktResult('Pkt build Failed',str(sys.exc_info()[0]),str(sys.exc_info()[1])).convert2tuple()
-        res = [pktRes,[],[]]
-        res = json.dumps(res)
-        return res
-
-#input: container
-#output: md5 in json format encoded in base64
-def getMD5(container):
-    resMD5 = md5.new(json.dumps(container))
-    resMD5 = json.dumps(resMD5.digest().encode('base64'))
-    return resMD5
-
-
-def get_all():
-    fields=get_all_fields()
-    db=get_all_db()
-    fieldMD5 = getMD5(fields)
-    dbMD5 = getMD5(db)
-    res = {}
-    res['db'] = db
-    res['fields'] = fields
-    res['DB_md5'] = dbMD5
-#   print dbMD5
-    res['fields_md5'] = fieldMD5
-    return json.dumps(res)
-
-#input in json string encoded base64
-def check_update(dbMD5,fieldMD5):
-    fields=get_all_fields()
-    db=get_all_db()
-    currentDBMD5 = json.loads(getMD5(db))
-    currentFieldMD5 = json.loads(getMD5(fields))
-    dbMD5_parsed = json.loads(dbMD5)
-    fieldMD5_parsed = json.loads(fieldMD5)
-    res = []
-#   print 'this is current DB MD5: %s ' % currentDBMD5
-#   print 'this is given DB MD5: %s ' % dbMD5_parsed
-    if fieldMD5_parsed == currentFieldMD5:
-        resField = pktResult('Success',0,'None').convert2tuple()
-    else:
-        resField = pktResult('Fail',-1,'Field DB is not up to date').convert2tuple()
-    if dbMD5_parsed == currentDBMD5:
-        resDB = pktResult('Success',0,'None').convert2tuple()
-    else:
-        resDB = pktResult('Fail',-1,'Protocol DB is not up to date').convert2tuple()
-    return json.dumps([resField,resDB])
-
-#pkt_desc as json
-#dictionary of offsets per protocol. tuple for each field: (name, offset, size) at json format
-def get_all_pkt_offsets(pkt_desc):
-    pkt_desc= json.loads(pkt_desc)
-    try:
-        pkt_protocols = pkt_desc.split('/')
-        scapy_pkt = eval(pkt_desc)
-        total_protocols = len(pkt_protocols)
-        res = {}
-        for i in range(total_protocols):
-            fields = []
-            for field in scapy_pkt.fields_desc:
-                size = field.get_size_bytes()
-                if field.name is 'load':
-                    size = len(scapy_pkt)
-                fields.append([field.name, field.offset, size])
-            res[pkt_protocols[i]] = fields
-            scapy_pkt=scapy_pkt.payload
-        pktRes = pktResult('Success',0,'None').convert2tuple()
-        FinalRes = [pktRes,res]
-        return json.dumps(FinalRes)
-    except:
-        pktRes = pktResult('Pkt build Failed',str(sys.exc_info()[0]),str(sys.exc_info()[1])).convert2tuple()
-        res = [pktRes,{}]
-        res = json.dumps(res)
-        return res
-
-
-
-
-
diff --git a/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_server.py b/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_server.py
deleted file mode 100755
index 07dc7427..00000000
--- a/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_server.py
+++ /dev/null
@@ -1,240 +0,0 @@
-
-import os
-import sys
-stl_pathname = os.path.abspath(os.path.join(os.pardir, os.pardir))
-sys.path.append(stl_pathname)
-import trex_stl_lib
-from trex_stl_lib.api import *
-from copy import deepcopy
-import sys
-import tempfile
-import hashlib
-import binascii
-from pprint import pprint
-
-
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from io import StringIO
-
-"""     
-                            **** output redirection template ****
-old_stdout = sys.stdout
-sys.stdout = mystdout = StringIO()
-
-ls()
-
-sys.stdout = old_stdout
-
-a= mystdout.getvalue()
-
-f = open('scapy_supported_formats.txt','w')
-f.write(a)
-f.close()
-"""
-
-class ScapyException(Exception): pass
-
-class Scapy_service:
-
-#----------------------------------------------------------------------------------------------------
-    class scapyRegex:
-        def __init__(self,FieldName,regex='empty'):
-            self.FieldName = FieldName
-            self.regex = regex
-
-        def stringRegex(self):
-            return self.regex        
-#----------------------------------------------------------------------------------------------------
-    def __init__(self):
-        self.Raw = {'Raw':''}
-        self.high_level_protocols = ['Raw']
-        self.transport_protocols = {'TCP':self.Raw,'UDP':self.Raw}
-        self.network_protocols = {'IP':self.transport_protocols ,'ARP':''}
-        self.low_level_protocols = { 'Ether': self.network_protocols }
-        self.regexDB= {'MACField' : self.scapyRegex('MACField','^([0-9a-fA-F][0-9a-fA-F]:){5}([0-9a-fA-F][0-9a-fA-F])$'),
-              'IPField' : self.scapyRegex('IPField','^(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])$')}
-        self.all_protocols = self.build_lib()
-        self.protocol_tree = {'ALL':{'Ether':{'ARP':{},'IP':{'TCP':{'RAW':'payload'},'UDP':{'RAW':'payload'}}}}}
-    
-    def protocol_struct(self,protocol=''):
-        if '_' in protocol:
-            return []
-        if not protocol=='':
-            if protocol not in self.all_protocols:
-                return 'protocol not supported'
-            protocol = eval(protocol)
-        old_stdout = sys.stdout
-        sys.stdout = mystdout = StringIO()
-        if not protocol=='':
-            ls(protocol)
-        else:
-            ls()
-        sys.stdout = old_stdout
-        protocol_data= mystdout.getvalue()
-        return protocol_data
-
-    def build_lib(self):
-        lib = self.protocol_struct()
-        lib = lib.split('\n')
-        all_protocols=[]
-        for entry in lib:
-            entry = entry.split(':')
-            all_protocols.append(entry[0].strip())
-        del all_protocols[len(all_protocols)-1]
-        return all_protocols
-
-    def parse_description_line(self,line):
-        line_arr = [x.strip() for x in re.split(': | = ',line)]
-        return tuple(line_arr)
-
-    def parse_entire_description(self,description):
-        description = description.split('\n')
-        description_list = [self.parse_description_line(x) for x in description]
-        del description_list[len(description_list)-1]
-        return description_list
-
-    def get_protocol_details(self,p_name):
-        protocol_str = self.protocol_struct(p_name)
-        if protocol_str=='protocol not supported':
-            return 'protocol not supported'
-        if len(protocol_str) is 0:
-            return []
-        tupled_protocol = self.parse_entire_description(protocol_str)
-        return tupled_protocol
-
-    def print_tree(self):
-        pprint(self.protocol_tree)
-
-    def get_all_protocols(self):
-        return self.all_protocols
-
-    def get_tree(self):
-        return self.protocol_tree
-
-    def get_all_db(self):
-        db = {}
-        for pro in self.all_protocols:
-            details = self.get_protocol_details(pro)
-            db[pro] = details
-        return db
-
-    def get_all_fields(self):
-        fields = []
-        for pro in self.all_protocols:
-            details = self.get_protocol_details(pro)
-            for i in range(0,len(details),1):
-                if len(details[i]) is 3:
-                    fields.append(details[i][1])
-        uniqeFields = list(set(fields))
-        fieldDict = {}
-        for f in uniqeFields:
-            if f in self.regexDB:
-                fieldDict[f] = self.regexDB[f].stringRegex()
-            else:
-                fieldDict[f] = self.scapyRegex(f).stringRegex()
-        return fieldDict
-
-    def show2_to_dict(self,pkt):
-        old_stdout = sys.stdout
-        sys.stdout = mystdout = StringIO()
-        pkt.show2()
-        sys.stdout = old_stdout
-        show2data = mystdout.getvalue() #show2 data
-        listedShow2Data = show2data.split('###')
-        show2Dict = {}
-        for i in range(1,len(listedShow2Data)-1,2):
-            protocol_fields = listedShow2Data[i+1]
-            protocol_fields = protocol_fields.split('\n')[1:-1]
-            protocol_fields = [f.strip() for f in protocol_fields]
-            protocol_fields_dict = {}
-            for f in protocol_fields:
-                field_data = f.split('=')
-                if len(field_data)!= 1 :
-                    field_name = field_data[0].strip()
-                    protocol_fields_dict[field_name] = field_data[1].strip()
-            layer_name = re.sub(r'\W+', '',listedShow2Data[i]) #clear layer name to include only alpha-numeric
-            show2Dict[layer_name] = protocol_fields_dict
-        return show2Dict
-
-#pkt_desc as string
-#dictionary of offsets per protocol. tuple for each field: (name, offset, size) at json format
-    def get_all_pkt_offsets(self,pkt_desc):
-        pkt_protocols = pkt_desc.split('/')
-        scapy_pkt = eval(pkt_desc)
-        scapy_pkt.build()
-        total_protocols = len(pkt_protocols)
-        res = {}
-        for i in range(total_protocols):
-            fields = {}
-            for field in scapy_pkt.fields_desc:
-                size = field.get_size_bytes()
-                if field.name is 'load':
-                    size = len(scapy_pkt)
-                fields[field.name]=[field.offset, size]
-            layer_name = pkt_protocols[i].partition('(')[0] #clear layer name to include only alpha-numeric
-            layer_name = re.sub(r'\W+', '',layer_name)
-            res[layer_name] = fields
-            scapy_pkt=scapy_pkt.payload
-        return res
-
-# pkt_descriptor in string format
-
-    def build_pkt(self,pkt_descriptor):
-        pkt = eval(pkt_descriptor)
-        show2data = self.show2_to_dict(pkt)
-        bufferData = str(pkt) #pkt buffer
-        bufferData = binascii.b2a_base64(bufferData)
-        pkt_offsets = self.get_all_pkt_offsets(pkt_descriptor)
-        res = {}
-        res['show2'] = show2data
-        res['buffer'] = bufferData
-        res['offsets'] = pkt_offsets
-        return res
-
-#input: container
-#output: md5 encoded in base64
-    def get_md5(self,container):
-        container = json.dumps(container)
-        m = hashlib.md5()
-        m.update(container.encode('ascii'))
-        res_md5 = binascii.b2a_base64(m.digest())
-        return res_md5
-
-    def get_all(self):
-        fields=self.get_all_fields()
-        db=self.get_all_db()
-        fields_md5 = self.get_md5(fields)
-        db_md5 = self.get_md5(db)
-        res = {}
-        res['db'] = db
-        res['fields'] = fields
-        res['db_md5'] = db_md5
-        res['fields_md5'] = fields_md5
-        return res
-
-#input in string encoded base64
-    def check_update(self,db_md5,field_md5):
-        fields=self.get_all_fields()
-        db=self.get_all_db()
-        current_db_md5 = self.get_md5(db)
-        current_field_md5 = self.get_md5(fields)
-        res = []
-        if field_md5 == current_field_md5:
-            if db_md5 == current_db_md5:
-                return True
-            else:
-                raise ScapyException("Protocol DB is not up to date")
-        else:
-            raise ScapyException("Fields DB is not up to date")
-
-    def get_version(self):
-        return {'built_by':'itraviv','version':'v1.0'}
-
-    def supported_methods(self,method_name):
-        if method_name in dir(Scapy_service):
-            return True
-        return False
-
-
diff --git a/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py b/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py
index 6fe8dcc7..638d35f2 100755
--- a/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py
+++ b/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py
@@ -223,8 +223,8 @@ class Scapy_service:
         current_db_md5 = self.get_md5(db)
         current_field_md5 = self.get_md5(fields)
         res = []
-        if field_md5 == current_field_md5:
-            if db_md5 == current_db_md5:
+        if (field_md5.decode("base64") == current_field_md5.decode("base64")):
+            if (db_md5.decode("base64") == current_db_md5.decode("base64")):
                 return True
             else:
                 raise ScapyException("Protocol DB is not up to date")
diff --git a/scripts/automation/trex_control_plane/stl/services/scapy_server/zmq_for_scapy_server.py b/scripts/automation/trex_control_plane/stl/services/scapy_server/zmq_for_scapy_server.py
deleted file mode 100755
index 4f5fab36..00000000
--- a/scripts/automation/trex_control_plane/stl/services/scapy_server/zmq_for_scapy_server.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#

-#   Hello World server in Python

-#   Binds REP socket to tcp://*:5555

-#   Expects b"Hello" from client, replies with b"World"

-#

-

-import time

-import sys

-sys.path.append(sys.path.append('/auto/srg-sce-swinfra-usr/emb/users/itraviv/trex/trex-core/scripts/external_libs/pyzmq-14.5.0/python2/fedora18/64bit'))

-sys.path.append(sys.path.append('/auto/srg-sce-swinfra-usr/emb/users/itraviv/trex/trex-core/scripts/automation/trex_control_plane/stl/'))

-import zmq

-import inspect

-from scapy_server import *

-

-class ParseException(Exception): pass

-class InvalidRequest(Exception): pass

-class MethodNotFound(Exception): pass

-class InvalidParams(Exception): pass

-

-class Scapy_wrapper:

-    def __init__(self):

-        self.scapy_master = Scapy_service()

-

-    def parse_req_msg(self,JSON_req):

-        try:

-            req = json.loads(JSON_req)

-            req_id='null'

-            if (type(req)!= type({})):

-                raise ParseException(req_id)

-            json_rpc_keys = ['jsonrpc','id','method']

-            if ((set(req.keys())!=set(json_rpc_keys)) and (set(req.keys())!=set(json_rpc_keys+['params']))) :

-                if 'id' in req.keys():

-                    req_id = req['id']

-                raise InvalidRequest(req_id)

-            req_id = req['id']

-            if not (self.scapy_master.supported_methods(req['method'])):

-                raise MethodNotFound(req_id)

-            scapy_method = eval("self.scapy_master."+req['method'])

-            arg_num_for_method = len(inspect.getargspec(scapy_method)[0])

-            if (arg_num_for_method>1) :

-                if not ('params' in req.keys()):

-                    raise InvalidRequest(req_id)

-                params_len = len(req['params'])+1 # +1 because "self" is considered parameter in args for method

-                if not (params_len==arg_num_for_method):

-                    raise InvalidParams(req_id)

-                return req['method'],req['params'],req_id

-            else:

-                return req['method'],[],req_id

-        except ValueError:

-            raise ParseException(req_id)

-

-    def create_error_response(self,error_code,error_msg,req_id='null'):

-        return {"jsonrpc": "2.0", "error": {"code": error_code, "message:": error_msg}, "id": req_id}

-        

-    def create_success_response(self,result,req_id='null'):

-        return {"jsonrpc": "2.0", "result": result, "id": req_id }

-    

-    def get_exception(self):

-        return sys.exc_info()

-

-

-    def execute(self,method,params):

-        if len(params)>0:

-            result = eval('self.scapy_master.'+method+'(*'+str(params)+')')

-        else:

-            result = eval('self.scapy_master.'+method+'()')

-        return result

-

-

-    def metaraise(self,exc_info):

-        raise exc_info[0], exc_info[1], exc_info[2]

-

-

-    def error_handler(self,exception_obj):

-        try:

-            self.metaraise(exception_obj)

-        except ParseException as e:

-            response = self.create_error_response(-32700,'Parse error',e.message)

-        except InvalidRequest as e:

-            response = self.create_error_response(-32600,'Invalid Request',e.message)

-        except MethodNotFound as e:

-            response = self.create_error_response(-32601,'Method not found',e.message)

-        except InvalidParams as e:

-            response = self.create_error_response(-32603,'Invalid params',e.message)

-        except SyntaxError as e:

-            response = self.create_error_response(-32097,'SyntaxError')

-        except BaseException as e:

-            response = self.create_error_response(-32098,'Scapy Server: '+str(e.message),req_id)

-        finally:

-            return response

-        

-class Scapy_server():

-    def __init__(self,port):

-        self.scapy_wrapper = Scapy_wrapper()

-        self.port = port

-        self.context = zmq.Context()

-        self.socket = self.context.socket(zmq.REP)

-        self.socket.bind("tcp://*:"+str(port))

-

-    def activate(self):

-        try:

-            while True:

-                message = self.socket.recv()

-                try:

-                    method,params,req_id = self.scapy_wrapper.parse_req_msg(message)

-                    result = self.scapy_wrapper.execute(method,params)

-                    response = self.scapy_wrapper.create_success_response(result,req_id)

-                except Exception as e:

-                    exception_details = self.scapy_wrapper.get_exception()

-                    response = self.scapy_wrapper.error_handler(exception_details)

-                finally:

-                    json_response = json.dumps(response)

-                    time.sleep(1)

-

-                #  Send reply back to client

-                    self.socket.send(json_response)

-        except KeyboardInterrupt:

-                print('Terminated By Ctrl+C')

-

-

-s = Scapy_server(5555)

-s.activate()