[GetEipAttachableVmNics]GetEipAttachableVmNics from flat network shows vrouter private network #1522

zxwing · zxwing · commit 138e9b517535 · 2017-01-11T12:02:24.000-05:00
for https://github.com/zxwing/premium/issues/1522
diff --git a/core/src/main/java/org/zstack/core/db/SQL.java b/core/src/main/java/org/zstack/core/db/SQL.java
@@ -0,0 +1,90 @@
+package org.zstack.core.db;
+
+import org.springframework.beans.factory.annotation.Autowire;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.LockModeType;
+import javax.persistence.Query;
+import java.util.List;
+
+/**
+ * Created by xing5 on 2017/1/11.
+ */
+@Configurable(preConstruction = true, autowire = Autowire.BY_TYPE)
+public class SQL {
+    @Autowired
+    private DatabaseFacade dbf;
+
+    private String sql;
+    private Query query;
+    private boolean useTransaction;
+
+    private SQL(String sql) {
+        this.sql = sql;
+        query = dbf.getEntityManager().createQuery(this.sql);
+    }
+
+    public SQL transactional() {
+        useTransaction = true;
+        return this;
+    }
+
+    public SQL param(String key, Object o) {
+        query.setParameter(key, o);
+        return this;
+    }
+
+    public SQL first(int offset) {
+        query.setFirstResult(offset);
+        return this;
+    }
+
+    public SQL max(int max) {
+        query.setMaxResults(max);
+        return this;
+    }
+
+    public SQL lock(LockModeType mode) {
+        query.setLockMode(mode);
+        return this;
+    }
+
+    @Transactional(readOnly = true)
+    private List transactionalList() {
+        return query.getResultList();
+    }
+
+    public <T> List<T> list()  {
+        return useTransaction ? transactionalList() : query.getResultList();
+    }
+
+    @Transactional(readOnly = true)
+    private <K> K transactionalFind() {
+        List lst = query.getResultList();
+        return lst.isEmpty() ? null : (K) lst.get(0);
+    }
+
+    public <K> K find() {
+        if (useTransaction) {
+            return transactionalFind();
+        } else {
+            List lst = query.getResultList();
+            return lst.isEmpty() ? null : (K) lst.get(0);
+        }
+    }
+
+    @Transactional(readOnly = true)
+    private int transactionalExecute() {
+        return query.executeUpdate();
+    }
+
+    public int execute() {
+        return useTransaction ? transactionalExecute() : query.executeUpdate();
+    }
+
+    public static SQL New(String sql) {
+        return new SQL(sql);
+    }
+}
diff --git a/plugin/eip/src/main/java/org/zstack/network/service/eip/EipManagerImpl.java b/plugin/eip/src/main/java/org/zstack/network/service/eip/EipManagerImpl.java
@@ -7,6 +7,7 @@
 import org.zstack.core.cloudbus.MessageSafe;
 import org.zstack.core.componentloader.PluginRegistry;
 import org.zstack.core.db.DatabaseFacade;
+import org.zstack.core.db.SQL;
 import org.zstack.core.db.SimpleQuery;
 import org.zstack.core.db.SimpleQuery.Op;
 import org.zstack.core.db.UpdateQuery;
