From bc0daf83db3d783039db7c8c8496a4eb0ceddfe0 Mon Sep 17 00:00:00 2001 From: Adam Israel Date: Wed, 12 Jun 2019 17:08:36 -0400 Subject: [PATCH] Fix reference to information model This fixes a bug where the information model for relations was referred to as "vca-relations" rather than the proper "vca-relationships". Change-Id: I3f961ab750df647e2d2086e887d7e9ac0a01c034 Signed-off-by: Adam Israel --- n2vc/vnf.py | 6 +++--- tests/integration/test_charm_relate.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/n2vc/vnf.py b/n2vc/vnf.py index 5a22952..74f4d94 100644 --- a/n2vc/vnf.py +++ b/n2vc/vnf.py @@ -287,7 +287,7 @@ class N2VC: vdu: ... - vca-relations: + vca-relationships: relation: - provides: dataVM:db requires: mgmtVM:app @@ -341,8 +341,8 @@ class N2VC: for cfg in configs: if 'juju' in cfg: juju = cfg['juju'] - if 'vca-relations' in juju and 'relation' in juju['vca-relations']: - for rel in juju['vca-relations']['relation']: + if 'vca-relationships' in juju and 'relation' in juju['vca-relationships']: + for rel in juju['vca-relationships']['relation']: try: # get the application name for the provides diff --git a/tests/integration/test_charm_relate.py b/tests/integration/test_charm_relate.py index e0f4b65..525fc72 100644 --- a/tests/integration/test_charm_relate.py +++ b/tests/integration/test_charm_relate.py @@ -110,7 +110,7 @@ class TestCharm(base.TestN2VC): juju: charm: proxy-ci proxy: true - vca-relations: + vca-relationships: # Relation needs to map to the vdu providing or # requiring, so that we can map to the deployed app. relation: -- 2.25.1