cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [24/50] git commit: refs/heads/Health-Check-UI - Merge branch 'master' into ui-multiple-nics
Date Fri, 15 Mar 2013 18:46:45 GMT
Merge branch 'master' into ui-multiple-nics

Conflicts:
	ui/scripts/network.js


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

Branch: refs/heads/Health-Check-UI
Commit: 70164aa3bb7073b34e9d5f0ee608821d1431a48c
Parents: 425f0ba 2feda05
Author: Brian Federle <brian.federle@citrix.com>
Authored: Wed Mar 13 09:36:06 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Wed Mar 13 09:36:06 2013 -0700

----------------------------------------------------------------------
 agent/src/com/cloud/agent/AgentShell.java          |   15 +
 .../com/cloud/agent/api/SecurityGroupRulesCmd.java |   37 ++
 api/src/com/cloud/agent/api/to/NicTO.java          |   11 +
 .../network/security/SecurityGroupService.java     |    4 +-
 .../com/cloud/template/VirtualMachineTemplate.java |    1 +
 .../api/command/admin/user/DeleteUserCmd.java      |    4 +-
 .../api/command/user/vm/AddIpToVmNicCmd.java       |   31 ++-
 .../api/command/user/vm/RemoveIpFromVmNicCmd.java  |   69 +++-
 .../api/response/NicSecondaryIpResponse.java       |   38 ++-
 client/tomcatconf/componentContext.xml.in          |    6 +-
 client/tomcatconf/components-cloudzones.xml.in     |   33 --
 client/tomcatconf/components-nonoss.xml.in         |   97 -----
 client/tomcatconf/components.xml.in                |  306 ---------------
 client/tomcatconf/nonossComponentContext.xml.in    |    6 +-
 .../api/NetworkRulesVmSecondaryIpCommand.java      |   71 ++++
 debian/cloudstack-management.postinst              |    4 +-
 debian/cloudstack-usage.install                    |    3 +-
 debian/rules                                       |   15 +-
 .../storage/volume/VolumeServiceImpl.java          |    1 -
 packaging/centos63/cloud-ipallocator.rc            |    2 +-
 packaging/centos63/cloud.spec                      |   33 +-
 packaging/debian/init/cloud-usage                  |   18 +-
 .../debian/config/etc/init.d/cloud-early-config    |   17 +-
 .../root/redundant_router/check_heartbeat.sh.templ |    2 +-
 .../discovery/ApiDiscoveryServiceImpl.java         |    1 +
 .../kvm/storage/LibvirtStorageAdaptor.java         |   52 ---
 .../vmware/manager/VmwareStorageManagerImpl.java   |    5 +-
 .../hypervisor/vmware/resource/VmwareResource.java |    2 +-
 .../xen/resource/CitrixResourceBase.java           |   32 ++-
 .../cloud/network/element/NetscalerElement.java    |    7 +-
 scripts/storage/qcow2/resizevolume.sh              |    4 +-
 scripts/vm/hypervisor/xenserver/vmops              |  199 +++++++++-
 scripts/vm/network/security_group.py               |    2 +-
 server/src/com/cloud/api/ApiResponseHelper.java    |    9 +-
 server/src/com/cloud/api/ApiServer.java            |   10 +-
 .../query/dao/ProjectInvitationJoinDaoImpl.java    |    4 +-
 .../api/query/vo/ProjectInvitationJoinVO.java      |    3 +-
 .../cloud/baremetal/BareMetalTemplateAdapter.java  |  217 ----------
 .../configuration/ConfigurationManagerImpl.java    |   14 +-
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |   12 +-
 server/src/com/cloud/network/NetworkManager.java   |    5 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |   29 +-
 server/src/com/cloud/network/NetworkModelImpl.java |    2 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |   94 ++++-
 server/src/com/cloud/network/dao/IPAddressDao.java |    2 +
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |    8 +
 .../com/cloud/network/guru/DirectNetworkGuru.java  |   18 +-
 .../network/security/SecurityGroupManagerImpl.java |   93 ++++-
 .../security/SecurityGroupManagerImpl2.java        |   13 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |    7 +
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |  161 ++++----
 server/src/com/cloud/vm/UserVmManagerImpl.java     |    7 -
 server/src/com/cloud/vm/dao/NicDao.java            |    2 +
 server/src/com/cloud/vm/dao/NicDaoImpl.java        |    9 +
 .../com/cloud/network/MockNetworkManagerImpl.java  |   18 +-
 .../test/com/cloud/vpc/MockNetworkManagerImpl.java |   29 ++-
 .../ConsoleProxyHttpHandlerHelper.java             |    3 +-
 tools/appliance/build.sh                           |    2 +-
 ui/scripts/network.js                              |   18 +-
 usage/pom.xml                                      |   18 +
 utils/src/com/cloud/utils/LogUtils.java            |    3 +-
 61 files changed, 973 insertions(+), 965 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/70164aa3/ui/scripts/network.js
----------------------------------------------------------------------
diff --cc ui/scripts/network.js
index 4b23f6f,2353a03..55f3523
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@@ -658,21 -620,33 +658,33 @@@
  								  var data = {
  									  id: args.context.networks[0].id,		
  									  name: args.data.name,
 -										displaytext: args.data.displaytext,
 +										displaytext: args.data.displaytext
  									};
--								
++								  
                    //args.data.networkdomain is null when networkdomain field is hidden
                    if(args.data.networkdomain != null && args.data.networkdomain
!= args.context.networks[0].networkdomain) {
  									  $.extend(data, {
  										  networkdomain: args.data.networkdomain
  										});
- 									}
+ 									} 
 -                                   
++                  
+                   var oldcidr;
 -                   $.ajax({
++                  $.ajax({
+                     url: createURL("listNetworks&id=" + args.context.networks[0].id
),
+                     dataType: "json",
+                     async: false,
+                     success: function(json) {
 -                       oldcidr = json.listnetworksresponse.network[0].cidr;
 -                 
 -                                }
 -                          });
++                      oldcidr = json.listnetworksresponse.network[0].cidr;
++                      
++                    }
++                  });
+ 
  
-                   if(args.data.cidr !="" ){
 -                 if(args.data.cidr !="" && args.data.cidr != oldcidr ){
 -                                          $.extend(data, {
 -                                                              guestvmcidr: args.data.cidr
 -                                           });
 -                                  }
++                  if(args.data.cidr !="" && args.data.cidr != oldcidr ){
 +                    $.extend(data, {
 +                      guestvmcidr: args.data.cidr
 +                    });
 +                  }
  
                    //args.data.networkofferingid is null when networkofferingid field is
hidden
                    if(args.data.networkofferingid != null && args.data.networkofferingid
!= args.context.networks[0].networkofferingid) {


Mime
View raw message