@@ -130,7 +131,9 @@ private void handle(APIUpdateEipMsg msg) {
 
     @Transactional(readOnly = true)
     private List<VmNicInventory> getAttachableVmNicForEip(String eipUuid, String vipUuid) {
-        String zoneUuid = null;
+        String zoneUuid;
+        String providerType;
+
         if (eipUuid != null) {
             String sql = "select l3.zoneUuid, vip.uuid" +
                     " from L3NetworkVO l3, VipVO vip, EipVO eip" +
@@ -142,6 +145,10 @@ private List<VmNicInventory> getAttachableVmNicForEip(String eipUuid, String vip
             Tuple t = q.getSingleResult();
             zoneUuid = t.get(0, String.class);
             vipUuid = t.get(1, String.class);
+
+            providerType = SQL.New("select v.serviceProvider from VipVO v, EipVO e where e.vipUuid = v.uuid" +
+                    " and e.uuid = :euuid").param("euuid", eipUuid).find();
+
         } else {
             String sql = "select l3.zoneUuid" +
                     " from L3NetworkVO l3, VipVO vip" +
@@ -150,28 +157,53 @@ private List<VmNicInventory> getAttachableVmNicForEip(String eipUuid, String vip
             TypedQuery<String> q = dbf.getEntityManager().createQuery(sql, String.class);
             q.setParameter("vipUuid", vipUuid);
             zoneUuid = q.getSingleResult();
+
+            providerType = SQL.New("select v.serviceProvider from VipVO v where v.uuid = :uuid")
+                    .param("uuid", vipUuid).find();
         }
 
+        List<String> l3Uuids;
+
+        if (providerType != null) {
+            // the eip is created on the backend
+            l3Uuids = SQL.New("select l3.uuid" +
+                    " from L3NetworkVO l3, VipVO vip, NetworkServiceL3NetworkRefVO ref, NetworkServiceProviderVO np" +
+                    " where l3.system = :system" +
+                    " and l3.uuid != vip.l3NetworkUuid" +
+                    " and l3.uuid = ref.l3NetworkUuid" +
+                    " and ref.networkServiceType = :nsType" +
+                    " and l3.zoneUuid = :zoneUuid" +
+                    " and vip.uuid = :vipUuid" +
+                    " and np.uuid = ref.networkServiceProviderUuid" +
+                    " and np.type = :npType")
+                    .param("system", false)
+                    .param("zoneUuid", zoneUuid)
+                    .param("nsType", EipConstant.EIP_NETWORK_SERVICE_TYPE)
+                    .param("npType", providerType)
+                    .param("vipUuid", vipUuid)
+                    .list();
+        } else {
+            // the eip is not created on the backend
+            l3Uuids = SQL.New("select l3.uuid" +
+                    " from L3NetworkVO l3, VipVO vip, NetworkServiceL3NetworkRefVO ref" +
+                    " where l3.system = :system" +
+                    " and l3.uuid != vip.l3NetworkUuid" +
+                    " and l3.uuid = ref.l3NetworkUuid" +
+                    " and ref.networkServiceType = :nsType" +
+                    " and l3.zoneUuid = :zoneUuid" +
+                    " and vip.uuid = :vipUuid")
+                    .param("system", false)
+                    .param("zoneUuid", zoneUuid)
+                    .param("nsType", EipConstant.EIP_NETWORK_SERVICE_TYPE)
+                    .param("vipUuid", vipUuid)
+                    .list();
+        }
 
-        String sql = "select l3.uuid" +
-                " from L3NetworkVO l3, VipVO vip, NetworkServiceL3NetworkRefVO ref" +
-                " where l3.system = :system" +
-                " and l3.uuid != vip.l3NetworkUuid" +
-                " and l3.uuid = ref.l3NetworkUuid" +
-                " and ref.networkServiceType = :nsType" +
-                " and l3.zoneUuid = :zoneUuid" +
-                " and vip.uuid = :vipUuid";
-        TypedQuery<String> l3q = dbf.getEntityManager().createQuery(sql, String.class);
-        l3q.setParameter("vipUuid", vipUuid);
-        l3q.setParameter("system", false);
-        l3q.setParameter("zoneUuid", zoneUuid);
-        l3q.setParameter("nsType", EipConstant.EIP_NETWORK_SERVICE_TYPE);
-        List<String> l3Uuids = l3q.getResultList();
         if (l3Uuids.isEmpty()) {
-            return new ArrayList<VmNicInventory>();
+            return new ArrayList<>();
         }
 
-        sql = "select nic" +
+        String sql = "select nic" +
                 " from VmNicVO nic, VmInstanceVO vm" +
                 " where nic.l3NetworkUuid in (:l3Uuids)" +
                 " and nic.vmInstanceUuid = vm.uuid" +
diff --git a/runMavenProfile b/runMavenProfile
@@ -4,6 +4,12 @@ usage() {
     echo "usage:$0 [deploydb|deploy|xml-java-schema|premium|sdk|doc]"
 }
 
+py() {
+    cd test
+    mvn test -Dtest=TestGenerateApiPythonClassAndJsonTemplate
+    cd - > /dev/null
+}
+
 doc() {
     cd test
     mvn test -Dtest=TestGenerateDocTemplate
@@ -43,6 +49,8 @@ run_profile() {
         sdk
     elif test x$1 = x'doc'; then
 	doc
+    elif test x$1 = x'py'; then
+	py
     else
         mvn -pl build -P $1 exec:exec -D$1
     fi
diff --git a/sdk/src/main/java/org/zstack/sdk/ZSClient.java b/sdk/src/main/java/org/zstack/sdk/ZSClient.java
@@ -19,7 +19,7 @@
  * Created by xing5 on 2016/12/9.
  */
 public class ZSClient {
-    private static final OkHttpClient http = new OkHttpClient();
+    private static OkHttpClient http = new OkHttpClient();
 
     static final Gson gson;
     static final Gson prettyGson;
@@ -39,6 +39,19 @@ public static ZSConfig getConfig() {
 
     public static void configure(ZSConfig c) {
         config = c;
+
+        if (c.readTimeout != null || c.writeTimeout != null) {
+            OkHttpClient.Builder b = new OkHttpClient.Builder();
+
+            if (c.readTimeout != null) {
+                b.readTimeout(c.readTimeout, TimeUnit.MILLISECONDS);
+            }
+            if (c.writeTimeout != null) {
+                b.writeTimeout(c.writeTimeout, TimeUnit.MILLISECONDS);
+            }
+
+            http = b.build();
+        }
     }
 
     public static void webHookCallback(HttpServletRequest req, HttpServletResponse rsp) {
diff --git a/sdk/src/main/java/org/zstack/sdk/ZSConfig.java b/sdk/src/main/java/org/zstack/sdk/ZSConfig.java
@@ -11,6 +11,8 @@ public class ZSConfig {
     long defaultPollingTimeout = TimeUnit.HOURS.toMillis(3);
     long defaultPollingInterval = TimeUnit.SECONDS.toMillis(1);
     String webHook;
+    Long readTimeout;
+    Long writeTimeout;
 
     public String getHostname() {
         return hostname;
@@ -56,6 +58,17 @@ public Builder setDefaultPollingInterval(long value, TimeUnit unit) {
             return this;
         }
 
+        public Builder setReadTimeout(long value, TimeUnit unit) {
+            config.readTimeout = unit.toMillis(value);
+            return this;
+        }
+
+        public Builder setWriteTimeout(long value, TimeUnit unit) {
+            config.writeTimeout = unit.toMillis(value);
+            return this;
+        }
+
+
         public ZSConfig build() {
             return config;
         }
diff --git a/test/src/test/java/org/zstack/test/Api.java b/test/src/test/java/org/zstack/test/Api.java
@@ -174,6 +174,8 @@ public class Api implements CloudBusEventListener {
                         .setPort(8989)
                         .setDefaultPollingInterval(100, TimeUnit.MILLISECONDS)
                         .setDefaultPollingTimeout(15, TimeUnit.SECONDS)
+                        .setReadTimeout(10, TimeUnit.MINUTES)
+                        .setWriteTimeout(10, TimeUnit.MINUTES)
                         .build()
         );
     }
diff --git a/test/src/test/java/org/zstack/test/eip/flatnetwork/TestFlatNetworkEip17.java b/test/src/test/java/org/zstack/test/eip/flatnetwork/TestFlatNetworkEip17.java
@@ -0,0 +1,94 @@
+package org.zstack.test.eip.flatnetwork;
+
+import junit.framework.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.zstack.core.cloudbus.CloudBus;
+import org.zstack.core.componentloader.ComponentLoader;
+import org.zstack.core.db.DatabaseFacade;
+import org.zstack.header.identity.SessionInventory;
+import org.zstack.header.vm.VmInstanceInventory;
+import org.zstack.header.vm.VmNicInventory;
+import org.zstack.network.service.eip.EipInventory;
+import org.zstack.network.service.flat.FlatNetworkServiceSimulatorConfig;
+import org.zstack.simulator.kvm.KVMSimulatorConfig;
+import org.zstack.simulator.virtualrouter.VirtualRouterSimulatorConfig;
+import org.zstack.test.Api;
+import org.zstack.test.ApiSenderException;
+import org.zstack.test.DBUtil;
+import org.zstack.test.WebBeanConstructor;
+import org.zstack.test.deployer.Deployer;
+
+import java.util.List;
+
+/**
+ * 1. create two vm on two l3 networks
+ * 2. one network has flat network provider and another network uses virtual router
+ * 3. create an eip
+ *
+ * confirm the eip is attachable to two vms
+ *
+ * 4. attach/detach the eip so the eip is created on the backend
+ *
+ * confirm the eip is only attachable to the vm that it used to attach to
+ */
+public class TestFlatNetworkEip17 {
+    Deployer deployer;
+    Api api;
+    ComponentLoader loader;
+    CloudBus bus;
+    DatabaseFacade dbf;
+    SessionInventory session;
+    VirtualRouterSimulatorConfig vconfig;
+    KVMSimulatorConfig kconfig;
+    FlatNetworkServiceSimulatorConfig fconfig;
+
+    @Before
+    public void setUp() throws Exception {
+        DBUtil.reDeployDB();
+        WebBeanConstructor con = new WebBeanConstructor();
+        deployer = new Deployer("deployerXml/eip/TestFlatNetworkEip17.xml", con);
+        deployer.addSpringConfig("VirtualRouter.xml");
+        deployer.addSpringConfig("VirtualRouterSimulator.xml");
+        deployer.addSpringConfig("flatNetworkServiceSimulator.xml");
+        deployer.addSpringConfig("flatNetworkProvider.xml");
+        deployer.addSpringConfig("KVMRelated.xml");
+        deployer.addSpringConfig("vip.xml");
+        deployer.addSpringConfig("eip.xml");
+        deployer.build();
+        api = deployer.getApi();
+        loader = deployer.getComponentLoader();
+        vconfig = loader.getComponent(VirtualRouterSimulatorConfig.class);
+        kconfig = loader.getComponent(KVMSimulatorConfig.class);
+        bus = loader.getComponent(CloudBus.class);
+        dbf = loader.getComponent(DatabaseFacade.class);
+        fconfig = loader.getComponent(FlatNetworkServiceSimulatorConfig.class);
+        session = api.loginAsAdmin();
+    }
+
+    @Test
+    public void test() throws ApiSenderException {
+        VmInstanceInventory vm = deployer.vms.get("TestVm");
+        VmInstanceInventory vm1 = deployer.vms.get("TestVm1");
+        EipInventory eip = deployer.eips.get("eip");
+
+        List<VmNicInventory> nics = api.getEipAttachableVmNicsByEipUuid(eip.getUuid());
+        Assert.assertEquals(2, nics.size());
+        nics = api.getEipAttachableVmNicsByVipUuid(eip.getVipUuid());
+        Assert.assertEquals(2, nics.size());
+
+        // this creates the EIP on the backend
+        api.attachEip(eip.getUuid(), vm.getVmNics().get(0).getUuid());
+        api.detachEip(eip.getUuid());
+
+        nics = api.getEipAttachableVmNicsByEipUuid(eip.getUuid());
+        Assert.assertEquals(1, nics.size());
+        VmNicInventory nic = nics.get(0);
+        Assert.assertEquals(vm.getVmNics().get(0).getUuid(), nic.getUuid());
+
+        nics = api.getEipAttachableVmNicsByVipUuid(eip.getVipUuid());
+        Assert.assertEquals(1, nics.size());
+        nic = nics.get(0);
+        Assert.assertEquals(vm.getVmNics().get(0).getUuid(), nic.getUuid());
+    }
+}
diff --git a/test/src/test/resources/deployerXml/eip/TestFlatNetworkEip17.xml b/test/src/test/resources/deployerXml/eip/TestFlatNetworkEip17.xml
diff --git a/test/src/test/resources/unitTestSuiteXml/flatnetworkEip.xml b/test/src/test/resources/unitTestSuiteXml/flatnetworkEip.xml

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,8 @@ public class Api implements CloudBusEventListener {`
`174`	`174`	`.setPort(8989)`
`175`	`175`	`.setDefaultPollingInterval(100, TimeUnit.MILLISECONDS)`
`176`	`176`	`.setDefaultPollingTimeout(15, TimeUnit.SECONDS)`
	`177`	`+ .setReadTimeout(10, TimeUnit.MINUTES)`
	`178`	`+ .setWriteTimeout(10, TimeUnit.MINUTES)`
`177`	`179`	`.build()`
`178`	`180`	`);`
`179`	`181`	`}`