From: Bin Yang <bin.yang@windriver.com>
Date: Mon, 5 Aug 2019 07:19:37 +0000 (+0000)
Subject: Merge changes I46d47e64,I14d8eb6b
X-Git-Tag: 0.5.0~34
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7c4eb36248331166a6fc3e57fb304a8113edc175;p=multicloud%2Fk8s.git

Merge changes I46d47e64,I14d8eb6b

* changes:
  Add test case for loading vFW Helm chart
  Correct cni retrieval process from resource name
---

7c4eb36248331166a6fc3e57fb304a8113edc175