cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [2/2] git commit: updated refs/heads/4.3 to 0837697
Date Wed, 13 Nov 2013 22:41:18 GMT
Resource Metadata: added implementation for Remote Access VPN


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

Branch: refs/heads/4.3
Commit: 0837697f9bd31ad495e9703f0781e8f4e9333990
Parents: 2b6ca5a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Wed Nov 13 13:43:01 2013 -0800
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Wed Nov 13 14:27:06 2013 -0800

----------------------------------------------------------------------
 api/src/com/cloud/server/ResourceTag.java       |  2 +-
 .../spring-engine-schema-core-daos-context.xml  |  2 +-
 .../resourcedetail/FirewallRuleDetailVO.java    |  4 +-
 .../resourcedetail/RemoteAccessVpnDetailVO.java | 80 ++++++++++++++++++++
 .../resourcedetail/UserIpAddressDetailVO.java   |  4 +-
 .../dao/RemoteAccessVpnDetailsDao.java          | 26 +++++++
 .../dao/RemoteAccessVpnDetailsDaoImpl.java      | 35 +++++++++
 .../metadata/ResourceMetaDataManagerImpl.java   |  4 +
 setup/db/db/schema-421to430.sql                 | 10 +++
 9 files changed, 161 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0837697f/api/src/com/cloud/server/ResourceTag.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/ResourceTag.java b/api/src/com/cloud/server/ResourceTag.java
index e15a070..ba1aeb8 100644
--- a/api/src/com/cloud/server/ResourceTag.java
+++ b/api/src/com/cloud/server/ResourceTag.java
@@ -41,7 +41,7 @@ public interface ResourceTag extends ControlledEntity, Identity, InternalIdentit
         NetworkACL (true, false),
         StaticRoute (true, false),
         VMSnapshot (true, false),
-        RemoteAccessVpn (true, false),
+        RemoteAccessVpn (true, true),
         Zone (false, true),
         ServiceOffering (false, true),
         Storage(false, true);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0837697f/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
----------------------------------------------------------------------
diff --git a/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
b/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
index 0a5ae50..a8a1bff 100644
--- a/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
+++ b/engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
@@ -322,7 +322,7 @@
   <bean id="AffinityGroupDomainMapDaoImpl" class="org.apache.cloudstack.affinity.dao.AffinityGroupDomainMapDaoImpl"
/>
   <bean id="FirewallRuleDetailsDaoImpl" class="org.apache.cloudstack.resourcedetail.dao.FirewallRuleDetailsDaoImpl"
/>
   <bean id="UserIpAddressDetailsDaoImpl" class="org.apache.cloudstack.resourcedetail.dao.UserIpAddressDetailsDaoImpl"
/>
-
+  <bean id="RemoteAccessVpnDetailsDaoImpl" class="org.apache.cloudstack.resourcedetail.dao.RemoteAccessVpnDetailsDaoImpl"
/>
   
   <bean id="databaseIntegrityChecker" class="com.cloud.upgrade.DatabaseIntegrityChecker"
