aboutsummaryrefslogtreecommitdiffstats
path: root/app/test/fetch
diff options
context:
space:
mode:
authoryayogev <yaronyogev@gmail.com>2018-02-27 17:00:05 +0200
committeryayogev <yaronyogev@gmail.com>2018-02-27 17:00:05 +0200
commit648a394f7a318443dfd82f790f83a79616c26905 (patch)
tree719508e9d99771c3de056a9c2914d461c35fb967 /app/test/fetch
parent100add41cfe2b987524b190c1c92771a3c4f1d5f (diff)
US3541 merge various fixes to OPNFV branch
timestamp of last commit tt was merged: 26-Jan-2018 16:25. Change-Id: I7b0bf7885d7d0badb81c794a52c480b905d78459 Signed-off-by: yayogev <yaronyogev@gmail.com>
Diffstat (limited to 'app/test/fetch')
-rw-r--r--app/test/fetch/api_fetch/test_data/api_fetch_networks.py1
-rw-r--r--app/test/fetch/api_fetch/test_data/api_fetch_ports.py3
-rw-r--r--app/test/fetch/db_fetch/test_data/db_fetch_oteps.py2
3 files changed, 5 insertions, 1 deletions
diff --git a/app/test/fetch/api_fetch/test_data/api_fetch_networks.py b/app/test/fetch/api_fetch/test_data/api_fetch_networks.py
index 5079a92..38c60a3 100644
--- a/app/test/fetch/api_fetch/test_data/api_fetch_networks.py
+++ b/app/test/fetch/api_fetch/test_data/api_fetch_networks.py
@@ -21,6 +21,7 @@ NETWORKS_RESPONSE = {
NETWORKS_RESULT = [
{
+ "type": "network",
"id": "8673c48a-f137-4497-b25d-08b7b218fd17",
"subnets": {
"test23": {
diff --git a/app/test/fetch/api_fetch/test_data/api_fetch_ports.py b/app/test/fetch/api_fetch/test_data/api_fetch_ports.py
index fc0552c..bb1d89f 100644
--- a/app/test/fetch/api_fetch/test_data/api_fetch_ports.py
+++ b/app/test/fetch/api_fetch/test_data/api_fetch_ports.py
@@ -26,6 +26,7 @@ PORTS_RESULT_WITH_NET = [
"name": "fa:16:3e:d7:c5:16",
"network_id": "b6fd5175-4b22-4256-9b1a-9fc4b9dce1fe",
"tenant_id": "75c0eb79ff4a42b0ae4973c8375ddf40",
+ "type": "port",
"master_parent_type": "network",
"master_parent_id": "b6fd5175-4b22-4256-9b1a-9fc4b9dce1fe",
"parent_type": "ports_folder",
@@ -41,6 +42,7 @@ PORTS_RESULT_WITHOUT_NET = [
"name": "16620a58-c48c-4195-b9c1-779a8ba2e6f8",
"network_id": "b6fd5175-4b22-4256-9b1a-9fc4b9dce1fe",
"tenant_id": "75c0eb79ff4a42b0ae4973c8375ddf40",
+ "type": "port",
"master_parent_type": "network",
"master_parent_id": "b6fd5175-4b22-4256-9b1a-9fc4b9dce1fe",
"parent_type": "ports_folder",
@@ -56,6 +58,7 @@ PORTS_RESULT_WITH_PROJECT = [
"name": "fa:16:3e:d7:c5:16",
"network_id": "b6fd5175-4b22-4256-9b1a-9fc4b9dce1fe",
"tenant_id": "75c0eb79ff4a42b0ae4973c8375ddf40",
+ "type": "port",
"master_parent_type": "network",
"master_parent_id": "b6fd5175-4b22-4256-9b1a-9fc4b9dce1fe",
"parent_type": "ports_folder",
diff --git a/app/test/fetch/db_fetch/test_data/db_fetch_oteps.py b/app/test/fetch/db_fetch/test_data/db_fetch_oteps.py
index 6940c61..b0467a7 100644
--- a/app/test/fetch/db_fetch/test_data/db_fetch_oteps.py
+++ b/app/test/fetch/db_fetch/test_data/db_fetch_oteps.py
@@ -128,5 +128,5 @@ OTEP_WITH_CONNECTOR = {
"br-tun": {
}
},
- "vconnector": "br-mesh"
+ "vconnector": "node-5.cisco.com-br-mesh"
}