javascriptextjs
diff --git a/‎engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java‎
Lines changed: 1 addition & 1 deletion b/‎engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎python/lib/cloudutils/serviceConfigServer.py‎
Lines changed: 2 additions & 0 deletions b/‎python/lib/cloudutils/serviceConfigServer.py‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎server/src/com/cloud/server/ManagementServerImpl.java‎
Lines changed: 2 additions & 2 deletions b/‎server/src/com/cloud/server/ManagementServerImpl.java‎
Lines changed: 2 additions & 2 deletions
@@ -1947,7 +1947,7 @@ public Network createGuestNetwork(long networkOfferingId, final String name, fin
             } else {
                 // don't allow to creating shared network with given Vlan ID, if there already exists a isolated network or
                 // shared network with same Vlan ID in the zone
-                if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 || _networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Shared) > 0) {
+                if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 ) {
                     throw new InvalidParameterValueException("There is a isolated/shared network with vlan id: " + vlanId + " already exists " + "in zone " + zoneId);
                 }
             }
 
@@ -121,6 +121,8 @@ def checkHostName():
         #distro like sl 6.1 needs this folder, or tomcat6 failed to start
         checkHostName()
         bash("mkdir /var/log/cloudstack-management/")
+        bash("chown cloud:cloud -R /var/lib/cloudstack/")
+        bash("chmod +x -R /usr/share/cloudstack-management/webapps/client/WEB-INF/classes/scripts/")
         #set max process per account is unlimited
         if os.path.exists("/etc/security/limits.conf"):
             cfo = configFileOps("/etc/security/limits.conf")
 
@@ -1596,9 +1596,9 @@ public Pair<List<? extends Vlan>, Integer> searchForVlans(final ListVlanIpRanges
         final SearchCriteria<VlanVO> sc = sb.create();
         if (keyword != null) {
             final SearchCriteria<VlanVO> ssc = _vlanDao.createSearchCriteria();
-            ssc.addOr("vlanId", SearchCriteria.Op.LIKE, "%" + keyword + "%");
+            ssc.addOr("vlanTag", SearchCriteria.Op.LIKE, "%" + keyword + "%");
             ssc.addOr("ipRange", SearchCriteria.Op.LIKE, "%" + keyword + "%");
-            sc.addAnd("vlanId", SearchCriteria.Op.SC, ssc);
+            sc.addAnd("vlanTag", SearchCriteria.Op.SC, ssc);
         } else {
             if (id != null) {
                 sc.setParameters("id", id);
Original file line number	Diff line number	Diff line change
`@@ -1947,7 +1947,7 @@ public Network createGuestNetwork(long networkOfferingId, final String name, fin`
`1947`	`1947`	`} else {`
`1948`	`1948`	`// don't allow to creating shared network with given Vlan ID, if there already exists a isolated network or`
`1949`	`1949`	`// shared network with same Vlan ID in the zone`
`1950`		`- if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 \|\| _networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Shared) > 0) {`
	`1950`	`+ if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 ) {`
`1951`	`1951`	`throw new InvalidParameterValueException("There is a isolated/shared network with vlan id: " + vlanId + " already exists " + "in zone " + zoneId);`
`1952`	`1952`	`}`
`1953`	`1953`	`}`