Merge branch 'stacked-switches' of https://github.com/yiyunma/haas into generalize-deployment-tests
Generalized Deployment Tests
I generalized the deployment tests by removing all of the hard coded node
names, ports, and nics, and instead imported them from a JSON file.  The JSON
file's name is defined in deployment.cfg, and the file is used to populate
information about the environment that the deployment tests will be run in.

I also cleaned up the imports in tests/tests/deployment.py.
Optimized loop in test_isolated_networks
Loop now breaks when 4 nodes are attached to a network, instead of iterating
over all the nodes anyways.
Merge branch 'devel' into generalize-deployment-tests

Conflicts:
	haas/test_common.py
test_isolated_networks now raises an exception
If there are less than 4 available nodes on the HaaS, this test
will now raise an exception and fail.
Renamed architecture_json to site_layout_json
Also modified files names.
Also fixed a syntax error in site-layout.json.example.
Noted that deployment tests only support the Dell driver.
Added IPMI object to site-layout.json.example
Includes host, user, and pass.
Node information now stored in a dctionary, and more...
Also fixed delete_networks so that it doesn't fail if a node
isn't on a network.
Added comment to test_isolated_networks about delete_networks
Described why it was important to always run delete_networks.
test_common now reads IPMI info from json
Merge pull request #222 from ryabouza/generalize-deployment-tests

Generalize deployment tests