switch label for VLAN to VLAN/VNI

chriscameronv · Jessica Wang · commit 5ccf3a90abb7 · 2013-11-04T14:25:01.000-08:00
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
@@ -1176,9 +1176,11 @@ label.virtual.machines=Virtual machines
 label.virtual.network=Virtual Network
 label.virtual.router=Virtual Router
 label.virtual.routers=Virtual Routers
-label.vlan.id=VLAN ID
-label.vlan.range=VLAN Range
-label.vlan=VLAN
+label.vlan.id=VLAN/VNI ID
+label.vlan.range=VLAN/VNI Range
+label.vlan=VLAN/VNI
+label.vnet=VLAN/VNI
+label.vnet.id=VLAN/VNI ID
 label.vxlan.id=VXLAN ID
 label.vxlan.range=VXLAN Range
 label.vxlan=VXLAN
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
@@ -1133,6 +1133,8 @@ dictionary = {
 'label.use.vm.ip': '<fmt:message key="label.use.vm.ip" />',
 'label.value': '<fmt:message key="label.value" />',
 'label.vcdcname': '<fmt:message key="label.vcdcname" />',
+'label.vnet': '<fmt:message key="label.vnet" />',
+'label.vnet.id': '<fmt:message key="label.vnet.id" />',
 'label.vcenter.cluster': '<fmt:message key="label.vcenter.cluster" />',
 'label.vcenter.datacenter': '<fmt:message key="label.vcenter.datacenter" />',
 'label.vcenter.datastore': '<fmt:message key="label.vcenter.datastore" />',
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
@@ -1151,7 +1151,7 @@
                                         }
                                     },
                                     vlan: {
-                                        label: 'label.vlan.id'
+                                        label: 'label.vnet.id'
                                     },
                                     
                                     broadcasturi: {
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
@@ -1152,7 +1152,7 @@
                                         label: 'label.state'
                                     },
                                     vlan: {
-                                        label: 'VLAN Range(s)',
+                                        label: 'VLAN/VNI Range(s)',
                                         isEditable: true
                                     },
                                     tags: {
@@ -1384,7 +1384,7 @@
                                             label: 'label.type'
                                         },
                                         vlan: {
-                                            label: 'label.vlan.id'
+                                            label: 'label.vnet.id'
                                         },
                                         broadcasturi: {
                                             label: 'broadcast URI'
@@ -1820,13 +1820,13 @@
                             },
 
                             dedicatedGuestVlanRanges: {
-                                title: 'Dedicated VLAN Ranges',
+                                title: 'Dedicated VLAN/VNI Ranges',
                                 listView: {
                                     section: 'dedicatedGuestVlanRanges',
                                     id: 'dedicatedGuestVlanRanges',
                                     fields: {
                                         guestvlanrange: {
-                                            label: 'VLAN Range(s)'
+                                            label: 'VLAN/VNI Range(s)'
                                         },
                                         domain: {
                                             label: 'label.domain'
@@ -1851,17 +1851,17 @@
                                     },
                                     actions: {
                                         add: {
-                                            label: 'Dedicate VLAN Range',
+                                            label: 'Dedicate VLAN/VNI Range',
                                             messages: {
                                                 notification: function(args) {
-                                                    return 'Dedicate VLAN Range';
+                                                    return 'Dedicate VLAN/VNI Range';
                                                 }
                                             },
                                             createForm: {
-                                                title: 'Dedicate VLAN Range',
+                                                title: 'Dedicate VLAN/VNI Range',
                                                 fields: {
                                                     vlanrange: {
-                                                        label: 'VLAN Range',
+                                                        label: 'VLAN/VNI Range',
                                                         /*  select: function(args) {
                               var items = [];
                               if(args.context.physicalNetworks[0].vlan != null && args.context.physicalNetworks[0].vlan.length > 0) {

Original file line number	Diff line number	Diff line change
`@@ -1151,7 +1151,7 @@`
`1151`	`1151`	`}`
`1152`	`1152`	`},`
`1153`	`1153`	`vlan: {`
`1154`		`- label: 'label.vlan.id'`
	`1154`	`+ label: 'label.vnet.id'`
`1155`	`1155`	`},`
`1156`	`1156`
`1157`	`1157`	`broadcasturi: {`