diff options
| author |   Parker Berberian <pberberian@iol.unh.edu> | 2019-04-17 12:44:04 -0400 |
|---|---|---|
| committer | Parker Berberian <pberberian@iol.unh.edu> | 2019-05-08 10:12:58 -0400 |
| commit | 3d078d2df3fac997c783435ba07e7710d087fd4b (patch) | |
| tree | b9c1cc9d4eb0c7691d2422d105a04e8f9be79ef6 /src/resource_inventory | |
| parent | dc690ef43cc7af006c0900e8eaf1635141f0a2a1 (diff) | |
Adds pdf and idf into api
The Pod Descriptor File (pdf) and Installer descriptor file (idf)
are now hosted in the api. The url endpoint where the lab
can retrieve them are now part of a software task.
An OPNFV task also contains a new dictionary that describes how bridges
should be configured on the jumphost. This information is not
contained in the pdf/idf but is needed by the lab.
Change-Id: I6971279979ba180725926035bd9db481aafb1073
Signed-off-by: Parker Berberian <pberberian@iol.unh.edu>
Diffstat (limited to 'src/resource_inventory')
| -rw-r--r-- | src/resource_inventory/idf_templater.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/resource_inventory/idf_templater.py b/src/resource_inventory/idf_templater.py index 26307e3..bf6eda0 100644 --- a/src/resource_inventory/idf_templater.py +++ b/src/resource_inventory/idf_templater.py @@ -19,8 +19,15 @@ class IDFTemplater: """ Utility class to create a full IDF yaml file """ + net_names = ["admin", "mgmt", "private", "public"] + bridge_names = { + "admin": "br-admin", + "mgmt": "br-mgmt", + "private": "br-private", + "public": "br-public" + } + def __init__(self): - self.net_names = ["admin", "mgmt", "private", "public"] self.networks = {} for i, name in enumerate(self.net_names): self.networks[name] = { @@ -117,11 +124,7 @@ class IDFTemplater: return fuel def get_fuel_bridges(self): - bridges = {} - for net in self.net_names: - bridges[net] = "br-" + net - - return bridges + return self.bridge_names def get_fuel_nodes(self, booking): jumphost = booking.opnfv_config.host_opnfv_config.get( |