incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject git commit: refs/heads/4.1 - CLOUDSTACK-1511 and CLOUDSTACK-1446
Date Wed, 20 Mar 2013 00:45:05 GMT
Updated Branches:
  refs/heads/4.1 0ce1d4fde -> 7734650bf


CLOUDSTACK-1511 and CLOUDSTACK-1446


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7734650b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7734650b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7734650b

Branch: refs/heads/4.1
Commit: 7734650bf9217424fa1bb1d3cedb18ee31437df4
Parents: 0ce1d4f
Author: Min Chen <min.chen@citrix.com>
Authored: Tue Mar 19 16:57:00 2013 -0700
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Wed Mar 20 00:40:29 2013 +0000

----------------------------------------------------------------------
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |    2 ++
 .../src/com/cloud/api/query/vo/UserVmJoinVO.java   |   13 +++++++++++++
 setup/db/db/schema-40to410.sql                     |    3 ++-
 3 files changed, 17 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7734650b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index f561449..8b6abf8 100644
--- a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -185,6 +185,7 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO,
Long> implem
                 nicResponse.setGateway(userVm.getGateway());
                 nicResponse.setNetmask(userVm.getNetmask());
                 nicResponse.setNetworkid(userVm.getNetworkUuid());
+                nicResponse.setNetworkName(userVm.getNetworkName());
                 nicResponse.setMacAddress(userVm.getMacAddress());
                 nicResponse.setIp6Address(userVm.getIp6Address());
                 nicResponse.setIp6Gateway(userVm.getIp6Gateway());
@@ -246,6 +247,7 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO,
Long> implem
             nicResponse.setGateway(uvo.getGateway());
             nicResponse.setNetmask(uvo.getNetmask());
             nicResponse.setNetworkid(uvo.getNetworkUuid());
+            nicResponse.setNetworkName(uvo.getNetworkName());
             nicResponse.setMacAddress(uvo.getMacAddress());
             nicResponse.setIp6Address(uvo.getIp6Address());
             nicResponse.setIp6Gateway(uvo.getIp6Gateway());

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7734650b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
index d723822..33c49cd 100644
--- a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
@@ -293,6 +293,9 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity
{
     @Column(name="network_uuid")
     private String networkUuid;
 
+    @Column(name="network_name")
+    private String networkName;
+
     @Column(name="traffic_type")
     @Enumerated(value=EnumType.STRING)
     private TrafficType trafficType;
@@ -1168,6 +1171,16 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity
{
     }
 
 
+    public String getNetworkName() {
+        return networkName;
+    }
+
+
+    public void setNetworkName(String networkName) {
+        this.networkName = networkName;
+    }
+
+
     public TrafficType getTrafficType() {
         return trafficType;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7734650b/setup/db/db/schema-40to410.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql
index b253663..4b7d1a7 100644
--- a/setup/db/db/schema-40to410.sql
+++ b/setup/db/db/schema-40to410.sql
@@ -572,6 +572,7 @@ CREATE VIEW `cloud`.`user_vm_view` AS
         vpc.id vpc_id,
         vpc.uuid vpc_uuid,
         networks.uuid network_uuid,
+        networks.name network_name,
         networks.traffic_type traffic_type,
         networks.guest_type guest_type,
         user_ip_address.id public_ip_id,
@@ -750,7 +751,7 @@ CREATE VIEW `cloud`.`domain_router_view` AS
             left join
         `cloud`.`networks` ON nics.network_id = networks.id
             left join
-        `cloud`.`vpc` ON networks.vpc_id = vpc.id
+        `cloud`.`vpc` ON domain_router.vpc_id = vpc.id
             left join
         `cloud`.`async_job` ON async_job.instance_id = vm_instance.id
             and async_job.instance_type = 'DomainRouter'


Mime
View raw message