Related-Bug: #1476413, Related-Bug: #1483432

Contrail View level changes for test infra on behalf of abhishek 1. don't load all views by default during initial loading. 2. allow set rootView and parentView for any view. UT infra changes and Common test chages: 1. updated network list view test to use the new unit test infra. 2. page level test config is created for running common gridview tests - gridview and gridlistmodel 3. new common controller test utils file for all common test helper fns. Change-Id: Ib948e25cea38c6ce6765cfbe950db29f5347cb87
Juniper · Aug 12, 2015 · 7372abf · 7372abf
1 parent d0cf4bc
commit 7372abf
Show file tree

Hide file tree

Showing 29 changed files with 295 additions and 515 deletions.
diff --git a/webroot/common/ui/js/controller.app.js b/webroot/common/ui/js/controller.app.js
@@ -29,13 +29,9 @@ require.config({
 
         'controller-view-config': ctBaseDir + '/common/ui/js/controller.view.config',
         'nm-view-config': ctBaseDir + '/monitor/networking/ui/js/nm.view.config',
-
         'controller-init': ctBaseDir + '/common/ui/js/controller.init',
-        'lls-grid-config': ctBaseDir +
-            '/config/linklocalservices/ui/js/linkLocalServices.grid.config',
-        'lls-parsers': ctBaseDir +
-            '/config/linklocalservices/ui/js/linkLocalServices.parsers',
-        'controller-render': ctBaseDir + '/common/ui/js/controller.render'
+        'lls-grid-config': ctBaseDir + '/config/linklocalservices/ui/js/linkLocalServices.grid.config',
+        'lls-parsers': ctBaseDir + '/config/linklocalservices/ui/js/linkLocalServices.parsers'
     },
     waitSeconds: 0
 });

diff --git a/webroot/common/ui/js/controller.graph.config.js b/webroot/common/ui/js/controller.graph.config.js
@@ -29,6 +29,7 @@ define([
                                         {
                                             elementId: ctwl.MONITOR_PROJECT_VIEW_ID,
                                             view: "ProjectTabView",
+                                            viewPathPrefix: "monitor/networking/ui/js/views/",
                                             app: cowc.APP_CONTRAIL_CONTROLLER,
                                             viewConfig: options
                                         }
@@ -57,6 +58,7 @@ define([
                                         {
                                             elementId: ctwl.MONITOR_NETWORK_VIEW_ID,
                                             view: "NetworkTabView",
+                                            viewPathPrefix: "monitor/networking/ui/js/views/",
                                             app: cowc.APP_CONTRAIL_CONTROLLER,
                                             viewConfig: options
                                         }
@@ -85,6 +87,7 @@ define([
                                         {
                                             elementId: ctwl.MONITOR_INSTANCE_VIEW_ID,
                                             view: "InstanceTabView",
+                                            viewPathPrefix: "monitor/networking/ui/js/views/",
                                             app: cowc.APP_CONTRAIL_CONTROLLER,
                                             viewConfig: options
                                         }
@@ -108,6 +111,7 @@ define([
                                         {
                                             elementId: ctwl.MONITOR_CONNECTED_NETWORK_VIEW_ID,
                                             view: "ConnectedNetworkTabView",
+                                            viewPathPrefix: "monitor/networking/ui/js/views/",
                                             app: cowc.APP_CONTRAIL_CONTROLLER,
                                             viewConfig: elementObj
                                         }

diff --git a/webroot/common/ui/js/controller.init.js b/webroot/common/ui/js/controller.init.js
@@ -13,9 +13,8 @@ define([
     'controller-parsers', 'nm-parsers',
     'controller-view-config', 'nm-view-config',
     'lls-grid-config', 'lls-parsers'
-], function (_, Constants, Labels, Utils, NMUtils, Messages, GridConfig,
-             NMGridConfig, GraphConfig, NMGraphConfig, Parsers, NMParsers,
-             ViewConfig, NMViewConfig, LLSGridConfig, LLSParsers) {
+], function (_, Constants, Labels, Utils, NMUtils, Messages, GridConfig, NMGridConfig, GraphConfig, NMGraphConfig, Parsers, NMParsers, ViewConfig,
+             NMViewConfig, LLSGridConfig, LLSParsers) {
     ctwc = new Constants();
     ctwl = new Labels();
 
@@ -39,14 +38,9 @@ define([
     llswgc = new LLSGridConfig();
     llswp = new LLSParsers();
 
-    ctInitComplete = true;
+    var deferredObj = contentHandler.initFeatureAppDefObjMap[FEATURE_PCK_WEB_CONTROLLER];
 
-    require(['controller-render'], function(CtrlRender) {
-        ctwru = new CtrlRender();
-        var deferredObj = contentHandler.initFeatureAppDefObjMap[FEATURE_PCK_WEB_CONTROLLER];
-
-        if(contrail.checkIfExist(deferredObj)) {
-            deferredObj.resolve()
-        }
-    });
+    if(contrail.checkIfExist(deferredObj)) {
+        deferredObj.resolve()
+    }
 });
diff --git a/webroot/common/ui/js/controller.render.js b/webroot/common/ui/js/controller.render.js
diff --git a/webroot/common/ui/js/controller.utils.js b/webroot/common/ui/js/controller.utils.js
@@ -229,6 +229,30 @@ define([
             return contrailListModel;
         };
 
+        this.renderView = function (renderConfig, renderCallback) {
+            var parentElement = renderConfig['parentElement'],
+                viewName = renderConfig['viewName'],
+                viewPathPrefix = contrail.checkIfExist(renderConfig['viewPathPrefix']) ? renderConfig['viewPathPrefix'] : '/',
+                model = renderConfig['model'],
+                viewAttributes = renderConfig['viewAttributes'],
+                modelMap = renderConfig['modelMap'],
+                rootView = renderConfig['rootView'],
+                viewPath =  viewPathPrefix + viewName,
+                onAllRenderCompleteCB = renderConfig['onAllRenderCompleteCB'],
+                elementView;
+
+            require([viewPath], function(ElementView) {
+                elementView = new ElementView({el: parentElement, model: model, attributes: viewAttributes, rootView: rootView, onAllRenderCompleteCB: onAllRenderCompleteCB});
+                elementView.viewName = viewName;
+                elementView.modelMap = modelMap;
+                elementView.beginMyRendering();
+                elementView.render();
+                if(contrail.checkIfFunction(renderCallback)) {
+                    renderCallback(elementView);
+                }
+                elementView.endMyRendering()
+            });
+        };
     };
 
     return CTUtils;