diff options
Diffstat (limited to 'vstf/vstf/controller')
115 files changed, 11 insertions, 296 deletions
diff --git a/vstf/vstf/controller/__init__.py b/vstf/vstf/controller/__init__.py index df7d24d0..df7d24d0 100755..100644 --- a/vstf/vstf/controller/__init__.py +++ b/vstf/vstf/controller/__init__.py diff --git a/vstf/vstf/controller/api_server.py b/vstf/vstf/controller/api_server.py index a37bf4c1..a37bf4c1 100755..100644 --- a/vstf/vstf/controller/api_server.py +++ b/vstf/vstf/controller/api_server.py diff --git a/vstf/vstf/controller/database/__init__.py b/vstf/vstf/controller/database/__init__.py index df7d24d0..df7d24d0 100755..100644 --- a/vstf/vstf/controller/database/__init__.py +++ b/vstf/vstf/controller/database/__init__.py diff --git a/vstf/vstf/controller/database/constants.py b/vstf/vstf/controller/database/constants.py index e5070122..e5070122 100755..100644 --- a/vstf/vstf/controller/database/constants.py +++ b/vstf/vstf/controller/database/constants.py diff --git a/vstf/vstf/controller/database/dbinterface.py b/vstf/vstf/controller/database/dbinterface.py index d0996c30..410e1ee5 100755..100644 --- a/vstf/vstf/controller/database/dbinterface.py +++ b/vstf/vstf/controller/database/dbinterface.py @@ -7,7 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -__version__ = ''' ''' import os import logging diff --git a/vstf/vstf/controller/database/tables.py b/vstf/vstf/controller/database/tables.py index 0438d0e9..55b02e5f 100755..100644 --- a/vstf/vstf/controller/database/tables.py +++ b/vstf/vstf/controller/database/tables.py @@ -1,9 +1,12 @@ -#!/usr/bin/python -# -*- coding: utf8 -*- -# author: wly -# date: 2015-12-25 -# see license for license details -__version__ = ''' ''' +############################################################################## +# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + from sqlalchemy import Column, Integer, String, Float, ForeignKey from sqlalchemy.ext.declarative import declarative_base from vstf.controller.database import constants as const diff --git a/vstf/vstf/controller/env_build/README b/vstf/vstf/controller/env_build/README deleted file mode 100755 index ecb4e118..00000000 --- a/vstf/vstf/controller/env_build/README +++ /dev/null @@ -1,15 +0,0 @@ - env_build.py contains a quick test code for create virtual network in a remote host. - - usage: - - python env_build.py --rpc_server 192.168.188.10 --config /etc/vstf/env/Tn.json - - --rpc_server RPC_SERVER - the rabbitmq server for deliver messages. - --config CONFIG - env-build config file to parse - -the above command will build a 'Tn-type' network according to config file: /etc/vstf/env/Tn.json. - - - diff --git a/vstf/vstf/controller/env_build/__init__.py b/vstf/vstf/controller/env_build/__init__.py index 83b8d15d..83b8d15d 100755..100644 --- a/vstf/vstf/controller/env_build/__init__.py +++ b/vstf/vstf/controller/env_build/__init__.py diff --git a/vstf/vstf/controller/env_build/cfg_intent_parse.py b/vstf/vstf/controller/env_build/cfg_intent_parse.py index b536e3b8..b536e3b8 100755..100644 --- a/vstf/vstf/controller/env_build/cfg_intent_parse.py +++ b/vstf/vstf/controller/env_build/cfg_intent_parse.py diff --git a/vstf/vstf/controller/env_build/env_build.py b/vstf/vstf/controller/env_build/env_build.py index 1d201b77..1d201b77 100755..100644 --- a/vstf/vstf/controller/env_build/env_build.py +++ b/vstf/vstf/controller/env_build/env_build.py diff --git a/vstf/vstf/controller/env_build/env_collect.py b/vstf/vstf/controller/env_build/env_collect.py index 6e32a05d..6e32a05d 100755..100644 --- a/vstf/vstf/controller/env_build/env_collect.py +++ b/vstf/vstf/controller/env_build/env_collect.py diff --git a/vstf/vstf/controller/fabricant.py b/vstf/vstf/controller/fabricant.py index 3b1c082f..3b1c082f 100755..100644 --- a/vstf/vstf/controller/fabricant.py +++ b/vstf/vstf/controller/fabricant.py diff --git a/vstf/vstf/controller/reporters/README b/vstf/vstf/controller/reporters/README deleted file mode 100755 index 1ed65360..00000000 --- a/vstf/vstf/controller/reporters/README +++ /dev/null @@ -1,109 +0,0 @@ -Tree - -├── __init__.py -├── mail -│ ├── __init__.py -│ ├── mail.py -│ └── sendmail.py -├── report -│ ├── data_factory.py -│ ├── html -│ │ ├── html_base.py -│ │ ├── htmlcreater.py -│ │ ├── html_text.py -│ │ └── __init__.py -│ ├── __init__.py -│ ├── pdf -│ │ ├── element.py -│ │ ├── __init__.py -│ │ ├── pdfcreater.py -│ │ ├── pdftemplate.py -│ │ ├── story.py -│ │ └── styles.py -│ └── provider -│ ├── html_provider.py -│ └── __init__.py -└── reporter.py - - -Entry: - reporter.py - - usage: reporter.py [-h] [-rpath RPATH] [-mail_off] [--taskid TASKID] - - optional arguments: - -h, --help show this help message and exit - -rpath RPATH the path name of test results - -mail_off is need send mail the for the report - --taskid TASKID report depand of a history task id. - -Settings: - mail_settings - - { - "server": - { - "host": "localhost", - "username": null, - "password": null - }, - "body": - { - "from": ["vstf_from@vstf.com"], - "to": ["vstf_to@vstf.com"], - "cc": ["vstf_cc@vstf.com"], - "bcc": ["vstf_bcc@vstf.com"], - "subject": "Elastic Virtual Switching Performance Test Report" - } - } - - html_settings - - { - "style":{ - "table":{ - "font-family":"\"Trebuchet MS\", Arial, Helvetica, sans-serif", - "border":"1px solid green", - "border-collapse":"collapse", - "padding":"8px", - "text-align":"center" - }, - "td":{ - "border":"1px solid green", - "padding":"8px", - "word-wrap":"break-all" - }, - "th":{ - "background-color":"#EAF2D3", - "border":"1px solid green", - "padding":"8px" - } - } - } - - data_settings - - { - "ovs":{ - "content":{ - "version":3.0 - }, - "title":"Ovs info" - }, - "result":{ - "content":{}, - "title":"Performance Result" - }, - "subject":"ATF Performance Test Tnv Model" - } -Module: - mail - html - pdf - - -Others: - pip processes the package "reportlab" - - pip install reportlab - diff --git a/vstf/vstf/controller/reporters/__init__.py b/vstf/vstf/controller/reporters/__init__.py index df7d24d0..df7d24d0 100755..100644 --- a/vstf/vstf/controller/reporters/__init__.py +++ b/vstf/vstf/controller/reporters/__init__.py diff --git a/vstf/vstf/controller/reporters/mail/__init__.py b/vstf/vstf/controller/reporters/mail/__init__.py index df7d24d0..df7d24d0 100755..100644 --- a/vstf/vstf/controller/reporters/mail/__init__.py +++ b/vstf/vstf/controller/reporters/mail/__init__.py diff --git a/vstf/vstf/controller/reporters/mail/mail.py b/vstf/vstf/controller/reporters/mail/mail.py index 2241d9ad..6792ad91 100755..100644 --- a/vstf/vstf/controller/reporters/mail/mail.py +++ b/vstf/vstf/controller/reporters/mail/mail.py @@ -107,7 +107,7 @@ class Mail(object): if __name__ == "__main__": m = Mail() m.attach_addr(["vstf_server@vstf.com"], m.FROM) - m.attach_addr(["wangli11@huawei.com"], m.TO) + m.attach_addr(["test@test.com"], m.TO) context = """ <!DOCTYPE html> <html> diff --git a/vstf/vstf/controller/reporters/mail/sendmail.py b/vstf/vstf/controller/reporters/mail/sendmail.py index a4d7bb0a..a4d7bb0a 100755..100644 --- a/vstf/vstf/controller/reporters/mail/sendmail.py +++ b/vstf/vstf/controller/reporters/mail/sendmail.py diff --git a/vstf/vstf/controller/reporters/report/__init__.py b/vstf/vstf/controller/reporters/report/__init__.py index 547db686..547db686 100755..100644 --- a/vstf/vstf/controller/reporters/report/__init__.py +++ b/vstf/vstf/controller/reporters/report/__init__.py diff --git a/vstf/vstf/controller/reporters/report/candy_generator.py b/vstf/vstf/controller/reporters/report/candy_generator.py index ea296550..ea296550 100755..100644 --- a/vstf/vstf/controller/reporters/report/candy_generator.py +++ b/vstf/vstf/controller/reporters/report/candy_generator.py diff --git a/vstf/vstf/controller/reporters/report/data_factory.py b/vstf/vstf/controller/reporters/report/data_factory.py index f9fc69d9..f9fc69d9 100755..100644 --- a/vstf/vstf/controller/reporters/report/data_factory.py +++ b/vstf/vstf/controller/reporters/report/data_factory.py diff --git a/vstf/vstf/controller/reporters/report/html/__init__.py b/vstf/vstf/controller/reporters/report/html/__init__.py index df7d24d0..df7d24d0 100755..100644 --- a/vstf/vstf/controller/reporters/report/html/__init__.py +++ b/vstf/vstf/controller/reporters/report/html/__init__.py diff --git a/vstf/vstf/controller/reporters/report/html/html_base.py b/vstf/vstf/controller/reporters/report/html/html_base.py index 36be5981..5769da79 100755..100644 --- a/vstf/vstf/controller/reporters/report/html/html_base.py +++ b/vstf/vstf/controller/reporters/report/html/html_base.py @@ -7,7 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -__version__ = ''' ''' import os import vstf.common.pyhtml as pyhtm diff --git a/vstf/vstf/controller/reporters/report/html/htmlcreator.py b/vstf/vstf/controller/reporters/report/html/htmlcreator.py index 1d150e28..695ea37f 100755..100644 --- a/vstf/vstf/controller/reporters/report/html/htmlcreator.py +++ b/vstf/vstf/controller/reporters/report/html/htmlcreator.py @@ -7,7 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -__version__ = ''' ''' import logging diff --git a/vstf/vstf/controller/reporters/report/pdf/__init__.py b/vstf/vstf/controller/reporters/report/pdf/__init__.py index df7d24d0..df7d24d0 100755..100644 --- a/vstf/vstf/controller/reporters/report/pdf/__init__.py +++ b/vstf/vstf/controller/reporters/report/pdf/__init__.py diff --git a/vstf/vstf/controller/reporters/report/pdf/element.py b/vstf/vstf/controller/reporters/report/pdf/element.py index 78d1c59b..ef8b54df 100755..100644 --- a/vstf/vstf/controller/reporters/report/pdf/element.py +++ b/vstf/vstf/controller/reporters/report/pdf/element.py @@ -7,7 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -__version__ = ''' ''' + __doc__ = """ it contains the base element for pdf eImage is used to draw picture on the pdf document diff --git a/vstf/vstf/controller/reporters/report/pdf/pdfcreator.py b/vstf/vstf/controller/reporters/report/pdf/pdfcreator.py index 4f7bd2a8..c33974ec 100755..100644 --- a/vstf/vstf/controller/reporters/report/pdf/pdfcreator.py +++ b/vstf/vstf/controller/reporters/report/pdf/pdfcreator.py @@ -7,8 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -__version__ = ''' ''' - from vstf.controller.reporters.report.pdf.pdftemplate import PdfVswitch from vstf.controller.reporters.report.pdf.story import TitleStory, SpaceStory, ImageStory, TableStory, \ diff --git a/vstf/vstf/controller/reporters/report/pdf/pdftemplate.py b/vstf/vstf/controller/reporters/report/pdf/pdftemplate.py index 69c65401..69c65401 100755..100644 --- a/vstf/vstf/controller/reporters/report/pdf/pdftemplate.py +++ b/vstf/vstf/controller/reporters/report/pdf/pdftemplate.py diff --git a/vstf/vstf/controller/reporters/report/pdf/story.py b/vstf/vstf/controller/reporters/report/pdf/story.py index 940c20fb..940c20fb 100755..100644 --- a/vstf/vstf/controller/reporters/report/pdf/story.py +++ b/vstf/vstf/controller/reporters/report/pdf/story.py diff --git a/vstf/vstf/controller/reporters/report/pdf/styles.py b/vstf/vstf/controller/reporters/report/pdf/styles.py index 2860c245..2860c245 100755..100644 --- a/vstf/vstf/controller/reporters/report/pdf/styles.py +++ b/vstf/vstf/controller/reporters/report/pdf/styles.py diff --git a/vstf/vstf/controller/reporters/report/provider/__init__.py b/vstf/vstf/controller/reporters/report/provider/__init__.py index 83b8d15d..83b8d15d 100755..100644 --- a/vstf/vstf/controller/reporters/report/provider/__init__.py +++ b/vstf/vstf/controller/reporters/report/provider/__init__.py diff --git a/vstf/vstf/controller/reporters/report/provider/html_provider.py b/vstf/vstf/controller/reporters/report/provider/html_provider.py index 74c4c593..74c4c593 100755..100644 --- a/vstf/vstf/controller/reporters/report/provider/html_provider.py +++ b/vstf/vstf/controller/reporters/report/provider/html_provider.py diff --git a/vstf/vstf/controller/reporters/report/provider/pdf_provider.py b/vstf/vstf/controller/reporters/report/provider/pdf_provider.py index bc9f0e96..e1cb09ef 100755..100644 --- a/vstf/vstf/controller/reporters/report/provider/pdf_provider.py +++ b/vstf/vstf/controller/reporters/report/provider/pdf_provider.py @@ -8,8 +8,6 @@ ############################################################################## - -__version__ = ''' ''' import logging LOG = logging.getLogger(__name__) diff --git a/vstf/vstf/controller/reporters/reporter.py b/vstf/vstf/controller/reporters/reporter.py index e77ae349..654c9b83 100755..100644 --- a/vstf/vstf/controller/reporters/reporter.py +++ b/vstf/vstf/controller/reporters/reporter.py @@ -26,7 +26,6 @@ from vstf.controller.reporters.report.candy_generator import CandyGenerator import vstf.common.constants as cst -__version__ = ''' ''' LOG = logging.getLogger(__name__) diff --git a/vstf/vstf/controller/res/Traffic-types.gif b/vstf/vstf/controller/res/Traffic-types.gif Binary files differindex 4b1fc600..4b1fc600 100755..100644 --- a/vstf/vstf/controller/res/Traffic-types.gif +++ b/vstf/vstf/controller/res/Traffic-types.gif diff --git a/vstf/vstf/controller/res/Traffic-types.jpg b/vstf/vstf/controller/res/Traffic-types.jpg Binary files differindex 07f23300..07f23300 100755..100644 --- a/vstf/vstf/controller/res/Traffic-types.jpg +++ b/vstf/vstf/controller/res/Traffic-types.jpg diff --git a/vstf/vstf/controller/res/deployment/Ti-direct.gif b/vstf/vstf/controller/res/deployment/Ti-direct.gif Binary files differindex c06a222b..c06a222b 100755..100644 --- a/vstf/vstf/controller/res/deployment/Ti-direct.gif +++ b/vstf/vstf/controller/res/deployment/Ti-direct.gif diff --git a/vstf/vstf/controller/res/deployment/Ti-direct.jpg b/vstf/vstf/controller/res/deployment/Ti-direct.jpg Binary files differindex edb25cad..edb25cad 100755..100644 --- a/vstf/vstf/controller/res/deployment/Ti-direct.jpg +++ b/vstf/vstf/controller/res/deployment/Ti-direct.jpg diff --git a/vstf/vstf/controller/res/deployment/Ti.gif b/vstf/vstf/controller/res/deployment/Ti.gif Binary files differindex 56ada3f6..56ada3f6 100755..100644 --- a/vstf/vstf/controller/res/deployment/Ti.gif +++ b/vstf/vstf/controller/res/deployment/Ti.gif diff --git a/vstf/vstf/controller/res/deployment/Ti.jpg b/vstf/vstf/controller/res/deployment/Ti.jpg Binary files differindex 951b1c09..951b1c09 100755..100644 --- a/vstf/vstf/controller/res/deployment/Ti.jpg +++ b/vstf/vstf/controller/res/deployment/Ti.jpg diff --git a/vstf/vstf/controller/res/deployment/Tn.gif b/vstf/vstf/controller/res/deployment/Tn.gif Binary files differindex 4367ded0..4367ded0 100755..100644 --- a/vstf/vstf/controller/res/deployment/Tn.gif +++ b/vstf/vstf/controller/res/deployment/Tn.gif diff --git a/vstf/vstf/controller/res/deployment/Tn.jpg b/vstf/vstf/controller/res/deployment/Tn.jpg Binary files differindex 45a17048..45a17048 100755..100644 --- a/vstf/vstf/controller/res/deployment/Tn.jpg +++ b/vstf/vstf/controller/res/deployment/Tn.jpg diff --git a/vstf/vstf/controller/res/deployment/Tnv.gif b/vstf/vstf/controller/res/deployment/Tnv.gif Binary files differindex dfc0bd58..dfc0bd58 100755..100644 --- a/vstf/vstf/controller/res/deployment/Tnv.gif +++ b/vstf/vstf/controller/res/deployment/Tnv.gif diff --git a/vstf/vstf/controller/res/deployment/Tnv.jpg b/vstf/vstf/controller/res/deployment/Tnv.jpg Binary files differindex fb47d8a3..fb47d8a3 100755..100644 --- a/vstf/vstf/controller/res/deployment/Tnv.jpg +++ b/vstf/vstf/controller/res/deployment/Tnv.jpg diff --git a/vstf/vstf/controller/res/deployment/Tu.gif b/vstf/vstf/controller/res/deployment/Tu.gif Binary files differindex 426667ed..426667ed 100755..100644 --- a/vstf/vstf/controller/res/deployment/Tu.gif +++ b/vstf/vstf/controller/res/deployment/Tu.gif diff --git a/vstf/vstf/controller/res/deployment/Tu.jpg b/vstf/vstf/controller/res/deployment/Tu.jpg Binary files differindex be62df75..be62df75 100755..100644 --- a/vstf/vstf/controller/res/deployment/Tu.jpg +++ b/vstf/vstf/controller/res/deployment/Tu.jpg diff --git a/vstf/vstf/controller/res/iperf/Ti-3.gif b/vstf/vstf/controller/res/iperf/Ti-3.gif Binary files differindex e09094a2..e09094a2 100755..100644 --- a/vstf/vstf/controller/res/iperf/Ti-3.gif +++ b/vstf/vstf/controller/res/iperf/Ti-3.gif diff --git a/vstf/vstf/controller/res/iperf/Ti-3.jpg b/vstf/vstf/controller/res/iperf/Ti-3.jpg Binary files differindex cdf75271..cdf75271 100755..100644 --- a/vstf/vstf/controller/res/iperf/Ti-3.jpg +++ b/vstf/vstf/controller/res/iperf/Ti-3.jpg diff --git a/vstf/vstf/controller/res/logo.jpg b/vstf/vstf/controller/res/logo.jpg Binary files differindex 9d524829..9d524829 100755..100644 --- a/vstf/vstf/controller/res/logo.jpg +++ b/vstf/vstf/controller/res/logo.jpg diff --git a/vstf/vstf/controller/res/pktgen/Ti-1.gif b/vstf/vstf/controller/res/pktgen/Ti-1.gif Binary files differindex ed9e44ac..ed9e44ac 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Ti-1.gif +++ b/vstf/vstf/controller/res/pktgen/Ti-1.gif diff --git a/vstf/vstf/controller/res/pktgen/Ti-1.jpg b/vstf/vstf/controller/res/pktgen/Ti-1.jpg Binary files differindex 5898769f..5898769f 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Ti-1.jpg +++ b/vstf/vstf/controller/res/pktgen/Ti-1.jpg diff --git a/vstf/vstf/controller/res/pktgen/Ti-2.gif b/vstf/vstf/controller/res/pktgen/Ti-2.gif Binary files differindex 59359b13..59359b13 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Ti-2.gif +++ b/vstf/vstf/controller/res/pktgen/Ti-2.gif diff --git a/vstf/vstf/controller/res/pktgen/Ti-2.jpg b/vstf/vstf/controller/res/pktgen/Ti-2.jpg Binary files differindex ea4b2620..ea4b2620 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Ti-2.jpg +++ b/vstf/vstf/controller/res/pktgen/Ti-2.jpg diff --git a/vstf/vstf/controller/res/pktgen/Ti-direct-1.gif b/vstf/vstf/controller/res/pktgen/Ti-direct-1.gif Binary files differindex 57b148c6..57b148c6 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Ti-direct-1.gif +++ b/vstf/vstf/controller/res/pktgen/Ti-direct-1.gif diff --git a/vstf/vstf/controller/res/pktgen/Ti-direct-1.jpg b/vstf/vstf/controller/res/pktgen/Ti-direct-1.jpg Binary files differindex 1255dc8e..1255dc8e 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Ti-direct-1.jpg +++ b/vstf/vstf/controller/res/pktgen/Ti-direct-1.jpg diff --git a/vstf/vstf/controller/res/pktgen/Ti-direct-2.gif b/vstf/vstf/controller/res/pktgen/Ti-direct-2.gif Binary files differindex 43e58fbc..43e58fbc 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Ti-direct-2.gif +++ b/vstf/vstf/controller/res/pktgen/Ti-direct-2.gif diff --git a/vstf/vstf/controller/res/pktgen/Ti-direct-2.jpg b/vstf/vstf/controller/res/pktgen/Ti-direct-2.jpg Binary files differindex 898d68ee..898d68ee 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Ti-direct-2.jpg +++ b/vstf/vstf/controller/res/pktgen/Ti-direct-2.jpg diff --git a/vstf/vstf/controller/res/pktgen/Tn-1.gif b/vstf/vstf/controller/res/pktgen/Tn-1.gif Binary files differindex 74407a94..74407a94 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tn-1.gif +++ b/vstf/vstf/controller/res/pktgen/Tn-1.gif diff --git a/vstf/vstf/controller/res/pktgen/Tn-1.jpg b/vstf/vstf/controller/res/pktgen/Tn-1.jpg Binary files differindex f3ea6e53..f3ea6e53 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tn-1.jpg +++ b/vstf/vstf/controller/res/pktgen/Tn-1.jpg diff --git a/vstf/vstf/controller/res/pktgen/Tn-1v.gif b/vstf/vstf/controller/res/pktgen/Tn-1v.gif Binary files differindex 18681bbe..18681bbe 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tn-1v.gif +++ b/vstf/vstf/controller/res/pktgen/Tn-1v.gif diff --git a/vstf/vstf/controller/res/pktgen/Tn-1v.jpg b/vstf/vstf/controller/res/pktgen/Tn-1v.jpg Binary files differindex 59d4ed5c..59d4ed5c 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tn-1v.jpg +++ b/vstf/vstf/controller/res/pktgen/Tn-1v.jpg diff --git a/vstf/vstf/controller/res/pktgen/Tn-2.gif b/vstf/vstf/controller/res/pktgen/Tn-2.gif Binary files differindex e26db799..e26db799 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tn-2.gif +++ b/vstf/vstf/controller/res/pktgen/Tn-2.gif diff --git a/vstf/vstf/controller/res/pktgen/Tn-2.jpg b/vstf/vstf/controller/res/pktgen/Tn-2.jpg Binary files differindex 15ed91e3..15ed91e3 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tn-2.jpg +++ b/vstf/vstf/controller/res/pktgen/Tn-2.jpg diff --git a/vstf/vstf/controller/res/pktgen/Tn-2v.gif b/vstf/vstf/controller/res/pktgen/Tn-2v.gif Binary files differindex 9ec54578..9ec54578 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tn-2v.gif +++ b/vstf/vstf/controller/res/pktgen/Tn-2v.gif diff --git a/vstf/vstf/controller/res/pktgen/Tn-2v.jpg b/vstf/vstf/controller/res/pktgen/Tn-2v.jpg Binary files differindex 2ff06ea6..2ff06ea6 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tn-2v.jpg +++ b/vstf/vstf/controller/res/pktgen/Tn-2v.jpg diff --git a/vstf/vstf/controller/res/pktgen/Tu-1.gif b/vstf/vstf/controller/res/pktgen/Tu-1.gif Binary files differindex 9f2357ad..9f2357ad 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tu-1.gif +++ b/vstf/vstf/controller/res/pktgen/Tu-1.gif diff --git a/vstf/vstf/controller/res/pktgen/Tu-1.jpg b/vstf/vstf/controller/res/pktgen/Tu-1.jpg Binary files differindex ad2724a1..ad2724a1 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tu-1.jpg +++ b/vstf/vstf/controller/res/pktgen/Tu-1.jpg diff --git a/vstf/vstf/controller/res/pktgen/Tu-2.gif b/vstf/vstf/controller/res/pktgen/Tu-2.gif Binary files differindex b0a2cede..b0a2cede 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tu-2.gif +++ b/vstf/vstf/controller/res/pktgen/Tu-2.gif diff --git a/vstf/vstf/controller/res/pktgen/Tu-2.jpg b/vstf/vstf/controller/res/pktgen/Tu-2.jpg Binary files differindex d47089b7..d47089b7 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tu-2.jpg +++ b/vstf/vstf/controller/res/pktgen/Tu-2.jpg diff --git a/vstf/vstf/controller/res/pktgen/Tu-3.gif b/vstf/vstf/controller/res/pktgen/Tu-3.gif Binary files differindex e0b15211..e0b15211 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tu-3.gif +++ b/vstf/vstf/controller/res/pktgen/Tu-3.gif diff --git a/vstf/vstf/controller/res/pktgen/Tu-3.jpg b/vstf/vstf/controller/res/pktgen/Tu-3.jpg Binary files differindex 579808c4..579808c4 100755..100644 --- a/vstf/vstf/controller/res/pktgen/Tu-3.jpg +++ b/vstf/vstf/controller/res/pktgen/Tu-3.jpg diff --git a/vstf/vstf/controller/res/spirent/Tn-1.gif b/vstf/vstf/controller/res/spirent/Tn-1.gif Binary files differindex 97510da0..97510da0 100755..100644 --- a/vstf/vstf/controller/res/spirent/Tn-1.gif +++ b/vstf/vstf/controller/res/spirent/Tn-1.gif diff --git a/vstf/vstf/controller/res/spirent/Tn-1.jpg b/vstf/vstf/controller/res/spirent/Tn-1.jpg Binary files differindex 6886d316..6886d316 100755..100644 --- a/vstf/vstf/controller/res/spirent/Tn-1.jpg +++ b/vstf/vstf/controller/res/spirent/Tn-1.jpg diff --git a/vstf/vstf/controller/res/spirent/Tn-1v.gif b/vstf/vstf/controller/res/spirent/Tn-1v.gif Binary files differindex cb7b668b..cb7b668b 100755..100644 --- a/vstf/vstf/controller/res/spirent/Tn-1v.gif +++ b/vstf/vstf/controller/res/spirent/Tn-1v.gif diff --git a/vstf/vstf/controller/res/spirent/Tn-1v.jpg b/vstf/vstf/controller/res/spirent/Tn-1v.jpg Binary files differindex 3dec4382..3dec4382 100755..100644 --- a/vstf/vstf/controller/res/spirent/Tn-1v.jpg +++ b/vstf/vstf/controller/res/spirent/Tn-1v.jpg diff --git a/vstf/vstf/controller/res/spirent/Tn-2.gif b/vstf/vstf/controller/res/spirent/Tn-2.gif Binary files differindex 4eb6780a..4eb6780a 100755..100644 --- a/vstf/vstf/controller/res/spirent/Tn-2.gif +++ b/vstf/vstf/controller/res/spirent/Tn-2.gif diff --git a/vstf/vstf/controller/res/spirent/Tn-2.jpg b/vstf/vstf/controller/res/spirent/Tn-2.jpg Binary files differindex 9d425af2..9d425af2 100755..100644 --- a/vstf/vstf/controller/res/spirent/Tn-2.jpg +++ b/vstf/vstf/controller/res/spirent/Tn-2.jpg diff --git a/vstf/vstf/controller/res/spirent/Tn-2v.gif b/vstf/vstf/controller/res/spirent/Tn-2v.gif Binary files differindex 21e31470..21e31470 100755..100644 --- a/vstf/vstf/controller/res/spirent/Tn-2v.gif +++ b/vstf/vstf/controller/res/spirent/Tn-2v.gif diff --git a/vstf/vstf/controller/res/spirent/Tn-2v.jpg b/vstf/vstf/controller/res/spirent/Tn-2v.jpg Binary files differindex 40a38292..40a38292 100755..100644 --- a/vstf/vstf/controller/res/spirent/Tn-2v.jpg +++ b/vstf/vstf/controller/res/spirent/Tn-2v.jpg diff --git a/vstf/vstf/controller/settings/README b/vstf/vstf/controller/settings/README deleted file mode 100755 index febac1c9..00000000 --- a/vstf/vstf/controller/settings/README +++ /dev/null @@ -1,61 +0,0 @@ -This module providers a set of profile management solution -File: - settings.py -Interface: - Settings - - 1. it is a base class and supports two modes "Default" and "Single" - if the mode is "Default", the program will load the 'json' file from 'default' - and 'user' , merge the input, save only the 'json' file from 'user' - if the mode is "Single", the program will only load and save the 'json' file - 2. it saves a file two, one is only in memory and the other is in file - 3. it provides two types of functions, one is like "set_" and "add_" and the - other is like "mset" and "madd". the functions are automatically registered. - - 4. You can overload the function _register_func to achieve the functions what you desire - by function "_setting_file","_adding_file","_setting_memory" and "_addting_memory" - - 5. it provides "settings" to show the result in memory - 6. it provides "reset" to reload the file - -Example: - - 1. create your-settings file and paste the contents - - { - "items1": "value1", - "items2": "value2" - } - - - 2. create your_settings file and paste the codes - - import vstf.controller.settings.settings as sets - class YourSettings(sets.Settings): - def __init__(self, path="./", filename="your-settings", mode=sets.SETS_SINGLE): - super(MailSettings, self).__init__(path, filename, mode) - - def unit_test(): - setting = YourSettings() - print setting.settings() - value1 = "test_set_items1" - setting.set_items1(value1) - print setting.settings() - value2 = "test_set_items2" - setting.mset_items2(value2) - print setting.settings() - settings.reset() - print setting.settings() - - if __name__ == '__main__': - unit_test() - -Tree: - - data_settings.py - flows_settings.py - perf_settings.py - - mail_settings.py - tool_settings.py - html_settings.py
\ No newline at end of file diff --git a/vstf/vstf/controller/settings/__init__.py b/vstf/vstf/controller/settings/__init__.py index 83b8d15d..83b8d15d 100755..100644 --- a/vstf/vstf/controller/settings/__init__.py +++ b/vstf/vstf/controller/settings/__init__.py diff --git a/vstf/vstf/controller/settings/cpu_settings.py b/vstf/vstf/controller/settings/cpu_settings.py index a25af4c1..a25af4c1 100755..100644 --- a/vstf/vstf/controller/settings/cpu_settings.py +++ b/vstf/vstf/controller/settings/cpu_settings.py diff --git a/vstf/vstf/controller/settings/device_settings.py b/vstf/vstf/controller/settings/device_settings.py index 25f2c5bf..25f2c5bf 100755..100644 --- a/vstf/vstf/controller/settings/device_settings.py +++ b/vstf/vstf/controller/settings/device_settings.py diff --git a/vstf/vstf/controller/settings/flows_settings.py b/vstf/vstf/controller/settings/flows_settings.py index 9cd1a1b7..9cd1a1b7 100755..100644 --- a/vstf/vstf/controller/settings/flows_settings.py +++ b/vstf/vstf/controller/settings/flows_settings.py diff --git a/vstf/vstf/controller/settings/forwarding_settings.py b/vstf/vstf/controller/settings/forwarding_settings.py index 636ddfda..636ddfda 100755..100644 --- a/vstf/vstf/controller/settings/forwarding_settings.py +++ b/vstf/vstf/controller/settings/forwarding_settings.py diff --git a/vstf/vstf/controller/settings/html_settings.py b/vstf/vstf/controller/settings/html_settings.py index ce87733e..ce87733e 100755..100644 --- a/vstf/vstf/controller/settings/html_settings.py +++ b/vstf/vstf/controller/settings/html_settings.py diff --git a/vstf/vstf/controller/settings/mail_settings.py b/vstf/vstf/controller/settings/mail_settings.py index a2d2d6df..db01097f 100755..100644 --- a/vstf/vstf/controller/settings/mail_settings.py +++ b/vstf/vstf/controller/settings/mail_settings.py @@ -94,17 +94,6 @@ def unit_test(): } mail_settings.set_server(mail_server) - from_list = ['vstf_from@vstf.com'] - mail_settings.set_from(from_list) - to_list = ['wangli11@huawei.com'] - mail_settings.set_to(to_list) - cc_list = ['wangli11@huawei.com'] - mail_settings.set_cc(cc_list) - bcc_list = ['wangli11@huawei.com'] - mail_settings.set_bcc(bcc_list) - bcc_list = ['wangli11@huawei.com'] - mail_settings.set_bcc(bcc_list) - subject = "Virtual Switching Performance Test Report" mail_settings.set_subject(subject) diff --git a/vstf/vstf/controller/settings/perf_settings.py b/vstf/vstf/controller/settings/perf_settings.py index 610cb4ae..610cb4ae 100755..100644 --- a/vstf/vstf/controller/settings/perf_settings.py +++ b/vstf/vstf/controller/settings/perf_settings.py diff --git a/vstf/vstf/controller/settings/settings.py b/vstf/vstf/controller/settings/settings.py index 2c712bb2..2c712bb2 100755..100644 --- a/vstf/vstf/controller/settings/settings.py +++ b/vstf/vstf/controller/settings/settings.py diff --git a/vstf/vstf/controller/settings/settings_input.py b/vstf/vstf/controller/settings/settings_input.py index 59652ed5..59652ed5 100755..100644 --- a/vstf/vstf/controller/settings/settings_input.py +++ b/vstf/vstf/controller/settings/settings_input.py diff --git a/vstf/vstf/controller/settings/template_settings.py b/vstf/vstf/controller/settings/template_settings.py index b677c539..b677c539 100755..100644 --- a/vstf/vstf/controller/settings/template_settings.py +++ b/vstf/vstf/controller/settings/template_settings.py diff --git a/vstf/vstf/controller/settings/tester_settings.py b/vstf/vstf/controller/settings/tester_settings.py index 554c8042..554c8042 100755..100644 --- a/vstf/vstf/controller/settings/tester_settings.py +++ b/vstf/vstf/controller/settings/tester_settings.py diff --git a/vstf/vstf/controller/settings/tool_settings.py b/vstf/vstf/controller/settings/tool_settings.py index a84bc59f..a84bc59f 100755..100644 --- a/vstf/vstf/controller/settings/tool_settings.py +++ b/vstf/vstf/controller/settings/tool_settings.py diff --git a/vstf/vstf/controller/spirent/__init__.py b/vstf/vstf/controller/spirent/__init__.py index df7d24d0..df7d24d0 100755..100644 --- a/vstf/vstf/controller/spirent/__init__.py +++ b/vstf/vstf/controller/spirent/__init__.py diff --git a/vstf/vstf/controller/spirent/appliance.py b/vstf/vstf/controller/spirent/appliance.py index d4c5be64..d4c5be64 100755..100644 --- a/vstf/vstf/controller/spirent/appliance.py +++ b/vstf/vstf/controller/spirent/appliance.py diff --git a/vstf/vstf/controller/spirent/common/__init__.py b/vstf/vstf/controller/spirent/common/__init__.py index c354d1f9..c354d1f9 100755..100644 --- a/vstf/vstf/controller/spirent/common/__init__.py +++ b/vstf/vstf/controller/spirent/common/__init__.py diff --git a/vstf/vstf/controller/spirent/common/model.py b/vstf/vstf/controller/spirent/common/model.py index a29794f4..a29794f4 100755..100644 --- a/vstf/vstf/controller/spirent/common/model.py +++ b/vstf/vstf/controller/spirent/common/model.py diff --git a/vstf/vstf/controller/spirent/common/result_analysis.py b/vstf/vstf/controller/spirent/common/result_analysis.py index b09a846d..b09a846d 100755..100644 --- a/vstf/vstf/controller/spirent/common/result_analysis.py +++ b/vstf/vstf/controller/spirent/common/result_analysis.py diff --git a/vstf/vstf/controller/sw_perf/README b/vstf/vstf/controller/sw_perf/README deleted file mode 100755 index 02844a3e..00000000 --- a/vstf/vstf/controller/sw_perf/README +++ /dev/null @@ -1,39 +0,0 @@ -Tree - -|--- flow_producer.py -|--- model.py -|--- performance.py -|--- perf_provider.py -|--- raw_data.py - -Entry: - performance.py - usage: performance.py [-h] [-case CASE] - [-tool {pktgen,netperf,qperf,iperf,netmap}] - [-protocol {tcp,udp}] [-profile {rdp,fastlink,l2switch}] - [-type {throughput,latency,frameloss}] [-sizes SIZES] - [--monitor MONITOR] - - optional arguments: - -h, --help show this help message and exit - -case CASE test case like Ti-1, Tn-1, Tnv-1, Tu-1... - -tool {pktgen,netperf,qperf,iperf,netmap} - -protocol {tcp,udp} - -profile {rdp,fastlink,l2switch} - -type {throughput,latency,frameloss} - -sizes SIZES test size list "64 128" - --monitor MONITOR which ip to be monitored - -Interface: - usage: - conn = Server(host=args.monitor) - flows_settings = FlowsSettings() - tool_settings = ToolSettings() - tester_settings = TesterSettings() - flow_producer = FlowsProducer(conn, flows_settings) - provider = PerfProvider(flows_settings.settings, tool_settings.settings, tester_settings.settings) - perf = Performance(conn, provider) - flow_producer.create(scenario, case) - LOG.info(flows_settings.settings()) - result = perf.run(tool, protocol, type, sizes) - diff --git a/vstf/vstf/controller/sw_perf/__init__.py b/vstf/vstf/controller/sw_perf/__init__.py index df7d24d0..df7d24d0 100755..100644 --- a/vstf/vstf/controller/sw_perf/__init__.py +++ b/vstf/vstf/controller/sw_perf/__init__.py diff --git a/vstf/vstf/controller/sw_perf/flow_producer.py b/vstf/vstf/controller/sw_perf/flow_producer.py index 4a3b02c2..4a3b02c2 100755..100644 --- a/vstf/vstf/controller/sw_perf/flow_producer.py +++ b/vstf/vstf/controller/sw_perf/flow_producer.py diff --git a/vstf/vstf/controller/sw_perf/model.py b/vstf/vstf/controller/sw_perf/model.py index c49df041..c49df041 100755..100644 --- a/vstf/vstf/controller/sw_perf/model.py +++ b/vstf/vstf/controller/sw_perf/model.py diff --git a/vstf/vstf/controller/sw_perf/perf_provider.py b/vstf/vstf/controller/sw_perf/perf_provider.py index 396e6eef..396e6eef 100755..100644 --- a/vstf/vstf/controller/sw_perf/perf_provider.py +++ b/vstf/vstf/controller/sw_perf/perf_provider.py diff --git a/vstf/vstf/controller/sw_perf/performance.py b/vstf/vstf/controller/sw_perf/performance.py index 3fe91e93..3fe91e93 100755..100644 --- a/vstf/vstf/controller/sw_perf/performance.py +++ b/vstf/vstf/controller/sw_perf/performance.py diff --git a/vstf/vstf/controller/sw_perf/raw_data.py b/vstf/vstf/controller/sw_perf/raw_data.py index aefb863d..aefb863d 100755..100644 --- a/vstf/vstf/controller/sw_perf/raw_data.py +++ b/vstf/vstf/controller/sw_perf/raw_data.py diff --git a/vstf/vstf/controller/unittest/README b/vstf/vstf/controller/unittest/README deleted file mode 100755 index 61ef1a24..00000000 --- a/vstf/vstf/controller/unittest/README +++ /dev/null @@ -1,45 +0,0 @@ - - -the procedure to integrate a module unit testing into the unit testing framework: - -1.create your own unit test module, the name should start by 'test', for example, test_env.py - -2.create the test cases inside the module, inherit unittest.TestCase, for example: - class TestNetnsManager(unittest.TestCase): - def setUp(self): // preparing the testig - pass - def tearDown(self):// cleanup after testing - pass - def testCase1(self):// cases - pass - -3.single modules testing, appending below code at the end of the module, execute 'python test_env.py'. - -if __name__ == "__main__": - import logging - logging.getLogger(__name__) - logging.basicConfig(level = logging.DEBUG) - unittest.main() - -4.multiple modules integration, create run_test.py,run_test.py the example code as below: - -import unittest -import importlib - -test_order_list = [ - "vstf.services.agent.unittest.perf.test_utils", - "vstf.services.agent.unittest.perf.test_netns", - "vstf.services.agent.unittest.perf.test_netperf", - "vstf.services.agent.unittest.perf.test_qperf", - "vstf.services.agent.unittest.perf.test_pktgen", -] - -if __name__ == '__main__': - import logging - logging.getLogger(__name__) - logging.basicConfig(level = logging.DEBUG) - for mod_name in test_order_list: - mod = importlib.import_module(mod_name) - suit = unittest.TestLoader().loadTestsFromModule(mod) - unittest.TextTestRunner().run(suit) - diff --git a/vstf/vstf/controller/unittest/__init__.py b/vstf/vstf/controller/unittest/__init__.py index df7d24d0..df7d24d0 100755..100644 --- a/vstf/vstf/controller/unittest/__init__.py +++ b/vstf/vstf/controller/unittest/__init__.py diff --git a/vstf/vstf/controller/unittest/configuration.py b/vstf/vstf/controller/unittest/configuration.py index 6312efa2..6312efa2 100755..100644 --- a/vstf/vstf/controller/unittest/configuration.py +++ b/vstf/vstf/controller/unittest/configuration.py diff --git a/vstf/vstf/controller/unittest/model.py b/vstf/vstf/controller/unittest/model.py index 4c38973e..4c38973e 100755..100644 --- a/vstf/vstf/controller/unittest/model.py +++ b/vstf/vstf/controller/unittest/model.py diff --git a/vstf/vstf/controller/unittest/test_cfg_intent_parse.py b/vstf/vstf/controller/unittest/test_cfg_intent_parse.py index a08607bb..a08607bb 100755..100644 --- a/vstf/vstf/controller/unittest/test_cfg_intent_parse.py +++ b/vstf/vstf/controller/unittest/test_cfg_intent_parse.py diff --git a/vstf/vstf/controller/unittest/test_collect.py b/vstf/vstf/controller/unittest/test_collect.py index 3e84d019..3e84d019 100755..100644 --- a/vstf/vstf/controller/unittest/test_collect.py +++ b/vstf/vstf/controller/unittest/test_collect.py diff --git a/vstf/vstf/controller/unittest/test_driver_function.py b/vstf/vstf/controller/unittest/test_driver_function.py index 8d45c7b3..8d45c7b3 100755..100644 --- a/vstf/vstf/controller/unittest/test_driver_function.py +++ b/vstf/vstf/controller/unittest/test_driver_function.py diff --git a/vstf/vstf/controller/unittest/test_env_build.py b/vstf/vstf/controller/unittest/test_env_build.py index e4529e48..e4529e48 100755..100644 --- a/vstf/vstf/controller/unittest/test_env_build.py +++ b/vstf/vstf/controller/unittest/test_env_build.py diff --git a/vstf/vstf/controller/unittest/test_perf.py b/vstf/vstf/controller/unittest/test_perf.py index 0258ab65..0258ab65 100755..100644 --- a/vstf/vstf/controller/unittest/test_perf.py +++ b/vstf/vstf/controller/unittest/test_perf.py diff --git a/vstf/vstf/controller/unittest/test_ssh.py b/vstf/vstf/controller/unittest/test_ssh.py index f2403551..f2403551 100755..100644 --- a/vstf/vstf/controller/unittest/test_ssh.py +++ b/vstf/vstf/controller/unittest/test_ssh.py diff --git a/vstf/vstf/controller/vstfadm.py b/vstf/vstf/controller/vstfadm.py index 86641e7d..86641e7d 100755..100644 --- a/vstf/vstf/controller/vstfadm.py +++ b/vstf/vstf/controller/vstfadm.py |