SOL006 patch for POL
Change-Id: Id7bb8f8bb358fcbe8b348617bdb64c224daba5a7
Signed-off-by: garciaale <agarcia@whitestack.com>
diff --git a/osm_policy_module/common/common_db_client.py b/osm_policy_module/common/common_db_client.py
index accbbfc..9ec183a 100644
--- a/osm_policy_module/common/common_db_client.py
+++ b/osm_policy_module/common/common_db_client.py
@@ -43,8 +43,10 @@
return vnfr
def get_vnfrs(self, nsr_id: str):
- return [self.get_vnfr(nsr_id, member['member-vnf-index']) for member in
- self.get_nsr(nsr_id)['nsd']['constituent-vnfd']]
+ # TODO: Change for multiple DF support
+ nsr_nsd_df = self.get_nsr(nsr_id)['nsd'].get('df', [{}])[0]
+ all_nsd_member_vnf_index = [vnf.get('id') for vnf in nsr_nsd_df.get('vnf-profile', [])]
+ return [self.get_vnfr(nsr_id, member_index) for member_index in all_nsd_member_vnf_index]
def get_vnfd(self, vnfd_id: str):
vnfr = self.common_db.get_one("vnfds",
diff --git a/osm_policy_module/common/mon_client.py b/osm_policy_module/common/mon_client.py
index f578462..c83f794 100644
--- a/osm_policy_module/common/mon_client.py
+++ b/osm_policy_module/common/mon_client.py
@@ -44,7 +44,7 @@
self.loop = loop
async def create_alarm(self, metric_name: str, ns_id: str, vdu_name: str, vnf_member_index: str, threshold: int,
- statistic: str, operation: str):
+ operation: str, statistic: str = 'AVERAGE'):
cor_id = random.randint(1, 10e7)
msg = self._build_create_alarm_payload(cor_id,
metric_name,