Contrail VRouter plugin major bug fixes for CS 4.3

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>

Author: sbalineni

api/src/com/cloud/network/Network.java

@@ -115,7 +115,7 @@ public static class Provider {
         private static List<Provider> supportedProviders = new ArrayList<Provider>();
 
         public static final Provider VirtualRouter = new Provider("VirtualRouter", false);
-        public static final Provider JuniperContrail = new Provider("JuniperContrail", false);
+        public static final Provider JuniperContrailRouter = new Provider("JuniperContrailRouter", false);
         public static final Provider JuniperSRX = new Provider("JuniperSRX", true);
         public static final Provider PaloAlto = new Provider("PaloAlto", true);
         public static final Provider F5BigIp = new Provider("F5BigIp", true);

plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailElementImpl.java

@@ -52,12 +52,8 @@
 import com.cloud.network.element.NetworkACLServiceProvider;
 import com.cloud.network.element.SourceNatServiceProvider;
 import com.cloud.network.element.StaticNatServiceProvider;
-import com.cloud.network.element.VpcProvider;
 import com.cloud.network.rules.StaticNat;
 import com.cloud.network.vpc.NetworkACLItem;
-import com.cloud.network.vpc.PrivateGateway;
-import com.cloud.network.vpc.StaticRouteProfile;
-import com.cloud.network.vpc.Vpc;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.vm.NicProfile;
@@ -68,14 +64,21 @@
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.network.IpAddress;
+import com.cloud.server.ConfigurationServer;
+import com.cloud.server.ConfigurationServerImpl;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.resource.ResourceManager;
 
 @Component
-@Local(value = {ContrailElement.class, StaticNatServiceProvider.class})
+@Local(value = {ContrailElement.class, StaticNatServiceProvider.class, IpDeployer.class, SourceNatServiceProvider.class})
 public class ContrailElementImpl extends AdapterBase
-    implements ContrailElement, IpDeployer, StaticNatServiceProvider {
+    implements ContrailElement, StaticNatServiceProvider, IpDeployer, SourceNatServiceProvider, DhcpServiceProvider {
 
 	private static final Map<Service, Map<Capability, String>> _capabilities = InitCapabilities();
 
+        @Inject ResourceManager _resourceMgr;
+        @Inject NetworkDao _networksDao;
 	@Inject ContrailManager _manager;
 	@Inject NicDao _nicDao;
 	@Inject ServerDBSync  _dbSync;
@@ -99,7 +102,7 @@ public List<Class<?>> getCommands() {
     // NetworkElement API
     @Override
     public Provider getProvider() {
-        return Provider.JuniperContrail;
+        return Provider.JuniperContrailRouter;
     }
 
     private static Map<Service, Map<Capability, String>> InitCapabilities() {
@@ -346,4 +349,28 @@ private boolean isFloatingIpCreate(PublicIpAddress ip) {
         }
         return false;        
     }
+
+    @Override
+    public boolean addDhcpEntry(Network network, NicProfile nic,
+    		VirtualMachineProfile vm,
+    		DeployDestination dest, ReservationContext context)
+    				throws ConcurrentOperationException, InsufficientCapacityException,
+    				ResourceUnavailableException {
+    	return false;
+    }
+
+    @Override
+    public boolean configDhcpSupportForSubnet(Network network, NicProfile nic,
+    		VirtualMachineProfile vm,
+    		DeployDestination dest, ReservationContext context)
+    				throws ConcurrentOperationException, InsufficientCapacityException,
+    				ResourceUnavailableException {
+    	return false;
+    }
+
+    @Override
+    public boolean removeDhcpSupportForSubnet(Network network)
+    		throws ResourceUnavailableException {
+    	return false;
+    }
 }

plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailGuru.java

@@ -19,6 +19,8 @@
 
 
 import java.io.IOException;
+import java.net.URI;
+import java.util.List;
 
 import javax.inject.Inject;
 
@@ -60,18 +62,28 @@
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.NicVO;
+import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
+import com.cloud.network.addr.PublicIp;
+import com.cloud.user.AccountManager;
+import com.cloud.network.IpAddressManager;
 
-@Component
+@Local(value = {NetworkGuru.class})
 public class ContrailGuru extends AdapterBase implements NetworkGuru {
     @Inject NetworkDao _networkDao;
     @Inject ContrailManager _manager;
     @Inject NicDao _nicDao;
+    @Inject IPAddressDao _ipAddressDao;
+    @Inject AccountManager _accountMgr;
+    @Inject IpAddressManager _ipAddrMgr;
 
     private static final Logger s_logger = Logger.getLogger(ContrailGuru.class);
     private static final TrafficType[] _trafficTypes = {TrafficType.Guest};
 
     private boolean canHandle(NetworkOffering offering) {
-        return (offering.getName().equals(ContrailManager.offeringName));
+        if (offering.getId() == _manager.getRouterOffering().getId())
+            return true;
+        return false;
     }
 
     @Override
@@ -142,7 +154,13 @@ public NicProfile allocate(Network network, NicProfile profile,
         }
 
         profile.setStrategy(ReservationStrategy.Start);
-        
+        URI broadcastUri = null;
+        try {
+            broadcastUri = new URI("vlan://untagged");
+        } catch (Exception e) {
+            s_logger.warn("unable to instantiate broadcast URI: " + e);
+        }
+        profile.setBroadcastUri(broadcastUri);
         return profile;
     }
 
@@ -225,7 +243,9 @@ public void reserve(NicProfile nic, Network network,
         if (nic.getIp4Address() == null) {
             s_logger.debug("Allocated IP address " + ipModel.getAddress());
             nic.setIp4Address(ipModel.getAddress());
-            nic.setNetmask(NetUtils.cidr2Netmask(network.getCidr()));
+            if (network.getCidr() != null) {
+                nic.setNetmask(NetUtils.cidr2Netmask(network.getCidr()));
+            }
             nic.setGateway(network.getGateway());
             nic.setFormat(AddressFormat.Ip4);
         }
@@ -296,6 +316,7 @@ public void shutdown(NetworkProfile network, NetworkOffering offering)  {
             return;
         }
         try {
+            _manager.getDatabase().getVirtualNetworks().remove(vnModel);
             vnModel.delete(_manager.getModelController());
         } catch (IOException e) {
             s_logger.warn("virtual-network delete", e);

plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ContrailManager.java

@@ -25,6 +25,9 @@
 
 import net.juniper.contrail.api.ApiConnector;
 import net.juniper.contrail.api.types.FloatingIp;
+import net.juniper.contrail.api.types.NetworkPolicy;
+import net.juniper.contrail.api.types.Project;
+
 import net.juniper.contrail.api.types.VirtualNetwork;
 
 import com.cloud.network.Network;
@@ -36,16 +39,21 @@
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.domain.DomainVO;
 import com.cloud.projects.ProjectVO;
+import com.cloud.network.vpc.NetworkACLVO;
 
 public interface ContrailManager {
-    public static final String offeringName = "Juniper Contrail offering";
-    public static final String offeringDisplayText = "Juniper Contrail network offering";
+    public static final String routerOfferingName = "Juniper Contrail Network Offering";
+    public static final String routerOfferingDisplayText = "Juniper Contrail Network Offering";
+    public static final String routerPublicOfferingName = "Juniper Contrail Public Network Offering";
+    public static final String routerPublicOfferingDisplayText = "Juniper Contrail Public Network Offering";
     public static final int DB_SYNC_INTERVAL_DEFAULT = 600000;
     public static final String VNC_ROOT_DOMAIN = "default-domain";
     public static final String VNC_DEFAULT_PROJECT = "default-project";
     public static final String managementNetworkName = "ip-fabric";
 
-    public NetworkOffering getOffering();
+    public NetworkOffering getRouterOffering();
+    public NetworkOffering getPublicRouterOffering();
+
     public void syncNetworkDB(short syncMode) throws IOException;
 
     public boolean isManagedPhysicalNetwork(Network network);
@@ -68,6 +76,7 @@ public interface ContrailManager {
     public String getDefaultPublicNetworkFQN();
     public String getProjectId(long domainId, long accountId) throws IOException;
     public net.juniper.contrail.api.types.Project getVncProject(long domainId, long accountId) throws IOException;
+    public net.juniper.contrail.api.types.Project  getDefaultVncProject() throws IOException;
     public boolean isSystemRootDomain(net.juniper.contrail.api.types.Domain vnc);
     public boolean isSystemRootDomain(DomainVO domain);
     public boolean isSystemDefaultProject(net.juniper.contrail.api.types.Project project);
@@ -80,14 +89,16 @@ public interface ContrailManager {
     public ApiConnector getApiConnector();
     public ModelDatabase getDatabase();
     public ModelController getModelController(); 
-    public List<NetworkVO> findJuniperManagedNetworks(List<TrafficType> types);
-    public List<IPAddressVO> findJuniperManagedPublicIps();
+    public List<NetworkVO> findManagedNetworks(List<TrafficType> types);
+    public List<NetworkVO> findSystemNetworks(List<TrafficType> types);
+    public List<IPAddressVO> findManagedPublicIps();
+    public List<NetworkACLVO> findManagedACLs();
     public VirtualNetwork findDefaultVirtualNetwork(TrafficType trafficType)
             throws IOException;
     public List<FloatingIp> getFloatingIps();
     public VirtualNetworkModel lookupPublicNetworkModel();
-    public void createPublicNetworks();
     public boolean createFloatingIp(PublicIpAddress ip);
     public boolean deleteFloatingIp(PublicIpAddress ip);
+    public boolean isSystemDefaultNetworkPolicy(NetworkPolicy policy);
 }