Merge "Closes-bug: #1510039 - Migrate DNS page to MVC"

Juniper · Oct 30, 2015 · 2de0d03 · 2de0d03
2 parents a0e40f7 + be1cdb5
commit 2de0d03
Show file tree

Hide file tree

Showing 40 changed files with 5,265 additions and 3,009 deletions.
diff --git a/webroot/common/api/featureList.xml b/webroot/common/api/featureList.xml
@@ -89,7 +89,12 @@
         <write-access>member</write-access>
     </item>
     <item>
-        <feature>virtualdnsconfig</feature>
+        <feature>virtualdnsserversconfig</feature>
+        <read-access>member</read-access>
+        <write-access>member</write-access>
+    </item>
+    <item>
+        <feature>virtualdnsrecordsconfig</feature>
         <read-access>member</read-access>
         <write-access>member</write-access>
     </item>

diff --git a/webroot/common/ui/js/controller.constants.js b/webroot/common/ui/js/controller.constants.js
@@ -138,6 +138,7 @@ define([
 
         this.UCID_BC_ALL_DOMAINS = this.UCID_PREFIX_BREADCRUMB + ':all-domains';
         this.UCID_BC_DOMAIN_ALL_PROJECTS = this.UCID_PREFIX_BREADCRUMB + ':{0}:all-projects';
+        this.UCID_BC_DOMAIN_ALL_DNS = this.UCID_PREFIX_BREADCRUMB + ':{0}:all-dns';
         this.UCID_BC_PROJECT_ALL_NETWORKS = this.UCID_PREFIX_BREADCRUMB + ':{0}:all-networks';
         this.UCID_BC_NETWORK_ALL_INSTANCES = this.UCID_PREFIX_BREADCRUMB + ':{0}:all-instances';
 

diff --git a/webroot/common/ui/js/controller.grid.config.js b/webroot/common/ui/js/controller.grid.config.js
@@ -253,6 +253,15 @@ define([
                 onClick: onClickFunction
             };
         };
+        this.getActiveDnsConfig = function (title, onClickFunction, divider) {
+            return {
+                title: title,
+               // iconClass: 'icon-trash',
+                width: 80,
+                divider: contrail.checkIfExist(divider) ? divider : false,
+                onClick: onClickFunction
+            }
+        };
     };
     return CTGridConfig;
 });
diff --git a/webroot/common/ui/js/controller.labels.js b/webroot/common/ui/js/controller.labels.js
diff --git a/webroot/common/ui/js/controller.utils.js b/webroot/common/ui/js/controller.utils.js
@@ -228,6 +228,35 @@ define([
             };
         };
 
