From d32f75145676bacefde0d08a14680a5984623451 Mon Sep 17 00:00:00 2001
From: Koren Lev <korenlev@gmail.com>
Date: Fri, 29 Sep 2017 01:38:18 +0300
Subject: release 1.0 calipso for opnfv apex

Change-Id: I3e63cd27c5f4d3756e67a07c749863a68e84dde2
Signed-off-by: Koren Lev <korenlev@gmail.com>
---
 .../test_data/db_fetch_host_network_agents.py      |  8 ++--
 .../fetch/db_fetch/test_data/db_fetch_oteps.py     |  6 ++-
 .../db_fetch/test_data/db_fetch_vedges_ovs.py      | 55 ++++++++++++++++++++++
 3 files changed, 63 insertions(+), 6 deletions(-)

(limited to 'app/test/fetch/db_fetch/test_data')

diff --git a/app/test/fetch/db_fetch/test_data/db_fetch_host_network_agents.py b/app/test/fetch/db_fetch/test_data/db_fetch_host_network_agents.py
index 6188ddf..b6d344c 100644
--- a/app/test/fetch/db_fetch/test_data/db_fetch_host_network_agents.py
+++ b/app/test/fetch/db_fetch/test_data/db_fetch_host_network_agents.py
@@ -37,13 +37,13 @@ NETWORK_AGENT = [
 NETWORK_AGENT_WITH_MECHANISM_DRIVERS_IN_CONFIG_RESULTS = [
     {
         'configurations': {},
-        'id': 'OVS-1764430c-c09e-4717-86fa-c04350b1fcbb',
+        'id': 'neutron-openvswitch-agent-1764430c-c09e-4717-86fa-c04350b1fcbb',
         'binary': 'neutron-openvswitch-agent',
         'name': 'neutron-openvswitch-agent'
     },
     {
         'configurations': {},
-        'id': 'OVS-2c2ddfee-91f9-47da-bd65-aceecd998b7c',
+        'id': 'neutron-dhcp-agent-2c2ddfee-91f9-47da-bd65-aceecd998b7c',
         'binary': 'neutron-dhcp-agent',
         'name': 'neutron-dhcp-agent'
     }
@@ -52,13 +52,13 @@ NETWORK_AGENT_WITH_MECHANISM_DRIVERS_IN_CONFIG_RESULTS = [
 NETWORK_AGENT_WITHOUT_MECHANISM_DRIVERS_IN_CONFIG_RESULTS = [
     {
         'configurations': {},
-        'id': 'network_agent-1764430c-c09e-4717-86fa-c04350b1fcbb',
+        'id': 'neutron-openvswitch-agent-1764430c-c09e-4717-86fa-c04350b1fcbb',
         'binary': 'neutron-openvswitch-agent',
         'name': 'neutron-openvswitch-agent'
     },
     {
         'configurations': {},
-        'id': 'network_agent-2c2ddfee-91f9-47da-bd65-aceecd998b7c',
+        'id': 'neutron-dhcp-agent-2c2ddfee-91f9-47da-bd65-aceecd998b7c',
         'binary': 'neutron-dhcp-agent',
         'name': 'neutron-dhcp-agent'
     }
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 a5bc63d..2bd1784 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
@@ -34,10 +34,12 @@ VEDGE_WITHOUT_TUNNEL_TYPES = {
     }
 }
 NON_ICEHOUSE_CONFIGS = {
-    "distribution": "Mirantis-8.0"
+    "distribution": "Mirantis",
+    "distribution_version": "8.0"
 }
 ICEHOUSE_CONFIGS = {
-    "distribution": "Canonical-icehouse"
+    "distribution": "Canonical",
+    "distribution_version": "icehouse"
 }
 HOST = {
     "host": "node-5.cisco.com",
diff --git a/app/test/fetch/db_fetch/test_data/db_fetch_vedges_ovs.py b/app/test/fetch/db_fetch/test_data/db_fetch_vedges_ovs.py
index 818704c..c1f9d4f 100644
--- a/app/test/fetch/db_fetch/test_data/db_fetch_vedges_ovs.py
+++ b/app/test/fetch/db_fetch/test_data/db_fetch_vedges_ovs.py
@@ -166,3 +166,58 @@ DOC_TO_GET_OVERLAY = {
     "agent_type": "Open vSwitch agent",
     "configurations": {"tunneling_ip": "192.168.2.3"},
 }
+
+LIST_IFACES_LINES = [
+    "eth0",
+    "p",
+    "t"
+]
+LIST_IFACES_NAMES = LIST_IFACES_LINES
+LIST_IFACES_LINES_MIRANTIS = {
+    "eth0--br-eth0",
+    "phy-eth0"
+}
+LIST_IFACES_NAMES_MIRANTIS = ["eth0"]
+
+VEDGE_CONFIGURATIONS_MIRANTIS = {
+    "bridge_mappings": {
+        "br-prv": "eth0"
+    }
+}
+VEDGE_CONFIGURATIONS = {
+    "bridge_mappings": {
+        "physnet1": "eth0",
+        "physnet2": "p",
+        "physnet3": "t",
+        "physnet4": "p",
+        "physnet5": "p"
+    }
+}
+
+VEDGE_MIRANTIS = {
+    'host': HOST['host'],
+    'ports': {
+        "eth0": {"name": "eth0", "id": "eth0-port_id"}
+    },
+    'configurations': VEDGE_CONFIGURATIONS_MIRANTIS
+}
+VEDGE = {
+    'host': HOST['host'],
+    'ports': {
+        "eth0": {"name": "eth0", "id": "eth0-port_id"},
+        "p": {"name": "p", "id": "p-port_id"},
+        "t": {"name": "t", "id": "t-port_id"}
+    },
+    'configurations': VEDGE_CONFIGURATIONS
+}
+
+ANOTHER_DIST = "another distribution"
+
+PNICS_MIRANTS = {
+    "eth0": {"name": "eth0", "mac_address": "eth0 mac_address"}
+}
+PNICS = {
+    "eth0": {"name": "eth0", "mac_address": "eth0 mac_address"},
+    "p": {"name": "p", "mac_address": "p mac_address"},
+    "t": {"name": "t", "mac_address": "t mac_address"}
+}
-- 
cgit 1.2.3-korg