mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
065fa1c849
CLOUDSTACK-9669:egress destination cidr VR python script changes
CLOUDSTACK-9669:egress destination API and orchestration changes
CLOUDSTACK-9669: Added the ipset package in systemvm template
CLOUDSTACK-9669:Added licence header for new files
CLOUDSTACK-9669: replacing 0.0.0.0/0 with the network cidr
ipset member add with 0.0.0.0/0 fails. So 0.0.0.0/0 replaced with the network cidr.
In source cidr 0.0.0.0/0 is nothing but network cidr.
updated the default egress all cidr with network cidr
77 lines
2.7 KiB
Java
77 lines
2.7 KiB
Java
// Licensed to the Apache Software Foundation (ASF) under one
|
|
// or more contributor license agreements. See the NOTICE file
|
|
// distributed with this work for additional information
|
|
// regarding copyright ownership. The ASF licenses this file
|
|
// to you under the Apache License, Version 2.0 (the
|
|
// "License"); you may not use this file except in compliance
|
|
// with the License. You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing,
|
|
// software distributed under the License is distributed on an
|
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
// KIND, either express or implied. See the License for the
|
|
// specific language governing permissions and limitations
|
|
// under the License.
|
|
package com.cloud.network.dao;
|
|
|
|
import com.cloud.utils.db.DB;
|
|
import com.cloud.utils.db.GenericDaoBase;
|
|
import com.cloud.utils.db.SearchBuilder;
|
|
import com.cloud.utils.db.SearchCriteria;
|
|
import com.cloud.utils.db.Transaction;
|
|
import com.cloud.utils.db.TransactionCallbackNoReturn;
|
|
import com.cloud.utils.db.TransactionStatus;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
import javax.ejb.Local;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
|
|
@Component
|
|
@Local(value = FirewallRulesDcidrsDao.class)
|
|
public class FirewallRulesDcidrsDaoImpl extends GenericDaoBase<FirewallRulesDestCidrsVO, Long> implements FirewallRulesDcidrsDao {
|
|
|
|
protected final SearchBuilder<FirewallRulesDestCidrsVO> cidrsSearch;
|
|
|
|
protected FirewallRulesDcidrsDaoImpl(){
|
|
cidrsSearch = createSearchBuilder();
|
|
cidrsSearch.and("firewallRuleId", cidrsSearch.entity().getFirewallRuleId(), SearchCriteria.Op.EQ);
|
|
cidrsSearch.done();
|
|
|
|
}
|
|
|
|
@Override
|
|
@DB
|
|
public List<String> getDestCidrs(long firewallRuleId){
|
|
SearchCriteria<FirewallRulesDestCidrsVO> sc =cidrsSearch.create();
|
|
sc.setParameters("firewallRuleId", firewallRuleId);
|
|
|
|
List<FirewallRulesDestCidrsVO> results = search(sc, null);
|
|
|
|
List<String> cidrs = new ArrayList<String>(results.size());
|
|
for (FirewallRulesDestCidrsVO result : results) {
|
|
cidrs.add(result.getCidr());
|
|
}
|
|
|
|
return cidrs;
|
|
}
|
|
|
|
@Override
|
|
@DB
|
|
public void persist(final long firewallRuleId, final List<String> destCidrs){
|
|
Transaction.execute(new TransactionCallbackNoReturn() {
|
|
@Override
|
|
public void doInTransactionWithoutResult(TransactionStatus status) {
|
|
for(String cidr: destCidrs){
|
|
FirewallRulesDestCidrsVO vo = new FirewallRulesDestCidrsVO(firewallRuleId, cidr);
|
|
persist(vo);
|
|
}
|
|
}
|
|
});
|
|
}
|
|
|
|
|
|
}
|