cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [15/50] [abbrv] git commit: updated refs/heads/ui-restyle to 326b3a6
Date Tue, 10 Dec 2013 23:51:55 GMT
remove unused table: ovs_nic_map


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

Branch: refs/heads/ui-restyle
Commit: 0624fe5d030f14b1f143db75e45022a4fbf821d0
Parents: c7dab82
Author: tuna <ng.tuna@gmail.com>
Authored: Mon Nov 4 11:05:57 2013 +0700
Committer: tuna <ng.tuna@gmail.com>
Committed: Mon Dec 9 23:33:15 2013 +0700

----------------------------------------------------------------------
 client/tomcatconf/applicationContext.xml.in     |  1 -
 .../cloud/network/ovs/dao/OvsNicMappingDao.java | 24 ------
 .../network/ovs/dao/OvsNicMappingDaoImpl.java   | 47 -----------
 .../cloud/network/ovs/dao/OvsNicMappingVO.java  | 83 --------------------
 setup/db/db/schema-410to420.sql                 | 10 ---
 5 files changed, 165 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0624fe5d/client/tomcatconf/applicationContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in
index b3778d4..b610227 100644
--- a/client/tomcatconf/applicationContext.xml.in
+++ b/client/tomcatconf/applicationContext.xml.in
@@ -266,7 +266,6 @@
   <bean id="objectInDataStoreDaoImpl" class="org.apache.cloudstack.storage.db.ObjectInDataStoreDaoImpl"
/>
   <bean id="ovsTunnelInterfaceDaoImpl" class="com.cloud.network.ovs.dao.OvsTunnelInterfaceDaoImpl"
/>
   <bean id="ovsTunnelNetworkDaoImpl" class="com.cloud.network.ovs.dao.OvsTunnelNetworkDaoImpl"
/>
-  <bean id="ovsNicMappingDaoImpl" class="com.cloud.network.ovs.dao.OvsNicMappingDaoImpl"
/>
   <bean id="physicalNetworkDaoImpl" class="com.cloud.network.dao.PhysicalNetworkDaoImpl"
/>
   <bean id="physicalNetworkIsolationMethodDaoImpl" class="com.cloud.network.dao.PhysicalNetworkIsolationMethodDaoImpl"
/>
   <bean id="physicalNetworkServiceProviderDaoImpl" class="com.cloud.network.dao.PhysicalNetworkServiceProviderDaoImpl"
/>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0624fe5d/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsNicMappingDao.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsNicMappingDao.java
b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsNicMappingDao.java
deleted file mode 100644
index b2128eb..0000000
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsNicMappingDao.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// 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.ovs.dao;
-
-import com.cloud.utils.db.GenericDao;
-
-public interface OvsNicMappingDao extends GenericDao<OvsNicMappingVO, Long> {
-
-	public OvsNicMappingVO findByNicUuid(String nicUuid);
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0624fe5d/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsNicMappingDaoImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsNicMappingDaoImpl.java
b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsNicMappingDaoImpl.java
deleted file mode 100644
index 87e41b7..0000000
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsNicMappingDaoImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// 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.ovs.dao;
-
-import javax.ejb.Local;
-
-import org.springframework.stereotype.Component;
-
-import com.cloud.utils.db.GenericDaoBase;
-import com.cloud.utils.db.SearchBuilder;
-import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.SearchCriteria.Op;
-
-@Component
-@Local(value=OvsNicMappingDao.class)
-public class OvsNicMappingDaoImpl extends GenericDaoBase<OvsNicMappingVO, Long> implements
OvsNicMappingDao{
-
-	protected final SearchBuilder<OvsNicMappingVO> nicSearch;
-
-	public OvsNicMappingDaoImpl() {
-        nicSearch = createSearchBuilder();
-        nicSearch.and("nicUuid", nicSearch.entity().getNicUuid(), Op.EQ);
-        nicSearch.done();
-    }
-
-	@Override
-	public OvsNicMappingVO findByNicUuid(String nicUuid) {
-		SearchCriteria<OvsNicMappingVO> sc = nicSearch.create();
-        sc.setParameters("nicUuid", nicUuid);
-        return findOneBy(sc);
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0624fe5d/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsNicMappingVO.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsNicMappingVO.java
b/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsNicMappingVO.java
deleted file mode 100644
index dc4a931..0000000
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/dao/OvsNicMappingVO.java
+++ /dev/null
@@ -1,83 +0,0 @@
-// 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.ovs.dao;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import org.apache.cloudstack.api.InternalIdentity;
-
-@Entity
-@Table(name="ovs_nic_map")
-public class OvsNicMappingVO implements InternalIdentity {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name="id")
-	private long id;
-
-	@Column(name="logicalswitch")
-	private String logicalSwitchUuid;
-
-	@Column(name="logicalswitchport")
-	private String logicalSwitchPortUuid;
-
-	@Column(name="nic")
-	private String nicUuid;
-
-	public OvsNicMappingVO() {
-
-	}
-
-	public OvsNicMappingVO (String logicalSwitchUuid, String logicalSwitchPortUuid, String nicUuid)
{
-        this.logicalSwitchUuid = logicalSwitchUuid;
-        this.logicalSwitchPortUuid = logicalSwitchPortUuid;
-        this.nicUuid = nicUuid;
-    }
-
-	public String getLogicalSwitchUuid() {
-        return logicalSwitchUuid;
-    }
-
-	public void setLogicalSwitchUuid(String logicalSwitchUuid) {
-        this.logicalSwitchUuid = logicalSwitchUuid;
-    }
-
-    public String getLogicalSwitchPortUuid() {
-        return logicalSwitchPortUuid;
-    }
-
-    public void setLogicalSwitchPortUuid(String logicalSwitchPortUuid) {
-        this.logicalSwitchPortUuid = logicalSwitchPortUuid;
-    }
-
-    public String getNicUuid() {
-        return nicUuid;
-    }
-
-    public void setNicUuid(String nicUuid) {
-        this.nicUuid = nicUuid;
-    }
-
-    public long getId() {
-        return id;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0624fe5d/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 6ec5723..00ac4d1 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -2103,16 +2103,6 @@ CREATE TABLE `cloud`.`vm_disk_statistics` (
 insert into `cloud`.`vm_disk_statistics`(data_center_id,account_id,vm_id,volume_id) 
 select volumes.data_center_id, volumes.account_id, vm_instance.id, volumes.id from volumes,vm_instance
where vm_instance.vm_type="User" and vm_instance.state<>"Expunging" and volumes.instance_id=vm_instance.id
order by vm_instance.id;
 
-DROP TABLE IF EXISTS `cloud`.`ovs_nic_map`;
-CREATE TABLE `cloud`.`ovs_nic_map` (
-  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `logicalswitch` varchar(255) NOT NULL COMMENT 'uuid of logical switch this port is provisioned
on',
-  `logicalswitchport` varchar(255) UNIQUE COMMENT 'uuid of this logical switch port',
-  `nic` varchar(255) UNIQUE COMMENT 'cloudstack uuid of the nic connected to this logical
switch port',
-  PRIMARY KEY (`id`),
-  CONSTRAINT `fk_ovs_nic_map__nic` FOREIGN KEY(`nic`) REFERENCES `nics`(`uuid`) ON DELETE
CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
 DROP TABLE IF EXISTS `cloud`.`ovs_providers`;
 CREATE TABLE `cloud`.`ovs_providers` (
   `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',


Mime
View raw message