AMBARI-7806 - Views: Instance Data Storage doesn't work

ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java

@@ -1092,11 +1092,6 @@ public class ViewRegistry {
       persistedView = viewDAO.merge(view);
     }
 
-    Map<String, ViewInstanceEntity> xmlInstanceEntityMap = new HashMap<String, ViewInstanceEntity>();
-    for( ViewInstanceEntity instance : view.getInstances()) {
-      xmlInstanceEntityMap.put(instance.getName(), instance);
-    }
-
     view.setResourceType(persistedView.getResourceType());
     view.setPermissions(persistedView.getPermissions());
 
@@ -1106,8 +1101,6 @@ public class ViewRegistry {
       String             instanceName = persistedInstance.getName();
       ViewInstanceEntity instance     = view.getInstanceDefinition(instanceName);
 
-      xmlInstanceEntityMap.remove(instanceName);
-
       // if the persisted instance is not in the view ...
       if (instance == null) {
         if (persistedInstance.isXmlDriven()) {
@@ -1123,15 +1116,10 @@ public class ViewRegistry {
         }
       } else {
         instance.setResource(persistedInstance.getResource());
+        instance.setViewInstanceId(persistedInstance.getViewInstanceId());
+        instance.setData(persistedInstance.getData());
       }
     }
-
-    // these instances appear in the view.xml but are not present in the db...
-    // add them to db
-    for (ViewInstanceEntity instance : xmlInstanceEntityMap.values()) {
-      instance.setResource(createViewInstanceResource(resourceType));
-      instanceDAO.merge(instance);
-    }
   }
 
   // create an admin resource to represent a view instance

ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java

@@ -204,6 +204,10 @@ public class ViewRegistryTest {
     viewDefinition.setResourceType(resourceTypeEntity);
 
     Set<ViewInstanceEntity> viewInstanceEntities = ViewInstanceEntityTest.getViewInstanceEntities(viewDefinition);
+
+    for (ViewInstanceEntity viewInstanceEntity : viewInstanceEntities) {
+      viewInstanceEntity.putInstanceData("p1", "v1");
+    }
     viewDefinition.setInstances(viewInstanceEntities);
 
     Map<File, ViewConfig> viewConfigs =
@@ -307,7 +311,12 @@ public class ViewRegistryTest {
     Assert.assertNotNull(view);
     Assert.assertEquals(ViewDefinition.ViewStatus.DEPLOYED, view.getStatus());
 
-    Assert.assertEquals(2, registry.getInstanceDefinitions(view).size());
+    Collection<ViewInstanceEntity> instanceDefinitions = registry.getInstanceDefinitions(view);
+    Assert.assertEquals(2, instanceDefinitions.size());
+
+    for (ViewInstanceEntity viewInstanceEntity : instanceDefinitions) {
+      Assert.assertEquals("v1", viewInstanceEntity.getInstanceData("p1").getValue());
+    }
 
     // verify mocks
     verify(configuration, viewDir, extractedArchiveDir, viewArchive, archiveDir, entryFile, classesDir,