cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kous...@apache.org
Subject [55/55] [abbrv] git commit: updated refs/heads/cisco-vnmc-api-integration to f38be48
Date Mon, 08 Apr 2013 13:14:05 GMT
Removed unwanted files


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

Branch: refs/heads/cisco-vnmc-api-integration
Commit: f38be4810e2e1349260ee262b85db81f60252d9e
Parents: 902ce42
Author: Koushik Das <koushik.das@citrix.com>
Authored: Mon Apr 8 18:42:06 2013 +0530
Committer: Koushik Das <koushik.das@citrix.com>
Committed: Mon Apr 8 18:42:06 2013 +0530

----------------------------------------------------------------------
 .../cisco/responses/list-tenants-response.xml      |    7 -
 .../network/cisco/responses/login-error.xml        |    1 -
 .../network/cisco/responses/login-success.xml      |    2 -
 .../scripts/network/cisco/vsm/generate_vsm_cli.sh  |    6 -
 .../scripts/network/cisco/vsm/vservice_node        |    6 -
 .../network/cisco/vsm/vsm_asa_inside_profiles      |    8 -
 .../network/cisco/vsm/vsm_tenant_port_profiles     |   12 -
 .../com/cloud/network/cisco/CiscoVnmcManager.java  |  245 ---------------
 8 files changed, 0 insertions(+), 287 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f38be481/plugins/network-elements/cisco-vnmc/scripts/network/cisco/responses/list-tenants-response.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/responses/list-tenants-response.xml
