cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtutkow...@apache.org
Subject [39/50] git commit: updated refs/heads/sf-plugins to bcf1c72
Date Tue, 28 Jul 2015 20:15:25 GMT
Modifications to fields for virtual-networking support

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b787db0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b787db0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b787db0

Branch: refs/heads/sf-plugins
Commit: 2b787db0d02af72074ed0bac20a10050b457c4ad
Parents: 7cf8a84
Author: Mike Tutkowski <mike.tutkowski@solidfire.com>
Authored: Wed Jul 22 20:07:23 2015 -0600
Committer: CloudStack <cloudstack@cloudstack-virtual-machine.(none)>
Committed: Tue Jul 28 13:42:44 2015 -0600

----------------------------------------------------------------------
 ui/plugins/sfAdministration/sfAdministration.js | 88 +++-----------------
 1 file changed, 13 insertions(+), 75 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b787db0/ui/plugins/sfAdministration/sfAdministration.js
----------------------------------------------------------------------
diff --git a/ui/plugins/sfAdministration/sfAdministration.js b/ui/plugins/sfAdministration/sfAdministration.js
index a18f81d..68a3197 100644
--- a/ui/plugins/sfAdministration/sfAdministration.js
+++ b/ui/plugins/sfAdministration/sfAdministration.js
@@ -383,66 +383,12 @@
                         required: true
                       }
                     },
-                    description: {
-                      label: 'Description',
-                      validation: {
-                        required: true
-                      }
-                    },
                     tag: {
                       label: 'Tag',
                       validation: {
                         required: true
                       }
                     },
-                    physicalnetwork: {
-                      label: 'Physical Network',
-                      validation: {
-                        required: true
-                      },
-                      select: function(args) {
-                        $.ajax({
-                          url: createURL("listAccounts&listAll=true"),
-                          dataType: "json",
-                          async: true,
-                          success: function(json) {
-                            var accountObjs = json.listaccountsresponse.account;
-
-                            args.response.success({
-                              descriptionField: 'name',
-                              data: accountObjs
-                            });
-                          }
-                        });
-                      }
-                    },
-                    networkoffering: {
-                      label: 'Network Offering',
-                      validation: {
-                        required: true
-                      },
-                      select: function(args) {
-                        $.ajax({
-                          url: createURL("listAccounts&listAll=true"),
-                          dataType: "json",
-                          async: true,
-                          success: function(json) {
-                            var accountObjs = json.listaccountsresponse.account;
-
-                            args.response.success({
-                              descriptionField: 'name',
-                              data: accountObjs
-                            });
-                          }
-                        });
-                      }
-                    },
-                    gateway: {
-                      label: 'Gateway',
-                      validation: {
-                        required: true
-                      }
-                    },
                     netmask: {
                       label: 'Netmask',
                       validation: {
@@ -455,10 +401,11 @@
                         required: true
                       }
                     },
-                    endip: {
-                      label: 'End IP',
+                    size: {
+                      label: 'Size',
                       validation: {
-                        required: true
+                        required: true,
+                        number: true
                       }
                     },
                     svip: {
@@ -472,13 +419,13 @@
                 action: function(args) {
                   var data = {
                     clustername: args.context.sfAdministration[0].name,
+                    accountid: args.data.account,
                     name: args.data.name,
                     tag: args.data.tag,
-                    startip: args.data.startip,
-                    size: 10, // Mike T. args.data.size,
                     netmask: args.data.netmask,
-                    svip: args.data.svip,
-                    accountid: args.data.account
+                    startip: args.data.startip,
+                    size: args.data.size,
+                    svip: args.data.svip
                   };
 
                   $.ajax({
@@ -514,9 +461,9 @@
                     params.push("&id=" + args.context.sfVirtualNetworks[0].id);
                     params.push("&name=" + args.data.name);
                     params.push("&tag=" + args.data.tag);
-                    params.push("&startip=" + args.data.startip);
-                    params.push("&size=" + "10"); // Mike T. args.data.size);
                     params.push("&netmask=" + args.data.netmask);
+                    params.push("&startip=" + args.data.startip);
+                    params.push("&size=" + args.data.size);
                     params.push("&svip=" + args.data.svip);
 
                     $.ajax({
@@ -581,16 +528,6 @@
                         label: 'Tag',
                         isEditable: true
                       },
-                      physicalnetwork: {
-                        label: 'Physical Network'
-                      },
-                      networkoffering: {
-                        label: 'Network Offering'
-                      },
-                      gateway: {
-                        label: 'Gateway',
-                        isEditable: true
-                      },
                       netmask: {
                         label: 'Netmask',
                         isEditable: true
@@ -599,8 +536,9 @@
                         label: 'Start IP',
                         isEditable: true
                       },
-                      endip: {
-                        label: 'End IP',
+                      size: {
+                        label: 'Size',
+                        number: true,
                         isEditable: true
                       },
                       svip: {


Mime
View raw message