bug 13743: New zone wizard step -- configure storage traffic

For an advanced zone, with the storage traffic type assigned to a
network, add a new step to configure the IP ranges of the storage
traffic type.

ui/index.jsp

@@ -490,11 +490,19 @@
                zone-wizard-step-id="setupPhysicalNetwork"
                zone-wizard-prefilter="setupPhysicalNetwork">
             <ul class="subnav">
+<<<<<<< HEAD
               <li class="physical-network active"><fmt:message key="label.physical.network"/></li>
               <li class="public-network"><fmt:message key="label.public.traffic"/></li>
               <li class="pod"><fmt:message key="label.pod"/></li>
               <li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
               <li class="conditional storage-traffic"><fmt:message key="label.storage.traffic"/></li>
+=======
+              <li class="physical-network active">Physical Network</li>
+              <li class="public-network">Public traffic</li>
+              <li class="pod">Pod</li>
+              <li class="guest-traffic">Guest Traffic</li>
+              <li class="conditional storage-traffic">Storage Traffic</li>
+>>>>>>> 5c06960... bug 13743: New zone wizard step -- configure storage traffic
             </ul>
             <div class="info-desc conditional advanced">
               <fmt:message key="message.setup.physical.network.during.zone.creation"/>
@@ -591,11 +599,19 @@
                zone-wizard-form="basicPhysicalNetwork"
                zone-wizard-prefilter="addNetscalerDevice">
             <ul class="subnav">
+<<<<<<< HEAD
               <li class="conditional netscaler physical-network active"><fmt:message key="label.netScaler"/></li>
               <li class="public-network"><fmt:message key="label.public.traffic"/></li>
               <li class="pod"><fmt:message key="label.pod"/></li>
               <li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
               <li class="conditional storage-traffic"><fmt:message key="label.storage.traffic"/></li>
+=======
+              <li class="conditional elb physical-network active">Netscaler</li>
+              <li class="public-network">Public traffic</li>
+              <li class="pod">Pod</li>
+              <li class="guest-traffic">Guest Traffic</li>
+              <li class="conditional storage-traffic">Storage Traffic</li>
+>>>>>>> 5c06960... bug 13743: New zone wizard step -- configure storage traffic
             </ul>
 
             <div class="info-desc"><fmt:message key="label.please.specify.netscaler.info"/></div>
@@ -608,11 +624,19 @@
           <div class="setup-public-traffic" zone-wizard-prefilter="addPublicNetwork"
                zone-wizard-step-id="configurePublicTraffic">
             <ul class="subnav">
+<<<<<<< HEAD
               <li class="conditional netscaler physical-network"><fmt:message key="label.netScaler"/></li>
               <li class="public-network active"><fmt:message key="label.public.traffic"/></li>
               <li class="pod"><fmt:message key="label.pod"/></li>
               <li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
               <li class="conditional storage-traffic"><fmt:message key="label.storage.traffic"/></li>
+=======
+              <li class="conditional elb physical-network">Netscaler</li>
+              <li class="public-network active">Public traffic</li>
+              <li class="pod">Pod</li>
+              <li class="guest-traffic">Guest Traffic</li>
+              <li class="conditional storage-traffic">Storage Traffic</li>
+>>>>>>> 5c06960... bug 13743: New zone wizard step -- configure storage traffic
             </ul>
 
             <div class="info-desc" id="add_zone_public_traffic_desc">
@@ -626,11 +650,19 @@
           <div class="add-pod" zone-wizard-form="pod"
                zone-wizard-step-id="addPod">
             <ul class="subnav">
+<<<<<<< HEAD
               <li class="conditional netscaler physical-network"><fmt:message key="label.netScaler"/></li>
               <li class="public-network"><fmt:message key="label.public.traffic"/></li>
               <li class="pod active"><fmt:message key="label.pod"/></li>
               <li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
               <li class="conditional storage-traffic"><fmt:message key="label.storage.traffic"/></li>
+=======
+              <li class="conditional elb physical-network">Netscaler</li>
+              <li class="public-network">Public traffic</li>
+              <li class="pod active">Pod</li>
+              <li class="guest-traffic">Guest Traffic</li>
+              <li class="conditional storage-traffic">Storage Traffic</li>
+>>>>>>> 5c06960... bug 13743: New zone wizard step -- configure storage traffic
             </ul>
 
             <div class="info-desc">
@@ -647,11 +679,19 @@
                zone-wizard-step-id="configureGuestTraffic"
                zone-wizard-prefilter="configureGuestTraffic">
             <ul class="subnav">
+<<<<<<< HEAD
               <li class="conditional netscaler physical-network"><fmt:message key="label.netScaler"/></li>
               <li class="public-network"><fmt:message key="label.public.traffic"/></li>
               <li class="pod"><fmt:message key="label.pod"/></li>
               <li class="guest-traffic active"><fmt:message key="label.guest.traffic"/></li>
               <li class="conditional storage-traffic"><fmt:message key="label.storage.traffic"/></li>