+        this.getDNSListModelConfig = function(dns) {
+            return {
+                remote: {
+                    ajaxConfig: {
+                        url: '/api/tenants/config/list-virtual-DNSs/' + dns
+                    },
+                    dataParser: function(response) {
+                        return  $.map(response, function (n, i) {
+                            return {
+                                fq_name: n.to.join(':'),
+                                name: n.to[1],
+                                value: n.uuid
+                            };
+                        });
+                    },
+                    failureCallback: function(xhr, ContrailListModel) {
+                        var dataErrorTemplate = contrail.getTemplate4Id(cowc.TMPL_NOT_FOUND_MESSAGE),
+                            dataErrorConfig = $.extend(true, {}, cowc.DEFAULT_CONFIG_ERROR_PAGE, {errorMessage: xhr.responseText});
+
+                        $(contentContainer).html(dataErrorTemplate(dataErrorConfig));
+                    }
+                }/*,
+                cacheConfig : {
+                    ucid: ctwc.get(ctwc.UCID_BC_DOMAIN_ALL_DNS, dns),
+                    loadOnTimeout: false,
+                    cacheTimeout: cowc.PROJECT_CACHE_UPDATE_INTERVAL
+                }*/
+            };
+        };
         this.getProjects4Domain = function(domain) {
             var listModelConfig = {
                 remote: {

diff --git a/webroot/common/ui/js/controller.view.config.js b/webroot/common/ui/js/controller.view.config.js
@@ -236,6 +236,28 @@ define([
                 }
             };
         };
+        self.getDNSBreadcrumbDropdownViewConfig = function(hashParams, customDNSDropdownOptions) {
+            var urlValue = (contrail.checkIfKeyExistInObject(true, hashParams, 'focusedElement.fqName') ? hashParams.focusedElement.fqName : null);
+
+            return function(domainSelectedValueData) {
+                var domain = domainSelectedValueData.value,
+                    defaultDropdownOptions = {
+                        urlValue: (urlValue !== null) ? urlValue.split(':').splice(1, 1).join(':') : null,
+                        cookieKey: 'dnsServer',
+                        parentSelectedValueData: domainSelectedValueData
+                    },
+                    dropdownOptions = $.extend(true, {}, defaultDropdownOptions, customDNSDropdownOptions);
+
+                return {
+                    elementId: ctwl.DNS_BREADCRUMB_DROPDOWN,
+                    view: "BreadcrumbDropdownView",
+                    viewConfig: {
+                        modelConfig: ctwu.getDNSListModelConfig(domain),
+                        dropdownOptions: dropdownOptions
+                    }
+                }
+            };
+        };
 
         self.getNetworkBreadcrumbDropdownViewConfig = function(hashParams, customNetworkDropdownOptions) {
             var urlValue = (contrail.checkIfKeyExistInObject(true, hashParams, 'focusedElement.fqName') ? hashParams.focusedElement.fqName : null);

diff --git a/webroot/config/common/api/configUtil.api.js b/webroot/config/common/api/configUtil.api.js
@@ -26,14 +26,15 @@ var vnConfig = require('../../vn/api/vnconfig.api');
 var nwIpam = require('../../networking/ipam/api/ipamconfig.api');
 var logicalRtr =
     require('../../networking/logicalrouter/api/logicalrouterconfig.api');
-
+var vdns = require('../../dns/servers/api/virtualdnsserversconfig.api');
 var policyConfig =
     require('../../networking/policy/api/policyconfig.api');
 var errorData = [];
 var configCBDelete = 
 {
     'virtual-machine-interface': portsConfig.deletePortsCB,
     'logical-router': logicalRtr.deleteLogicalRouterAsync,
+    'virtual-DNS': vdns.deleteVirtualDNSCallback,
     'network-policy': policyConfig.deletePolicyAsync
 }
 

diff --git a/webroot/config/dns/records/api/parseURL.xml b/webroot/config/dns/records/api/parseURL.xml
@@ -0,0 +1,111 @@
+<!--
+ Copyright (c) 2015 Juniper Networks, Inc. All rights reserved.
+ -->
+<urlLists>
+    <require>
+        <define>parseURLReq</define>
+        <path>process.mainModule.exports["corePath"] + '/src/serverroot/common/parseURLRequire'</path>
+    </require>
+    <require>
+        <define>virtualdnsrecordsconfigapi</define>
+        <path>./virtualdnsrecordsconfig.api</path>
+    </require>
+
+    <!-- API / Feature definition for Virtual DNS configuration -->
+    <!-- 1. Get Virtual DNS Details          - /api/tenants/config/virtual-DNSs/:id,
+                                                 getVirtualDNSs
+         2. Create Virtual DNS               - /api/tenants/config/virtual-DNSs,
+                                                 createVirtualDNS
+         3. Delete Virtual DNS               - /api/tenants/config/virtual-DNS/:id,
+                                                 deleteVirtualDNS
+         4. Get Virtual DNS                  - /api/tenants/config/virtual-DNS/:id,
+                                                 getVirtualDNS
+         5. Add Virtual DNS Record           - /api/tenants/config/virtual-DNS/:id/virtual-DNS-records,
+                                                 updateVDNSRecordAdd
+         6. Delete Virtual DNS Record        - /api/tenants/config/virtual-DNS/:id/virtual-DNS-record/:recordid,
+                                                 updateVDNSRecordDelete
+         7. Update ipams for Virtual DNS     - /api/tenants/config/virtual-DNS/:id/network-ipams
+                                                 updateVDNSIpams
+         8. Update Virtual DNS Record        -
+                    /api/tenants/config/virtual-DNS/:id/virtual-DNS-record/:recordid
+                        updateVDNSRecordUpdate
+         9. Update Virtual DNS
+                    /api/tenants/config/virtual-DNS/:id
+                        updateVirtualDNS
+         10. List Virtual DNS Details          - /api/tenants/config/list-virtual-DNSs/:id,
+                                                 listVirtualDNSs
+    -->
+    <item>
+        <url>/api/tenants/config/virtual-DNSs/:id</url>
+        <method>get</method>
+        <feature>virtualdnsrecordsconfig</feature>
+        <callback>virtualdnsrecordsconfigapi.getVirtualDNSs</callback>
+    </item>
+    <item>
+        <url>/api/tenants/config/list-virtual-DNSs/:id</url>
+        <method>get</method>
+        <feature>virtualdnsrecordsconfig</feature>
+        <callback>virtualdnsrecordsconfigapi.listVirtualDNSs</callback>
+    </item>
+    <item>
+        <url>/api/tenants/config/virtual-DNSs</url>
+        <method>get</method>
+        <feature>virtualdnsrecordsconfig</feature>
+        <callback>virtualdnsrecordsconfigapi.listVirtualDNSsFromAllDomains</callback>
+    </item>
+    <item>
+        <url>/api/tenants/config/virtual-DNSs</url>
+        <method>post</method>
+        <feature>virtualdnsrecordsconfig</feature>
+        <callback>virtualdnsrecordsconfigapi.createVirtualDNS</callback>
+    </item>
+    <item>
+        <url>/api/tenants/config/virtual-DNS/:id</url>
+        <method>delete</method>
+        <feature>virtualdnsrecordsconfig</feature>
+        <callback>virtualdnsrecordsconfigapi.deleteVirtualDNS</callback>
+    </item>
+    <item>
+        <url>/api/tenants/config/virtual-DNS/:id</url>
+        <method>get</method>
+        <feature>virtualdnsrecordsconfig</feature>
+        <callback>virtualdnsrecordsconfigapi.getVirtualDNS</callback>
+    </item>
+    <item>
+        <url>/api/tenants/config/virtual-DNS/:id/virtual-DNS-records</url>
+        <method>post</method>
+        <feature>virtualdnsrecordsconfig</feature>
+        <callback>virtualdnsrecordsconfigapi.updateVDNSRecordAdd</callback>
+    </item>
+    <item>
+        <url>/api/tenants/config/virtual-DNS/:id/virtual-DNS-record/:recordid</url>
+        <method>delete</method>
+        <feature>virtualdnsrecordsconfig</feature>
+        <callback>virtualdnsrecordsconfigapi.updateVDNSRecordDelete</callback>
+    </item>
+    <item>
+        <url>/api/tenants/config/virtual-DNS/:id/network-ipams</url>
+        <method>put</method>
+        <feature>virtualdnsrecordsconfig</feature>
+        <callback>virtualdnsrecordsconfigapi.updateVDNSIpams</callback>
+    </item>
+    <item>
+        <url>/api/tenants/config/virtual-DNS/:id/virtual-DNS-record/:recordid</url>
+        <method>put</method>
+        <feature>virtualdnsrecordsconfig</feature>
+        <callback>virtualdnsrecordsconfigapi.updateVDNSRecordUpdate</callback>
+    </item>
+    <item>
+        <url>/api/tenants/config/virtual-DNS/:id</url>
+        <method>put</method>
+        <feature>virtualdnsrecordsconfig</feature>
+        <callback>virtualdnsrecordsconfigapi.updateVirtualDNS</callback>
+    </item>
+    <item>
+        <url>/api/tenants/config/sandesh/virtual-DNS/:dnsfqn</url>
+        <method>get</method>
+        <feature>virtualdnsrecordsconfig</feature>
+        <callback>virtualdnsrecordsconfigapi.getVirtualDNSSandeshRecords</callback>
+    </item>
+</urlLists>
+