/>
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0837697f/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java
b/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java
index a2ec6ff..9b431f2 100644
--- a/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/FirewallRuleDetailVO.java
@@ -47,8 +47,8 @@ public class FirewallRuleDetailVO implements ResourceDetail{
 
     public FirewallRuleDetailVO() {}
 
-    public FirewallRuleDetailVO(long networkId, String name, String value) {
-        this.resourceId = networkId;
+    public FirewallRuleDetailVO(long id, String name, String value) {
+        this.resourceId = id;
         this.name = name;
         this.value = value;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0837697f/engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java
b/engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java
new file mode 100644
index 0000000..625feb5
--- /dev/null
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/RemoteAccessVpnDetailVO.java
@@ -0,0 +1,80 @@
+// 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 org.apache.cloudstack.resourcedetail;
+
+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.ResourceDetail;
+
+@Entity
+@Table(name="remote_access_vpn_details")
+public class RemoteAccessVpnDetailVO implements ResourceDetail{
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    @Column(name="id")
+    private long id;
+
+    @Column(name="remote_access_vpn_id")
+    private long resourceId;
+
+    @Column(name="name")
+    private String name;
+
+    @Column(name="value", length=1024)
+    private String value;
+    
+    @Column(name="display")
+    private boolean display;
+
+    public RemoteAccessVpnDetailVO() {}
+
+    public RemoteAccessVpnDetailVO(long id, String name, String value) {
+        this.resourceId = id;
+        this.name = name;
+        this.value = value;
+    }
+
+    @Override
+    public long getId() {
+        return id;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public long getResourceId() {
+        return resourceId;
+    }
+
+    @Override
+    public boolean isDisplay() {
+        return display;
+    }
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0837697f/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java
b/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java
index 56a47c2..2b2f5e1 100644
--- a/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/UserIpAddressDetailVO.java
@@ -47,8 +47,8 @@ public class UserIpAddressDetailVO implements ResourceDetail{
 
     public UserIpAddressDetailVO() {}
 
-    public UserIpAddressDetailVO(long networkId, String name, String value) {
-        this.resourceId = networkId;
+    public UserIpAddressDetailVO(long id, String name, String value) {
+        this.resourceId = id;
         this.name = name;
         this.value = value;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0837697f/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDao.java
b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDao.java
new file mode 100644
index 0000000..697c91b
--- /dev/null
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDao.java
@@ -0,0 +1,26 @@
+// 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 org.apache.cloudstack.resourcedetail.dao;
+
+import org.apache.cloudstack.resourcedetail.RemoteAccessVpnDetailVO;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
+
+import com.cloud.utils.db.GenericDao;
+
+public interface RemoteAccessVpnDetailsDao extends GenericDao<RemoteAccessVpnDetailVO,
Long>, ResourceDetailsDao<RemoteAccessVpnDetailVO>{
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0837697f/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java
b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java
new file mode 100644
index 0000000..46e6be9
--- /dev/null
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/RemoteAccessVpnDetailsDaoImpl.java
@@ -0,0 +1,35 @@
+// 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 org.apache.cloudstack.resourcedetail.dao;
+
+import javax.ejb.Local;
+
+import org.apache.cloudstack.resourcedetail.RemoteAccessVpnDetailVO;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
+import org.springframework.stereotype.Component;
+
+
+@Component
+@Local (value={RemoteAccessVpnDetailsDao.class})
+public class RemoteAccessVpnDetailsDaoImpl extends ResourceDetailsDaoBase<RemoteAccessVpnDetailVO>
implements RemoteAccessVpnDetailsDao {
+
+    @Override
+    public void addDetail(long resourceId, String key, String value) {
+        super.addDetail(new RemoteAccessVpnDetailVO(resourceId, key, value));
+    }
+}
+

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0837697f/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
index 12ac26a..cf1254b 100644
--- a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
+++ b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
@@ -27,6 +27,7 @@ import javax.naming.ConfigurationException;
 import org.apache.cloudstack.api.ResourceDetail;
 import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
 import org.apache.cloudstack.resourcedetail.dao.FirewallRuleDetailsDao;
+import org.apache.cloudstack.resourcedetail.dao.RemoteAccessVpnDetailsDao;
 import org.apache.cloudstack.resourcedetail.dao.UserIpAddressDetailsDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
 import org.apache.log4j.Logger;
@@ -78,6 +79,8 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements
Resource
     FirewallRuleDetailsDao _firewallRuleDetailsDao;
     @Inject
     UserIpAddressDetailsDao _userIpAddressDetailsDao;
+    @Inject
+    RemoteAccessVpnDetailsDao _vpnDetailsDao;
     
     private static Map<ResourceObjectType, ResourceDetailsDao<? extends ResourceDetail>>
_daoMap= 
             new HashMap<ResourceObjectType, ResourceDetailsDao<? extends ResourceDetail>>();
@@ -97,6 +100,7 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements
Resource
         _daoMap.put(ResourceObjectType.PublicIpAddress, _userIpAddressDetailsDao);
         _daoMap.put(ResourceObjectType.PortForwardingRule, _firewallRuleDetailsDao);
         _daoMap.put(ResourceObjectType.LoadBalancer, _firewallRuleDetailsDao);
+        _daoMap.put(ResourceObjectType.RemoteAccessVpn, _vpnDetailsDao);
 
         return true;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0837697f/setup/db/db/schema-421to430.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
index 8b0d136..6507148 100644
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@ -629,3 +629,13 @@ CREATE TABLE `cloud`.`user_ip_address_details` (
   PRIMARY KEY (`id`),
   CONSTRAINT `fk_user_ip_address_details__user_ip_address_id` FOREIGN KEY `fk_user_ip_address_details__user_ip_address_id`(`user_ip_address_id`)
REFERENCES `user_ip_address`(`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `cloud`.`remote_access_vpn_details` (
+  `id` bigint unsigned NOT NULL auto_increment,
+  `remote_access_vpn_id` bigint unsigned NOT NULL COMMENT 'Remote access vpn id',
+  `name` varchar(255) NOT NULL,
+  `value` varchar(1024) NOT NULL,
+  `display` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'True if the detail can be displayed
to the end user',
+  PRIMARY KEY (`id`),
+  CONSTRAINT `fk_remote_access_vpn_details__remote_access_vpn_id` FOREIGN KEY `fk_remote_access_vpn_details__remote_access_vpn_id`(`remote_access_vpn_id`)
REFERENCES `remote_access_vpn`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;


Mime
View raw message