Merge "Added proper assertion config NIC test."

author Steven Pisarski <s.pisarski@cablelabs.com>

Tue, 18 Jul 2017 13:48:52 +0000 (13:48 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Tue, 18 Jul 2017 13:48:52 +0000 (13:48 +0000)
author Steven Pisarski <s.pisarski@cablelabs.com>
Tue, 18 Jul 2017 13:48:52 +0000 (13:48 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Tue, 18 Jul 2017 13:48:52 +0000 (13:48 +0000)
diff --cc snaps/openstack/create_instance.py
Simple merge
diff --cc snaps/openstack/tests/create_instance_tests.py
Simple merge
author	Steven Pisarski <s.pisarski@cablelabs.com>
	Tue, 18 Jul 2017 13:48:52 +0000 (13:48 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Tue, 18 Jul 2017 13:48:52 +0000 (13:48 +0000)
		1	2
snaps/openstack/create_instance.py	patch \|	diff1 \|	diff2 \|	blob \| history
snaps/openstack/tests/create_instance_tests.py	patch \|	diff1 \|	diff2 \|	blob \| history