Moved exceptions.py and utils.py up to plugins dir

Plugins dir contains 'general' module which looks like yet another
plugin along with vanilla, fake, hdp, spark and cdh. But it doesn't
and contains two files only. Moved them one level up to avoid such
confusion.

Closes-Bug: #1378178

Change-Id: Ia600e4c584d48a3227552f0051cc3bf906206bed

sahara/plugins/vanilla/edp_engine.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils as u
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils as u
 from sahara.plugins.vanilla import utils as vu
 from sahara.service.edp.oozie import engine as edp_engine
 

sahara/plugins/vanilla/hadoop2/run_scripts.py

@@ -17,7 +17,7 @@ from sahara import context
 from sahara.i18n import _
 from sahara.i18n import _LI
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.vanilla.hadoop2 import config_helper as c_helper
 from sahara.plugins.vanilla import utils as vu
 from sahara.utils import files

sahara/plugins/vanilla/hadoop2/scaling.py

@@ -17,8 +17,8 @@ from oslo.utils import timeutils
 
 from sahara import context
 from sahara.i18n import _
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils as u
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils as u
 from sahara.plugins.vanilla.hadoop2 import config
 from sahara.plugins.vanilla.hadoop2 import run_scripts as run
 from sahara.plugins.vanilla.hadoop2 import utils as pu

sahara/plugins/vanilla/hadoop2/validation.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 from sahara.i18n import _
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils as u
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils as u
 from sahara.plugins.vanilla.hadoop2 import config_helper as cu
 from sahara.plugins.vanilla import utils as vu
 from sahara.utils import general as gu

sahara/plugins/vanilla/utils.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from sahara.plugins.general import utils as u
+from sahara.plugins import utils as u
 
 
 def get_namenode(cluster):

sahara/plugins/vanilla/v1_2_1/config_helper.py

@@ -22,8 +22,8 @@ from sahara.i18n import _
 from sahara.i18n import _LI
 from sahara.i18n import _LW
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import utils
 from sahara.plugins import provisioning as p
+from sahara.plugins import utils
 from sahara.plugins.vanilla import utils as vu
 from sahara.plugins.vanilla.v1_2_1 import mysql_helper as m_h
 from sahara.plugins.vanilla.v1_2_1 import oozie_helper as o_h

sahara/plugins/vanilla/v1_2_1/scaling.py

@@ -20,8 +20,8 @@ import six
 
 from sahara import context
 from sahara.i18n import _
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils
 from sahara.plugins.vanilla.v1_2_1 import config_helper
 from sahara.plugins.vanilla.v1_2_1 import run_scripts as run
 from sahara.utils import remote

sahara/plugins/vanilla/v1_2_1/versionhandler.py

@@ -23,8 +23,8 @@ from sahara import context
 from sahara.i18n import _
 from sahara.i18n import _LI
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import exceptions as ex
-from sahara.plugins.general import utils
+from sahara.plugins import exceptions as ex
+from sahara.plugins import utils
 from sahara.plugins.vanilla import abstractversionhandler as avm
 from sahara.plugins.vanilla import utils as vu
 from sahara.plugins.vanilla.v1_2_1 import config_helper as c_helper

sahara/plugins/vanilla/v2_3_0/versionhandler.py

@@ -20,7 +20,7 @@ from sahara import context
 from sahara import exceptions as ex
 from sahara.i18n import _
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import utils
+from sahara.plugins import utils
 from sahara.plugins.vanilla import abstractversionhandler as avm
 from sahara.plugins.vanilla.hadoop2 import config as c
 from sahara.plugins.vanilla.hadoop2 import edp_engine

sahara/plugins/vanilla/v2_4_1/versionhandler.py

@@ -18,7 +18,7 @@ from oslo.config import cfg
 from sahara import conductor
 from sahara import context
 from sahara.openstack.common import log as logging
-from sahara.plugins.general import utils
+from sahara.plugins import utils
 from sahara.plugins.vanilla import abstractversionhandler as avm
 from sahara.plugins.vanilla.hadoop2 import config as c
 from sahara.plugins.vanilla.hadoop2 import edp_engine

sahara/tests/unit/plugins/vanilla/hadoop2/test_validation.py

@@ -15,7 +15,7 @@
 
 import testtools
 
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.vanilla import plugin as p
 from sahara.tests.unit import base
 from sahara.tests.unit import testutils as tu

sahara/tests/unit/plugins/vanilla/v1_2_1/test_plugin.py

@@ -20,7 +20,7 @@ from sahara import conductor as cond
 from sahara import context
 from sahara import exceptions as e
 from sahara.plugins import base as pb
-from sahara.plugins.general import exceptions as ex
+from sahara.plugins import exceptions as ex
 from sahara.plugins.vanilla import plugin as p
 from sahara.plugins.vanilla.v1_2_1 import config_helper as c_h
 from sahara.plugins.vanilla.v1_2_1 import mysql_helper as m_h