import pytest
from app_tests.preload_tests.test_grapi import load_json
-from preload.environment import PreloadEnvironment
+from preload.environment import EnvironmentFileDataSource
from preload.model import Vnf, get_heat_templates
from preload_vnfapi import VnfApiPreloadGenerator
from tests.helpers import load_yaml, first
pytestconfig.getoption = fake_getoption
templates = get_heat_templates(pytestconfig)
vnf = Vnf(templates)
- preload_env = PreloadEnvironment(THIS_DIR / "sample_env")
- generator = VnfApiPreloadGenerator(vnf, session_dir, preload_env)
+ datasource = EnvironmentFileDataSource(THIS_DIR / "sample_env")
+ generator = VnfApiPreloadGenerator(vnf, session_dir, datasource)
generator.generate()
return session_dir
{
"network-role": "oam",
"network-name": "VALUE FOR: network name for oam_net_id",
- "subnet-id": "oam_subnet_id",
+ "subnet-name": "VALUE FOR: name for oam_subnet_id",
},
{"network-role": "ha", "network-name": "VALUE FOR: network name for ha_net_id"},
{
"network-role": "ctrl",
"network-name": "VALUE FOR: network name for ctrl_net_id",
- "subnet-id": "ctrl_subnet_id",
+ "subnet-name": "VALUE FOR: name for ctrl_subnet_id",
},
]
"network-ips-v6": [],
"network-macs": [],
"interface-route-prefixes": [],
- "use-dhcp": "N",
+ "use-dhcp": "Y",
},
],
}
def test_base_parameters(base):
params = base["input"]["vnf-topology-information"]["vnf-parameters"]
- assert params == [
- {"vnf-parameter-name": "svc_image_name", "vnf-parameter-value": "svc_image"},
- {"vnf-parameter-name": "svc_flavor_name", "vnf-parameter-value": "svc_flavor"},
- ]
+ assert params == []
def test_incremental(incremental):
def test_preload_env_population(preload):
- base_path = THIS_DIR / "sample_env/preloads/vnfapi/base.json"
+ base_path = THIS_DIR / "sample_env/preloads/vnfapi/base_incomplete.json"
data = load_json(base_path)
azs = data["input"]["vnf-topology-information"]["vnf-assignments"][
"availability-zones"