b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/responses/list-tenants-response.xml
deleted file mode 100644
index 00d5f96..0000000
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/responses/list-tenants-response.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<configResolveChildren cookie="1349183392/5c1d1ceb-9a5d-433b-aab2-0760b90f31f8" commCookie="2/12/0/eab"
srcExtSys="10.223.56.5" destExtSys="10.223.56.5" srcSvc="sam_extXMLApi" destSvc="service-reg_dme"
response="yes" classId="orgTenant">
-  <outConfigs>
-    <orgTenant descr="Test Tenant 2" dn="org-root/org-TestTenant2" fltAggr="0" level="1"
name="TestTenant2"/>
-    <orgTenant descr="First test" dn="org-root/org-TestTenant1" fltAggr="0" level="1"
name="TestTenant1"/>
-  </outConfigs>
-</configResolveChildren>
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f38be481/plugins/network-elements/cisco-vnmc/scripts/network/cisco/responses/login-error.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/responses/login-error.xml
b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/responses/login-error.xml
deleted file mode 100644
index ae94fb1..0000000
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/responses/login-error.xml
+++ /dev/null
@@ -1 +0,0 @@
-<aaaLogin cookie="testCookie" commCookie="" srcExtSys="0.0.0.0" destExtSys="0.0.0.0" srcSvc=""
destSvc="" response="yes" errorCode="539" invocationResult="unidentified-fail" errorDescr="Authentication
failed"/>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f38be481/plugins/network-elements/cisco-vnmc/scripts/network/cisco/responses/login-success.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/responses/login-success.xml
b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/responses/login-success.xml
deleted file mode 100644
index ce7c309..0000000
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/responses/login-success.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<aaaLogin cookie="testCookie" commCookie="" srcExtSys="0.0.0.0" destExtSys="0.0.0.0" srcSvc=""
destSvc="" response="yes" outCookie="1349183392/5c1d1ceb-9a5d-433b-aab2-0760b90f31f8" outRefreshPeriod="600"
outPriv="admin,read-only" outDomains="" outChannel="fullssl" outEvtChannel="fullssl" outSessionId="web_36667"
outVersion="2.0(3f)"/>
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f38be481/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/generate_vsm_cli.sh
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/generate_vsm_cli.sh
b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/generate_vsm_cli.sh
deleted file mode 100644
index 851a872..0000000
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/generate_vsm_cli.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-for ((vlanid=2000; vlanid <=2020; vlanid++)); 
-do   
-  #sed "s/vlanid/$vlanid/g" vsm_asa_inside_profiles;
-  sed "s/vlanid/$vlanid/g" vservice_node ; 
-done
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f38be481/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/vservice_node
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/vservice_node b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/vservice_node
deleted file mode 100644
index 61cc0b4..0000000
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/vservice_node
+++ /dev/null
@@ -1,6 +0,0 @@
-vservice node ASA_vlanid type asa
-  ip address 10.1.1.1
-  adjacency l2 vlan vlanid
-  fail-mode close
-
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f38be481/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/vsm_asa_inside_profiles
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/vsm_asa_inside_profiles
b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/vsm_asa_inside_profiles
deleted file mode 100644
index 7b341d2..0000000
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/vsm_asa_inside_profiles
+++ /dev/null
@@ -1,8 +0,0 @@
-port-profile type vethernet ASA-Inside-vlanid
-  vmware port-group
-  switchport mode access
-  switchport access vlan vlanid
-  no shutdown
-  state enabled
-
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f38be481/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/vsm_tenant_port_profiles
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/vsm_tenant_port_profiles
b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/vsm_tenant_port_profiles
deleted file mode 100644
index d05986f..0000000
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/vsm/vsm_tenant_port_profiles
+++ /dev/null
@@ -1,12 +0,0 @@
-#To be added to port profile for guest vm
-org root/TestTenant1/TestVDC
-vservice node <Node Name> profile <Edge Security Profile Name in VNMC>
-
-
-#To be added for every VDC
-vservice node <Node name> type asa
-  ip address 10.1.1.1
-  adjacency l2 vlan 2001
-  fail-mode close
-
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f38be481/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcManager.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcManager.java
b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcManager.java
deleted file mode 100644
index 7090300..0000000
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcManager.java
+++ /dev/null
@@ -1,245 +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.cisco;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-
-import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice;
-
-import com.cloud.agent.AgentManager;
-import com.cloud.api.commands.AddCiscoVnmcResourceCmd;
-import com.cloud.api.commands.DeleteCiscoVnmcResourceCmd;
-import com.cloud.api.commands.ListCiscoVnmcResourcesCmd;
-import com.cloud.api.response.CiscoVnmcResourceResponse;
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.host.DetailVO;
-import com.cloud.host.Host;
-import com.cloud.host.dao.HostDao;
-import com.cloud.host.dao.HostDetailsDao;
-import com.cloud.network.Network.Provider;
-import com.cloud.network.PhysicalNetworkServiceProvider;
-import com.cloud.network.dao.PhysicalNetworkVO;
-import com.cloud.network.dao.CiscoVnmcDao;
-import com.cloud.network.dao.NetworkDao;
-import com.cloud.network.dao.PhysicalNetworkDao;
-import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
-import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
-import com.cloud.network.element.CiscoVnmcElementService;
-import com.cloud.network.resource.CiscoVnmcResource;
-import com.cloud.resource.ResourceManager;
-import com.cloud.resource.ServerResource;
-import com.cloud.utils.component.Manager;
-import com.cloud.utils.db.Transaction;
-import com.cloud.utils.exception.CloudRuntimeException;
-
-public class CiscoVnmcManager implements Manager, CiscoVnmcElementService {
-    ResourceManager _resourceMgr;    
-    @Inject
-    PhysicalNetworkDao _physicalNetworkDao;
-    @Inject
-    PhysicalNetworkServiceProviderDao _physicalNetworkServiceProviderDao;
-    @Inject
-    CiscoVnmcDao _ciscoVnmcDao;
-    @Inject 
-    HostDetailsDao _hostDetailsDao;
-    @Inject
-    HostDao _hostDao;  
-    @Inject
-    AgentManager _agentMgr;
-
-    @Inject
-    NetworkDao _networkDao;
-    
-    CiscoVnmcConnection _vnmcConnection;
-    
-   
-    @Override
-    public CiscoVnmcController addCiscoVnmcResource(AddCiscoVnmcResourceCmd cmd) {
-        String deviceName = Provider.CiscoVnmc.getName();
-        NetworkDevice networkDevice = NetworkDevice.getNetworkDevice(deviceName);
-        Long physicalNetworkId = cmd.getPhysicalNetworkId();
-        CiscoVnmcController CiscoVnmcResource = null;
-        
-        PhysicalNetworkVO physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId);
-        if (physicalNetwork == null) {
-            throw new InvalidParameterValueException("Could not find phyical network with
ID: " + physicalNetworkId);
-        }
-        long zoneId = physicalNetwork.getDataCenterId();
-
-        PhysicalNetworkServiceProviderVO ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(physicalNetwork.getId(),
networkDevice.getNetworkServiceProvder());
-        if (ntwkSvcProvider == null) {
-            throw new CloudRuntimeException("Network Service Provider: " + networkDevice.getNetworkServiceProvder()
+
-                    " is not enabled in the physical network: " + physicalNetworkId + "to
add this device");
-        } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown)
{
-            throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName()
+
-                    " is in shutdown state in the physical network: " + physicalNetworkId
+ "to add this device");
-        }
-        
-        if (_ciscoVnmcDao.listByPhysicalNetwork(physicalNetworkId).size() != 0) {
-            throw new CloudRuntimeException("A CiscoVnmc device is already configured on
this physical network");
-        }
-        
-        Map<String, String> params = new HashMap<String,String>();
-        params.put("guid", UUID.randomUUID().toString());
-        params.put("zoneId", String.valueOf(physicalNetwork.getDataCenterId()));
-        params.put("physicalNetworkId", String.valueOf(physicalNetwork.getId()));
-        params.put("name", "Cisco VNMC Controller - " + cmd.getHost());
-        params.put("ip", cmd.getHost());
-        params.put("adminuser", cmd.getUsername());
-        params.put("adminpass", cmd.getPassword());
-        params.put("transportzoneisotype", physicalNetwork.getIsolationMethods().get(0).toLowerCase());
// FIXME What to do with multiple isolation types
-
-        Map<String, Object> hostdetails = new HashMap<String,Object>();
-        hostdetails.putAll(params);
-        
-        ServerResource resource = new CiscoVnmcResource();
-
-        Transaction txn = Transaction.currentTxn();
-        try {
-            resource.configure(cmd.getHost(), hostdetails);
-            
-            Host host = _resourceMgr.addHost(zoneId, resource, Host.Type.ExternalFirewall,
params);
-            if (host != null) {
-                txn.start();
-                
-                CiscoVnmcResource = new CiscoVnmcControllerVO(host.getId(), physicalNetworkId,
ntwkSvcProvider.getProviderName(), deviceName);
-                _ciscoVnmcDao.persist((CiscoVnmcControllerVO) CiscoVnmcResource);
-                
-                DetailVO detail = new DetailVO(host.getId(), "deviceid", String.valueOf(CiscoVnmcResource.getId()));
-                _hostDetailsDao.persist(detail);
-
-                txn.commit();
-                return CiscoVnmcResource;
-            } else {
-                throw new CloudRuntimeException("Failed to add Cisco Vnmc Device due to internal
error.");
-            }            
-        } catch (ConfigurationException e) {
-            txn.rollback();
-            throw new CloudRuntimeException(e.getMessage());
-        }
-    }
-
-    @Override
-    public CiscoVnmcResourceResponse createCiscoVnmcResourceResponse(
-            CiscoVnmcController CiscoVnmcResourceVO) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public boolean deleteCiscoVnmcResource(DeleteCiscoVnmcResourceCmd cmd) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    
-
-    @Override
-    public List<CiscoVnmcControllerVO> listCiscoVnmcResources(
-            ListCiscoVnmcResourcesCmd cmd) {
-        Long physicalNetworkId = cmd.getPhysicalNetworkId();
-        Long CiscoVnmcResourceId = cmd.getCiscoVnmcResourceId();
-        List<CiscoVnmcControllerVO> responseList = new ArrayList<CiscoVnmcControllerVO>();
-
-        if (physicalNetworkId == null && CiscoVnmcResourceId == null) {
-            throw new InvalidParameterValueException("Either physical network Id or vnmc
device Id must be specified");
-        }
-
-        if (CiscoVnmcResourceId != null) {
-            CiscoVnmcControllerVO CiscoVnmcResource = _ciscoVnmcDao.findById(CiscoVnmcResourceId);
-            if (CiscoVnmcResource == null) {
-                throw new InvalidParameterValueException("Could not find Cisco Vnmc device
with id: " + CiscoVnmcResource);
-            }
-            responseList.add(CiscoVnmcResource);
-        }
-        else {
-            PhysicalNetworkVO physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId);
-            if (physicalNetwork == null) {
-                throw new InvalidParameterValueException("Could not find a physical network
with id: " + physicalNetworkId);
-            }
-            responseList = _ciscoVnmcDao.listByPhysicalNetwork(physicalNetworkId);
-        }
-
-        return responseList;
-    }
-
-    @Override
-    public boolean configure(String name, Map<String, Object> params)
-            throws ConfigurationException {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean start() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public boolean stop() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public String getName() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public List<Class<?>> getCommands() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void setName(String name) {
-        // TODO Auto-generated method stub
-    }
-
-    @Override
-    public void setConfigParams(Map<String, Object> params) {
-        // TODO Auto-generated method stub
-    }
-
-    @Override
-    public Map<String, Object> getConfigParams() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public int getRunLevel() {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    @Override
-    public void setRunLevel(int level) {
-        // TODO Auto-generated method stub
-    }
-
-}


Mime
View raw message