ospf: WIP Marvin

Author: abhinandanprateek

core/src/com/cloud/agent/resource/virtualnetwork/facade/QuaggaConfigItem.java

@@ -42,8 +42,6 @@ public List<ConfigItem> generateConfig(final NetworkElementCommand cmd) {
 
         StringBuilder zebra = new StringBuilder();
         zebra.append("hostname " + vrName).append(",");
-        zebra.append("password zebra").append(",");
-        zebra.append("enable password zebra").append(",");
         zebra.append("interface eth1").append(",");
         zebra.append(" description link to area 0").append(",");
         zebra.append("  ip address " + vrIp + "/24").append(",");
@@ -52,7 +50,6 @@ public List<ConfigItem> generateConfig(final NetworkElementCommand cmd) {
 
         StringBuilder ospfd = new StringBuilder();
         ospfd.append("hostname " + vrName).append(",");
-        ospfd.append("password zebra").append(",");
         ospfd.append("interface eth1").append(",");
         ospfd.append("  ip ospf hello-interval ").append(qzc.getHelloInterval()).append(",");
         ospfd.append("  ip ospf dead-interval ").append(qzc.getDeadInterval()).append(",");

server/src/com/cloud/network/vpc/VpcManagerImpl.java

@@ -743,8 +743,7 @@ public Map<String, String> quaggaConfigUpdate(final Long zoneId, final String pr
         _dcDao.loadDetails(dc);
         Map<String, String> details = dc.getDetails();
         qzc.setDefaultValues(details);
-        qzc.setValues(protocol, ospfArea, helloInterval, deadInterval, retransmitInterval, transitDelay, authentication, quaggaPassword, superCIDR,
-                enabled);
+        qzc.setValues(protocol, ospfArea, helloInterval, deadInterval, retransmitInterval, transitDelay, authentication, quaggaPassword, superCIDR, enabled);
         details = qzc.getValues();
         dc.setDetails(details);
         _dcDao.saveDetails(dc);
@@ -825,18 +824,15 @@ private List<String> getAllVpcCidrs() {
         List<String> usedSubnets = new ArrayList<String>();
         for (Vpc vpc : _vpcDao.listAll()) {
             if (_vpcSrvcDao.areServicesSupportedInVpc(vpc.getId(), Service.VPCDynamicRouting)) {
-                List<NetworkVO> vpcntwkv = _ntwkDao.listByVpc(vpc.getId());
-                for (NetworkVO vpcntwk : vpcntwkv) {
-                    usedSubnets.add(vpcntwk.getCidr());
-                }
+                usedSubnets.add(vpc.getCidr());
             }
         }
         return usedSubnets;
     }
 
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_VPC_CREATE, eventDescription = "creating vpc", create = true)
-    public Vpc createDynamicVpc(final long zoneId, final long vpcOffId, final long vpcOwnerId, final String vpcName, final String displayText, final String netmask,
+    public synchronized Vpc createDynamicVpc(final long zoneId, final long vpcOffId, final long vpcOwnerId, final String vpcName, final String displayText, final String netmask,
             String networkDomain, final Boolean displayVpc) throws ResourceAllocationException {
         if (netmask != null) {
             if (!NetUtils.isValidNetmask(netmask)) {