Skip to content

Commit c7d6376

Browse files
author
Mike Tutkowski
committed
Removing an old, unused NetApp plug-in
1 parent 1d132d0 commit c7d6376

50 files changed

Lines changed: 4 additions & 4353 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎client/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,21 +1081,6 @@
10811081
</dependency>
10821082
</dependencies>
10831083
</profile>
1084-
<profile>
1085-
<id>netapp</id>
1086-
<activation>
1087-
<property>
1088-
<name>noredist</name>
1089-
</property>
1090-
</activation>
1091-
<dependencies>
1092-
<dependency>
1093-
<groupId>org.apache.cloudstack</groupId>
1094-
<artifactId>cloud-plugin-netapp</artifactId>
1095-
<version>${project.version}</version>
1096-
</dependency>
1097-
</dependencies>
1098-
</profile>
10991084
<profile>
11001085
<id>f5</id>
11011086
<activation>

‎cloud-cli/bindir/cloudvoladm‎

Lines changed: 0 additions & 607 deletions
This file was deleted.

‎deps/install-non-oss.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ mvn install:install-file -Dfile=cloud-iControl.jar -DgroupId=com.cloud.com.
2424
# Version: unknown
2525
mvn install:install-file -Dfile=cloud-netscaler-sdx.jar -DgroupId=com.cloud.com.citrix -DartifactId=netscaler-sdx -Dversion=1.0 -Dpackaging=jar
2626

27-
# From http://support.netapp.com/ (not available online, contact your support representative)
28-
# Version: 4.0
29-
if [ -e cloud-manageontap.jar ]; then mv cloud-manageontap.jar manageontap.jar; fi
30-
mvn install:install-file -Dfile=manageontap.jar -DgroupId=com.cloud.com.netapp -DartifactId=manageontap -Dversion=4.0 -Dpackaging=jar
31-
3227
# From https://my.vmware.com/group/vmware/get-download?downloadGroup=VSP510-WEBSDK-510
3328
# Version: 5.1, Release-date: 2012-09-10, Build: 774886
3429
mvn install:install-file -Dfile=vim25_51.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim25 -Dversion=5.1 -Dpackaging=jar

‎engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade2213to2214.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,6 @@ private void fixIndexes(Connection conn) {
9191
throw new CloudRuntimeException("Unable to execute cloud_usage usage_event table update", e);
9292
}
9393

94-
//Drop netapp_volume primary key and add it again
95-
DbUpgradeUtils.dropPrimaryKeyIfExists(conn, "cloud.netapp_volume");
96-
try {
97-
PreparedStatement pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`netapp_volume` add PRIMARY KEY (`id`)");
98-
pstmt.executeUpdate();
99-
pstmt.close();
100-
} catch (SQLException e) {
101-
throw new CloudRuntimeException("Unable to update primary key for netapp_volume", e);
102-
}
103-
10494
//Drop i_snapshots__removed key (if exists) and re-add it again
10595
keys = new ArrayList<String>();
10696
keys.add("i_snapshots__removed");

‎engine/schema/src/main/resources/META-INF/db/schema-227to228-premium.sql‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -18,45 +18,6 @@
1818
--;
1919
-- Schema upgrade from 2.2.7 to 2.2.8;
2020
--;
21-
CREATE TABLE IF NOT EXISTS `cloud`.`netapp_pool` (
22-
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
23-
`name` varchar(255) NOT NULL UNIQUE COMMENT 'name for the pool',
24-
`algorithm` varchar(255) NOT NULL COMMENT 'algorithm',
25-
PRIMARY KEY (`id`)
26-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
27-
28-
29-
CREATE TABLE IF NOT EXISTS `cloud`.`netapp_volume` (
30-
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
31-
`ip_address` varchar(255) NOT NULL COMMENT 'ip address/fqdn of the volume',
32-
`pool_id` bigint unsigned NOT NULL COMMENT 'id for the pool',
33-
`pool_name` varchar(255) NOT NULL COMMENT 'name for the pool',
34-
`aggregate_name` varchar(255) NOT NULL COMMENT 'name for the aggregate',
35-
`volume_name` varchar(255) NOT NULL COMMENT 'name for the volume',
36-
`volume_size` varchar(255) NOT NULL COMMENT 'volume size',
37-
`snapshot_policy` varchar(255) NOT NULL COMMENT 'snapshot policy',
38-
`snapshot_reservation` int NOT NULL COMMENT 'snapshot reservation',
39-
`username` varchar(255) NOT NULL COMMENT 'username',
40-
`password` varchar(200) COMMENT 'password',
41-
`round_robin_marker` int COMMENT 'This marks the volume to be picked up for lun creation, RR fashion',
42-
PRIMARY KEY (`ip_address`,`aggregate_name`,`volume_name`),
43-
CONSTRAINT `fk_netapp_volume__pool_id` FOREIGN KEY `fk_netapp_volume__pool_id` (`pool_id`) REFERENCES `netapp_pool` (`id`) ON DELETE CASCADE,
44-
INDEX `i_netapp_volume__pool_id`(`pool_id`)
45-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
46-
47-
48-
CREATE TABLE IF NOT EXISTS `cloud`.`netapp_lun` (
49-
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
50-
`lun_name` varchar(255) NOT NULL COMMENT 'lun name',
51-
`target_iqn` varchar(255) NOT NULL COMMENT 'target iqn',
52-
`path` varchar(255) NOT NULL COMMENT 'lun path',
53-
`size` bigint NOT NULL COMMENT 'lun size',
54-
`volume_id` bigint unsigned NOT NULL COMMENT 'parent volume id',
55-
PRIMARY KEY (`id`),
56-
CONSTRAINT `fk_netapp_lun__volume_id` FOREIGN KEY `fk_netapp_lun__volume_id` (`volume_id`) REFERENCES `netapp_volume` (`id`) ON DELETE CASCADE,
57-
INDEX `i_netapp_lun__volume_id`(`volume_id`),
58-
INDEX `i_netapp_lun__lun_name`(`lun_name`)
59-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
6021

6122
--;
6223
-- Cleanup usage records for bug # 10727;

‎engine/schema/src/main/resources/META-INF/db/schema-481to490-cleanup.sql‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ ALTER TABLE `cloud`.`iam_policy` DROP INDEX `id` ;
4747
ALTER TABLE `cloud`.`iam_policy_permission` DROP INDEX `id` ;
4848
ALTER TABLE `cloud`.`image_store_details` DROP INDEX `id` ;
4949
ALTER TABLE `cloud`.`instance_group` DROP INDEX `id` ;
50-
ALTER TABLE `cloud`.`netapp_lun` DROP INDEX `id` ;
51-
ALTER TABLE `cloud`.`netapp_pool` DROP INDEX `id` ;
52-
ALTER TABLE `cloud`.`netapp_volume` DROP INDEX `id` ;
5350
ALTER TABLE `cloud`.`network_acl_item_cidrs` DROP INDEX `id` ;
5451
ALTER TABLE `cloud`.`network_offerings` DROP INDEX `id` ;
5552
ALTER TABLE `cloud`.`nic_secondary_ips` DROP INDEX `id` ;

‎plugins/file-systems/netapp/pom.xml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/AssociateLunCmd.java‎

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎plugins/file-systems/netapp/src/main/java/com/cloud/api/commands/netapp/CreateLunCmd.java‎

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)