Renaming image property to default_image_id

This renaming is necessary for corresponding sahara validation schema.
Also some validation logic was added for new property.

Change-Id: I156338341d3c065502f1c4dcfe5b7350598efa40
Closes-Bug: #1399450

heat/tests/test_sahara_cluster.py

@@ -39,7 +39,7 @@ resources:
       plugin_name: vanilla
       hadoop_version: 2.3.0
       cluster_template_id: some_cluster_template_id
-      image: some_image
+      default_image_id: some_image
       key_name: admin
       neutron_management_network: some_network
 """
@@ -180,7 +180,8 @@ class SaharaClusterTest(common.HeatTestCase):
         self.assertIsInstance(cluster, sc.SaharaCluster)
 
     def test_cluster_create_no_image_anywhere_fails(self):
-        self.t['resources']['super-cluster']['properties'].pop('image')
+        self.t['resources']['super-cluster']['properties'].pop(
+            'default_image_id')
         self.sahara_mock.cluster_templates.get.return_value = mock.Mock(
             default_image_id=None)
         cluster = self._init_cluster(self.t)
@@ -201,3 +202,25 @@ class SaharaClusterTest(common.HeatTestCase):
                                cluster.validate)
         self.assertEqual("neutron_management_network must be provided",
                          six.text_type(ex))
+
+    def test_validation_error_for_deprecated_properties(self):
+        tmpl = '''
+heat_template_version: 2013-05-23
+description: Hadoop Cluster by Sahara
+resources:
+  super-cluster:
+    type: OS::Sahara::Cluster
+    properties:
+      name: super-cluster
+      plugin_name: vanilla
+      hadoop_version: 2.3.0
+      cluster_template_id: some_cluster_template_id
+      image: some_image
+      default_image_id: test_image_id
+      key_name: admin
+      neutron_management_network: some_network
+      '''
+        ct = self._init_cluster(template_format.parse(tmpl))
+        ex = self.assertRaises(exception.ResourcePropertyConflict, ct.validate)
+        msg = 'Cannot define the following properties at the same time: '
+        self.assertIn(msg, six.text_type(ex))