Merge "Revert "Create basic_cnf test leveraging onapsdk""

author Morgan Richomme <morgan.richomme@orange.com>

Tue, 13 Oct 2020 09:36:34 +0000 (09:36 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Tue, 13 Oct 2020 09:36:34 +0000 (09:36 +0000)
author Morgan Richomme <morgan.richomme@orange.com>
Tue, 13 Oct 2020 09:36:34 +0000 (09:36 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Tue, 13 Oct 2020 09:36:34 +0000 (09:36 +0000)
diff --cc src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py
Simple merge
diff --cc src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
Simple merge
author	Morgan Richomme <morgan.richomme@orange.com>
	Tue, 13 Oct 2020 09:36:34 +0000 (09:36 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Tue, 13 Oct 2020 09:36:34 +0000 (09:36 +0000)
		1	2
src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/onaptests/configuration/ubuntu16_nomulticloud_settings.py	patch \|	diff1 \|	diff2 \|	blob \| history