aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2018-07-10 14:07:02 +0200
committerPeter Mikus <pmikus@cisco.com>2018-07-12 04:23:17 +0000
commitad27739cd87a75b172fd415fc20db08983ea4e13 (patch)
tree42695d534cb19d3dc138ce4db8673244d3e3924b /resources
parente3bed8e21e3c8b60734ce95eb2bb2a2d371a9907 (diff)
CSIT-1186: Consume MLRsearch in agreed upon way
+ Rename search to MLRsearch in resources/libraries/python/. + Make PyPI/MLRsearch/MLRsearch a symlink to the renamed directory. + TrafficGenerator.py to import from the renamed directory/module. - No change to MLRsearch code. - Version stays at 0.1.1 to point to the latest released code. Change-Id: I4a38b0b7f8f083fbb1a93b25522560144b4ef556 Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/MLRsearch/AbstractMeasurer.py (renamed from resources/libraries/python/search/AbstractMeasurer.py)0
-rw-r--r--resources/libraries/python/MLRsearch/AbstractSearchAlgorithm.py (renamed from resources/libraries/python/search/AbstractSearchAlgorithm.py)0
-rw-r--r--resources/libraries/python/MLRsearch/MultipleLossRatioSearch.py (renamed from resources/libraries/python/search/MultipleLossRatioSearch.py)0
-rw-r--r--resources/libraries/python/MLRsearch/NdrPdrResult.py (renamed from resources/libraries/python/search/NdrPdrResult.py)0
-rw-r--r--resources/libraries/python/MLRsearch/ReceiveRateInterval.py (renamed from resources/libraries/python/search/ReceiveRateInterval.py)0
-rw-r--r--resources/libraries/python/MLRsearch/ReceiveRateMeasurement.py (renamed from resources/libraries/python/search/ReceiveRateMeasurement.py)0
-rw-r--r--resources/libraries/python/MLRsearch/__init__.py (renamed from resources/libraries/python/search/__init__.py)0
-rw-r--r--resources/libraries/python/TrafficGenerator.py6
8 files changed, 3 insertions, 3 deletions
diff --git a/resources/libraries/python/search/AbstractMeasurer.py b/resources/libraries/python/MLRsearch/AbstractMeasurer.py
index b972c4eb18..b972c4eb18 100644
--- a/resources/libraries/python/search/AbstractMeasurer.py
+++ b/resources/libraries/python/MLRsearch/AbstractMeasurer.py
diff --git a/resources/libraries/python/search/AbstractSearchAlgorithm.py b/resources/libraries/python/MLRsearch/AbstractSearchAlgorithm.py
index 538322a42c..538322a42c 100644
--- a/resources/libraries/python/search/AbstractSearchAlgorithm.py
+++ b/resources/libraries/python/MLRsearch/AbstractSearchAlgorithm.py
diff --git a/resources/libraries/python/search/MultipleLossRatioSearch.py b/resources/libraries/python/MLRsearch/MultipleLossRatioSearch.py
index 0eb1d7da4c..0eb1d7da4c 100644
--- a/resources/libraries/python/search/MultipleLossRatioSearch.py
+++ b/resources/libraries/python/MLRsearch/MultipleLossRatioSearch.py
diff --git a/resources/libraries/python/search/NdrPdrResult.py b/resources/libraries/python/MLRsearch/NdrPdrResult.py
index b69a57ecbe..b69a57ecbe 100644
--- a/resources/libraries/python/search/NdrPdrResult.py
+++ b/resources/libraries/python/MLRsearch/NdrPdrResult.py
diff --git a/resources/libraries/python/search/ReceiveRateInterval.py b/resources/libraries/python/MLRsearch/ReceiveRateInterval.py
index 05e0f10013..05e0f10013 100644
--- a/resources/libraries/python/search/ReceiveRateInterval.py
+++ b/resources/libraries/python/MLRsearch/ReceiveRateInterval.py
diff --git a/resources/libraries/python/search/ReceiveRateMeasurement.py b/resources/libraries/python/MLRsearch/ReceiveRateMeasurement.py
index d052ebd3bf..d052ebd3bf 100644
--- a/resources/libraries/python/search/ReceiveRateMeasurement.py
+++ b/resources/libraries/python/MLRsearch/ReceiveRateMeasurement.py
diff --git a/resources/libraries/python/search/__init__.py b/resources/libraries/python/MLRsearch/__init__.py
index 4cc8158397..4cc8158397 100644
--- a/resources/libraries/python/search/__init__.py
+++ b/resources/libraries/python/MLRsearch/__init__.py
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index ee65c1bf2a..9959f25ae7 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -22,9 +22,9 @@ from .ssh import SSH
from .topology import NodeType
from .topology import NodeSubTypeTG
from .topology import Topology
-from .search.AbstractMeasurer import AbstractMeasurer
-from .search.MultipleLossRatioSearch import MultipleLossRatioSearch
-from .search.ReceiveRateMeasurement import ReceiveRateMeasurement
+from .MLRsearch.AbstractMeasurer import AbstractMeasurer
+from .MLRsearch.MultipleLossRatioSearch import MultipleLossRatioSearch
+from .MLRsearch.ReceiveRateMeasurement import ReceiveRateMeasurement
__all__ = ['TGDropRateSearchImpl', 'TrafficGenerator', 'OptimizedSearch']