Finished location and slice-load
Merge branch 'dev' of https://github.com/savi-bcrl/aurora into dev

Conflicts:
	aurora/console/aurora_json_generator.py
	aurora/console/generated.json
	aurora/manager/accountingManager.py
	aurora/manager/aurora_db.py
	aurora/manager/core/ap_provision/00:0d:b9:25:34:3c.json
	aurora/manager/core/ap_provision/00:0d:b9:2b:b7:c4.json
	aurora/manager/core/manager.py
	aurora/manager/dispatcher.py
	aurora/manager/json/response.json
	aurora/manager/provision_server/00:0d:b9:2b:b6:e8.json
	aurora/manager/resource_monitor.py
	aurora/manager/sql_check.py
	auroraclient/SendJSON.py
	auroraclient/shell.py
Merge branch 'dev' of https://github.com/savi-bcrl/aurora into dev

Conflicts:
	aurora/aurora/__init__.py
	aurora/aurora/ap_monitor.py
	aurora/aurora/ap_provision/__init__.py
	aurora/aurora/ap_provision/ap_provision_reader.py
	aurora/aurora/ap_provision/http_srv.py
	aurora/aurora/ap_provision/json/00:0d:b9:25:34:3c.json
	aurora/aurora/ap_provision/json/00:0d:b9:2b:b6:e8.json
	aurora/aurora/ap_provision/json/00:0d:b9:2b:b7:c4.json
	aurora/aurora/ap_provision/writer.py
	aurora/aurora/aurora_db.py
	aurora/aurora/cls_logger.py
	aurora/aurora/config_db.py
	aurora/aurora/dispatcher.py
	aurora/aurora/exc.py
	aurora/aurora/json/shell.json
	aurora/aurora/manager.py
	aurora/aurora/manager_http_server.py
	aurora/aurora/plugins/__init__.py
	aurora/aurora/plugins/capsulator_plugin.py
	aurora/aurora/plugins/linux_bridge_plugin.py
	aurora/aurora/plugins/ovs_plugin.py
	aurora/aurora/plugins/vbr_plugin.py
	aurora/aurora/plugins/veth_plugin.py
	aurora/aurora/plugins/vif_plugin.py
	aurora/aurora/request_verification/__init__.py
	aurora/aurora/request_verification/request_verification.py
	aurora/aurora/request_verification/request_verify_API.py
	aurora/aurora/request_verification/verification_exception.py
	aurora/aurora/shell_local.py
	aurora/aurora/slice_json_generator.py
	aurora/aurora/slice_plugin.py
	aurora/aurora/sqldb_create.py
	aurora/aurora/stop_thread.py
	aurora/aurora/wsgi.py
	aurora/doc/_build/html/_sources/bak/core.ap_provision.txt
	aurora/doc/_build/html/_sources/bak/core.plugins.txt
	aurora/doc/_build/html/_sources/bak/core.request_verification.txt
	aurora/doc/_build/html/_sources/bak/core.txt
	aurora/doc/_build/html/_sources/bak/index.txt
	aurora/doc/_build/html/_static/ajax-loader.gif
	aurora/doc/_build/html/_static/basic.css
	aurora/doc/_build/html/_static/comment-bright.png
	aurora/doc/_build/html/_static/comment-close.png
	aurora/doc/_build/html/_static/comment.png
	aurora/doc/_build/html/_static/default.css
	aurora/doc/_build/html/_static/doctools.js
	aurora/doc/_build/html/_static/down-pressed.png
	aurora/doc/_build/html/_static/down.png
	aurora/doc/_build/html/_static/file.png
	aurora/doc/_build/html/_static/jquery.js
	aurora/doc/_build/html/_static/minus.png
	aurora/doc/_build/html/_static/plus.png
	aurora/doc/_build/html/_static/pygments.css
	aurora/doc/_build/html/_static/searchtools.js
	aurora/doc/_build/html/_static/sidebar.js
	aurora/doc/_build/html/_static/underscore.js
	aurora/doc/_build/html/_static/up-pressed.png
	aurora/doc/_build/html/_static/up.png
	aurora/doc/_build/html/_static/websupport.js
	aurora/doc/bak/Makefile
	aurora/doc/bak/_build/doctrees/core.ap_provision.doctree
	aurora/doc/bak/_build/doctrees/core.plugins.doctree
	aurora/doc/bak/_build/doctrees/core.request_verification.doctree
	aurora/doc/bak/_build/doctrees/environment.pickle
	aurora/doc/bak/_build/doctrees/index.doctree
	aurora/doc/bak/_build/html/.buildinfo
	aurora/doc/bak/_build/html/_modules/core/ap_monitor.html
	aurora/doc/bak/_build/html/_modules/core/ap_provision/ap_provision_reader.html
	aurora/doc/bak/_build/html/_modules/core/ap_provision/http_srv.html
	aurora/doc/bak/_build/html/_modules/core/ap_provision/writer.html
	aurora/doc/bak/_build/html/_modules/core/aurora_db.html
	aurora/doc/bak/_build/html/_modules/core/cls_logger.html
	aurora/doc/bak/_build/html/_modules/core/config_db.html
	aurora/doc/bak/_build/html/_modules/core/dispatcher.html
	aurora/doc/bak/_build/html/_modules/core/exc.html
	aurora/doc/bak/_build/html/_modules/core/manager.html
	aurora/doc/bak/_build/html/_modules/core/manager_http_server.html
	aurora/doc/bak/_build/html/_modules/core/plugins/capsulator_plugin.html
	aurora/doc/bak/_build/html/_modules/core/plugins/linux_bridge_plugin.html
	aurora/doc/bak/_build/html/_modules/core/plugins/ovs_plugin.html
	aurora/doc/bak/_build/html/_modules/core/plugins/vbr_plugin.html
	aurora/doc/bak/_build/html/_modules/core/plugins/veth_plugin.html
	aurora/doc/bak/_build/html/_modules/core/plugins/vif_plugin.html
	aurora/doc/bak/_build/html/_modules/core/request_verification/request_verification.html
	aurora/doc/bak/_build/html/_modules/core/request_verification/request_verify_API.html
	aurora/doc/bak/_build/html/_modules/core/request_verification/verification_exception.html
	aurora/doc/bak/_build/html/_modules/core/shell_local.html
	aurora/doc/bak/_build/html/_modules/core/slice_json_generator.html
	aurora/doc/bak/_build/html/_modules/core/slice_plugin.html
	aurora/doc/bak/_build/html/_modules/core/sqldb_create.html
	aurora/doc/bak/_build/html/_modules/core/stop_thread.html
	aurora/doc/bak/_build/html/_modules/index.html
	aurora/doc/bak/_build/html/_sources/core.ap_provision.txt
	aurora/doc/bak/_build/html/_sources/core.plugins.txt
	aurora/doc/bak/_build/html/_sources/core.request_verification.txt
	aurora/doc/bak/_build/html/_sources/core.txt
	aurora/doc/bak/_build/html/_sources/index.txt
	aurora/doc/bak/_build/html/core.ap_provision.html
	aurora/doc/bak/_build/html/core.html
	aurora/doc/bak/_build/html/core.plugins.html
	aurora/doc/bak/_build/html/core.request_verification.html
	aurora/doc/bak/_build/html/genindex.html
	aurora/doc/bak/_build/html/index.html
	aurora/doc/bak/_build/html/py-modindex.html
	aurora/doc/bak/_build/html/search.html
	aurora/doc/bak/conf.py
	aurora/doc/bak/make.bat
	python-auroraagent/Database.py
	python-auroraagent/Monitor.py
	python-auroraagent/Receive.py
	python-auroraagent/SliceAgent.py
	python-auroraagent/VirtualBridges.py
	python-auroraagent/VirtualInterfaces.py
	python-auroraagent/VirtualTC.py
	python-auroraagent/VirtualWifi.py
	python-auroraagent/__init__.py
	python-auroraagent/capsulator/Makefile
	python-auroraagent/capsulator/README
	python-auroraagent/capsulator/capsulator.c
	python-auroraagent/capsulator/capsulator.h
	python-auroraagent/capsulator/common.c
	python-auroraagent/capsulator/common.h
	python-auroraagent/capsulator/get_ip_for_interface.c
	python-auroraagent/capsulator/get_ip_for_interface.h
	python-auroraagent/capsulator/main.c
	python-auroraagent/exception.py
	python-auroraagent/install_dependencies.py
	python-auroraagent/modules.json
	python-auroraagent/modules/OpenWRTWifi.py
	python-auroraagent/modules/Readme.txt
	python-auroraagent/modules/__init__.py
	python-auroraagent/modules/capsulator.py
	python-auroraagent/modules/linux_bridge.py
	python-auroraagent/modules/ovs-tc.py
	python-auroraagent/modules/ovs.py
	python-auroraagent/modules/tc.py
	python-auroraagent/modules/veth.py
	python-auroraclient/auroraclient/__init__.py
	python-auroraclient/auroraclient/client.py
	python-auroraclient/auroraclient/exc.py
	python-auroraclient/auroraclient/json/bmax/1.json
	python-auroraclient/auroraclient/json/bmax/2.json
	python-auroraclient/auroraclient/json/bmax/3.json
	python-auroraclient/auroraclient/json/bmax/4.json
	python-auroraclient/auroraclient/json/bmax/5.json
	python-auroraclient/auroraclient/json/bmax/6.json
	python-auroraclient/auroraclient/json/bmax/7.json
	python-auroraclient/auroraclient/json/bmax/8.json
	python-auroraclient/auroraclient/json/mk-2.json
	python-auroraclient/auroraclient/json/mk.json
	python-auroraclient/auroraclient/json/multi.json
	python-auroraclient/auroraclient/json/old/aplist.json
	python-auroraclient/auroraclient/json/old/apslice.json
	python-auroraclient/auroraclient/json/old/clientsend.json
	python-auroraclient/auroraclient/json/old/demo.json
	python-auroraclient/auroraclient/json/old/demo1.bak.json
	python-auroraclient/auroraclient/json/old/demo1.json
	python-auroraclient/auroraclient/json/old/demo2.json
	python-auroraclient/auroraclient/json/old/demo3.json
	python-auroraclient/auroraclient/json/old/demo4.json
	python-auroraclient/auroraclient/json/old/demo5.json
	python-auroraclient/auroraclient/json/old/demoslice1.json
	python-auroraclient/auroraclient/json/old/demoslice2.json
	python-auroraclient/auroraclient/json/old/demoslice3.bak.json
	python-auroraclient/auroraclient/json/old/demoslice3.json
	python-auroraclient/auroraclient/json/old/demoslice4.json
	python-auroraclient/auroraclient/json/old/demoslice5.json
	python-auroraclient/auroraclient/json/old/demoslice6.json
	python-auroraclient/auroraclient/json/old/new1.json
	python-auroraclient/auroraclient/json/old/s.json
	python-auroraclient/auroraclient/json/old/s1.json
	python-auroraclient/auroraclient/json/old/s2.json
	python-auroraclient/auroraclient/json/old/slicetemp.json
	python-auroraclient/auroraclient/json/old/wnet.json
	python-auroraclient/auroraclient/json/ovs-2.json
	python-auroraclient/auroraclient/json/ovs-3.json
	python-auroraclient/auroraclient/json/ovs-noctl.json
	python-auroraclient/auroraclient/json/ovs-qos-2.json
	python-auroraclient/auroraclient/json/ovs.json
	python-auroraclient/auroraclient/json/qos-2.json
	python-auroraclient/auroraclient/json/qos-3.json
	python-auroraclient/auroraclient/json/qos.json
	python-auroraclient/auroraclient/json/radio_blank.json
	python-auroraclient/auroraclient/json/shell.json
	python-auroraclient/auroraclient/json/use.json
	python-auroraclient/auroraclient/json/wnet.json
	python-auroraclient/auroraclient/json_sender.py
	python-auroraclient/auroraclient/openstack/__init__.py
	python-auroraclient/auroraclient/openstack/common/__init__.py
	python-auroraclient/auroraclient/openstack/common/importutils.py
	python-auroraclient/auroraclient/openstack/common/setup.py
	python-auroraclient/auroraclient/openstack/common/version.py
	python-auroraclient/auroraclient/openstack/http.py
	python-auroraclient/auroraclient/shell.py
	python-auroraclient/auroraclient/shell_l.py
	python-auroraclient/auroraclient/slice_json_generator.py
	python-auroraclient/auroraclient/utils.py
realize location,slice-load
shell modification for location,slice-load
Add all changes
add changes