+=======
+              <li class="conditional elb physical-network">Netscaler</li>
+              <li class="public-network">Public traffic</li>
+              <li class="pod">Pod</li>
+              <li class="guest-traffic active">Guest Traffic</li>
+              <li class="conditional storage-traffic">Storage Traffic</li>
+>>>>>>> 5c06960... bug 13743: New zone wizard step -- configure storage traffic
             </ul>
 
             <div class="info-desc" id="add_zone_guest_traffic_desc">
@@ -667,6 +707,7 @@
           <div class="setup-storage-traffic" zone-wizard-prefilter="configureStorageTraffic"
                zone-wizard-step-id="configureStorageTraffic">
             <ul class="subnav">
+<<<<<<< HEAD
               <li class="conditional netscaler physical-network"><fmt:message key="label.netScaler"/></li>
               <li class="public-network"><fmt:message key="label.public.traffic"/></li>
               <li class="pod"><fmt:message key="label.pod"/><</li>
@@ -676,6 +717,17 @@
 
             <div class="info-desc">
               <fmt:message key="message.storage.traffic"/>
+=======
+              <li class="conditional elb physical-network">Netscaler</li>
+              <li class="public-network">Public traffic</li>
+              <li class="pod">Pod</li>
+              <li class="guest-traffic">Guest Traffic</li>
+              <li class="storage-traffic active">Storage Traffic</li>
+            </ul>
+
+            <div class="info-desc">
+              Traffic between CloudStack's internal resources, including any components that communicate with the Management Server, such as hosts and CloudStack system VMs. Please configure storage traffic here.
+>>>>>>> 5c06960... bug 13743: New zone wizard step -- configure storage traffic
             </div>
             <div ui-custom="storageTrafficIPRange"></div>
           </div>

ui/scripts/ui-custom/zoneWizard.js

@@ -121,7 +121,10 @@
         var $storageTrafficItem = $(storageTrafficItem);
         var storageTrafficData = {};
         var fields = [
+<<<<<<< HEAD
           'gateway',
+=======
+>>>>>>> 5c06960... bug 13743: New zone wizard step -- configure storage traffic
           'netmask',
           'vlanid',
           'startip',
@@ -648,7 +651,18 @@
 
       // Remove network action
       $physicalNetworkItem.find('.button.remove.physical-network').click(function() {
+<<<<<<< HEAD
         physicalNetwork.remove($physicalNetworkItem);
+=======
+        $physicalNetworkItem.find('li.traffic-type-draggable').each(function() {
+          var trafficTypeID = $(this).attr('traffic-type-id');
+
+          physicalNetwork.assignTrafficType(trafficTypeID, $physicalNetworkItem.prev());
+        });
+
+        $physicalNetworkItem.find('li.traffic-type-draggable.clone').remove();
+        physicalNetwork.update($physicalNetworkItem.parent().find('.multi'));
+>>>>>>> 5c06960... bug 13743: New zone wizard step -- configure storage traffic
       });
 
       $physicalNetworkItem.addClass('disabled'); // Since there are no traffic types yet
@@ -831,11 +845,19 @@
 
         var makeMessage = function(message, isError) {
           var $li = $('<li>')
+<<<<<<< HEAD
                 .addClass(!isError ? 'loading' : 'info')
                 .append(
                   $('<span>').addClass('icon').html('&nbsp;'),
                   $('<span>').addClass('text').html(message)
                 );
+=======
+            .addClass(!isError ? 'loading' : 'info')
+            .append(
+              $('<span>').addClass('icon').html('&nbsp;'),
+              $('<span>').addClass('text').html(message)
+            );
+>>>>>>> 5c06960... bug 13743: New zone wizard step -- configure storage traffic
           var $launchContainer = $launchStep.find('.launch-container');
 
           $launchStep.find('ul').append($li);
@@ -845,7 +867,11 @@
           if (isError) {
             $li.prev().addClass('error');
           }
+<<<<<<< HEAD
 
+=======
+          
+>>>>>>> 5c06960... bug 13743: New zone wizard step -- configure storage traffic
         };
 
         args.action({
@@ -1207,6 +1233,22 @@
         drop: function(event, ui) {
           physicalNetwork.unassignTrafficType(ui.draggable);
 
+<<<<<<< HEAD
+=======
+          if (!physicalNetwork.isTrafficTypeClone(ui.draggable)) {
+            if ($.inArray(trafficTypeID, physicalNetwork.requiredTrafficTypes) == -1) {
+              physicalNetwork.unassignTrafficType(trafficTypeID, $wizard);
+            } else {
+              physicalNetwork.assignTrafficType(
+                trafficTypeID,
+                $wizard.find('.select-container.multi:first')
+              );
+            }
+          } else if (!ui.draggable.closest('.traffic-types-drag-area').size()) {
+            ui.draggable.remove();
+          }
+
+>>>>>>> 5c06960... bug 13743: New zone wizard step -- configure storage traffic
           return true;
         }
       });