]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Removing workflows from the Radware driver code
authorAvishay Balderman <avishayb@radware.com>
Tue, 15 Oct 2013 16:35:55 +0000 (18:35 +0200)
committerAvishay Balderman <avishayb@radware.com>
Thu, 24 Oct 2013 13:14:47 +0000 (15:14 +0200)
Removing workflows handling from the driver code.
Removing workflow related files
Modifying tests to support new behavior

Change-Id: Icbb6106db07e5b33c37192aa53d088e67bd4a795
Closes-bug: #1239288

17 files changed:
etc/neutron.conf
etc/services.conf [new file with mode: 0644]
neutron/services/loadbalancer/drivers/radware/driver.py
neutron/services/loadbalancer/drivers/radware/workflows/common/groovy/wait_for_service.groovy [deleted file]
neutron/services/loadbalancer/drivers/radware/workflows/openstack_l2_l3/groovy/read_ips_data_from_service.groovy [deleted file]
neutron/services/loadbalancer/drivers/radware/workflows/openstack_l2_l3/templates/setup_l2_l3.vm [deleted file]
neutron/services/loadbalancer/drivers/radware/workflows/openstack_l2_l3/templates/teardown_l2_l3.vm [deleted file]
neutron/services/loadbalancer/drivers/radware/workflows/openstack_l2_l3/workflow/workflow.xml [deleted file]
neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_common.vm [deleted file]
neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_init_indexes.vm [deleted file]
neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_manage_hcs.vm [deleted file]
neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_manage_l4.vm [deleted file]
neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_manage_rips.vm [deleted file]
neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_teardown_l4.vm [deleted file]
neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/workflow/workflow.xml [deleted file]
neutron/services/loadbalancer/drivers/radware/workflows/readme.txt [deleted file]
neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py

index e3b6fac01a7fe937fd5eae7de886e90c72897cb0..0372768875623ef6109d2a3da4eed320759547ec 100644 (file)
@@ -368,12 +368,3 @@ service_provider=LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.hapr
 # If you want to keep the HA Proxy as the default lbaas driver, remove the attribute default from the line below.
 # Otherwise comment the HA Proxy line
 #service_provider = LOADBALANCER:Radware:neutron.services.loadbalancer.drivers.radware.driver.LoadBalancerDriver:default
-
-[radware]
-#vdirect_address=0.0.0.0
-#service_ha_pair=False
-#service_throughput=1000
-#service_ssl_throughput=200
-#service_compression_throughput=100
-#service_cache=20
-
diff --git a/etc/services.conf b/etc/services.conf
new file mode 100644 (file)
index 0000000..32d1029
--- /dev/null
@@ -0,0 +1,20 @@
+[radware]
+#vdirect_address = 0.0.0.0
+#vdirect_user = vDirect
+#vdirect_password = radware
+#service_ha_pair = False
+#service_throughput = 1000
+#service_ssl_throughput = 200
+#service_compression_throughput = 100
+#service_cache = 20
+#service_adc_type = VA
+#service_adc_version=
+#service_session_mirroring_enabled = False
+#service_isl_vlan = -1
+#service_resource_pool_ids = []
+#actions_to_skip = 'setup_l2_l3'
+#l4_action_name = 'BaseCreate'
+#l2_l3_workflow_name = openstack_l2_l3
+#l4_workflow_name = openstack_l4
+#l2_l3_ctor_params = service: _REPLACE_, ha_network_name: HA-Network, ha_ip_pool_name: default, allocate_ha_vrrp: True, allocate_ha_ips: True
+#l2_l3_setup_params = data_port: 1, data_ip_address: 192.168.200.99, data_ip_mask: 255.255.255.0, gateway: 192.168.200.1, ha_port: 2
index ca126a20c2f3c4888ca790a60b452f0866fcdfb2..b4cdc73a4dd0bf853fe787599969093a48e6808a 100644 (file)
 import base64
 import copy
 import httplib
-import os
 import Queue
 import socket
-from StringIO import StringIO
 import threading
 import time
-from zipfile import ZipFile
 
 import eventlet
 from oslo.config import cfg
@@ -49,13 +46,6 @@ RESP_REASON = 1
 RESP_STR = 2
 RESP_DATA = 3
 
-L2_L3_WORKFLOW_TEMPLATE_NAME = 'openstack_l2_l3'
-L4_WORKFLOW_TEMPLATE_NAME = 'openstack_l4'
-
-ACTIONS_TO_SKIP = ['setup_l2_l3']
-
-L4_ACTION_NAME = 'BaseCreate'
-
 TEMPLATE_HEADER = {'Content-Type':
                    'application/vnd.com.radware.vdirect.'
                    'template-parameters+json'}
@@ -65,20 +55,22 @@ PROVISION_HEADER = {'Content-Type':
 CREATE_SERVICE_HEADER = {'Content-Type':
                          'application/vnd.com.radware.'
                          'vdirect.adc-service-specification+json'}
-ZIP_HEADER = {'Content-Type': 'application/x-zip-compressed'}
-
-L2_CTOR_PARAMS = {"service": "_REPLACE_", "ha_network_name": "HA-Network",
-                  "ha_ip_pool_name": "default", "allocate_ha_vrrp": True,
-                  "allocate_ha_ips": True}
-L2_SETUP_L2_L3_PARAMS = {"data_port": 1,
-                         "data_ip_address": "192.168.200.99",
-                         "data_ip_mask": "255.255.255.0",
-                         "gateway": "192.168.200.1",
-                         "ha_port": 2}
 
 driver_opts = [
     cfg.StrOpt('vdirect_address',
                help=_('vdirect server IP address')),
+    cfg.StrOpt('vdirect_user',
+               default='vDirect',
+               help=_('vdirect user name')),
+    cfg.StrOpt('vdirect_password',
+               default='radware',
+               help=_('vdirect user password')),
+    cfg.StrOpt('service_adc_type',
+               default="VA",
+               help=_('Service ADC type')),
+    cfg.StrOpt('service_adc_version',
+               default="",
+               help=_('Service ADC version')),
     cfg.BoolOpt('service_ha_pair',
                 default=False,
                 help=_('service HA pair')),
@@ -93,7 +85,44 @@ driver_opts = [
                help=_('service compression throughtput')),
     cfg.IntOpt('service_cache',
                default=20,
-               help=_('service cache'))
+               help=_('service cache')),
+    cfg.StrOpt('l2_l3_workflow_name',
+               default='openstack_l2_l3',
+               help=_('l2_l3 workflow name')),
+    cfg.StrOpt('l4_workflow_name',
+               default='openstack_l4',
+               help=_('l4 workflow name')),
+    cfg.DictOpt('l2_l3_ctor_params',
+                default={"service": "_REPLACE_",
+                         "ha_network_name": "HA-Network",
+                         "ha_ip_pool_name": "default",
+                         "allocate_ha_vrrp": True,
+                         "allocate_ha_ips": True},
+                help=_('l2_l3 workflow constructor params')),
+    cfg.DictOpt('l2_l3_setup_params',
+                default={"data_port": 1,
+                         "data_ip_address": "192.168.200.99",
+                         "data_ip_mask": "255.255.255.0",
+                         "gateway": "192.168.200.1",
+                         "ha_port": 2},
+                help=_('l2_l3 workflow setup params')),
+    cfg.ListOpt('actions_to_skip',
+                default=['setup_l2_l3'],
+                help=_('List of actions that we dont want to push to '
+                       'the completion queue')),
+    cfg.StrOpt('l4_action_name',
+               default='BaseCreate',
+               help=_('l4 workflow action name')),
+    cfg.ListOpt('service_resource_pool_ids',
+                default=[],
+                help=_('Resource pool ids')),
+    cfg.IntOpt('service_isl_vlan',
+               default=-1,
+               help=_('A required VLAN for the interswitch link to use')),
+    cfg.BoolOpt('service_session_mirroring_enabled',
+                default=False,
+                help=_('Support an Alteon interswitch '
+                       'link for stateful session failover'))
 ]
 
 cfg.CONF.register_opts(driver_opts, "radware")
@@ -108,6 +137,7 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
         self.plugin = plugin
         self.service = {
             "haPair": rad.service_ha_pair,
+            "sessionMirroringEnabled": rad.service_session_mirroring_enabled,
             "primary": {
                 "capacity": {
                     "throughput": rad.service_throughput,
@@ -120,17 +150,32 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
                     "type": "portgroup",
                     "portgroups": ['DATA_NETWORK']
                 },
-                "adcType": "VA",
+                "adcType": rad.service_adc_type,
                 "acceptableAdc": "Exact"
             }
         }
+        if rad.service_resource_pool_ids:
+            ids = rad.service_resource_pool_ids
+            self.service['resourcePoolIds'] = [
+                {'name': id} for id in ids
+            ]
+        if rad.service_isl_vlan:
+            self.service['islVlan'] = rad.service_isl_vlan
+        self.l2_l3_wf_name = rad.l2_l3_workflow_name
+        self.l4_wf_name = rad.l4_workflow_name
+        self.l2_l3_ctor_params = rad.l2_l3_ctor_params
+        self.l2_l3_setup_params = rad.l2_l3_setup_params
+        self.l4_action_name = rad.l4_action_name
+        self.actions_to_skip = rad.actions_to_skip
         vdirect_address = cfg.CONF.radware.vdirect_address
-        self.rest_client = vDirectRESTClient(server=vdirect_address)
+        self.rest_client = vDirectRESTClient(server=vdirect_address,
+                                             user=rad.vdirect_user,
+                                             password=rad.vdirect_password)
         self.queue = Queue.Queue()
         self.completion_handler = OperationCompletionHander(self.queue,
                                                             self.rest_client,
                                                             plugin)
-        self.workflows_were_uploaded = False
+        self.workflow_templates_exists = False
         self.completion_handler.setDaemon(True)
         self.completion_handler.start()
 
@@ -143,17 +188,17 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
         service_name = self._get_service(extended_vip['pool_id'], network_id)
         LOG.debug(_('create_vip. service_name: %s '), service_name)
         self._create_workflow(
-            vip['pool_id'], L4_WORKFLOW_TEMPLATE_NAME,
+            vip['pool_id'], self.l4_wf_name,
             {"service": service_name})
         self._update_workflow(
             vip['pool_id'],
-            L4_ACTION_NAME, extended_vip)
+            self.l4_action_name, extended_vip, context)
 
     def update_vip(self, context, old_vip, vip):
         extended_vip = self.plugin.populate_vip_graph(context, vip)
         self._update_workflow(
-            vip['pool_id'], L4_ACTION_NAME,
-            extended_vip, False, lb_db.Vip, vip['id'])
+            vip['pool_id'], self.l4_action_name,
+            extended_vip, context, False, lb_db.Vip, vip['id'])
 
     def delete_vip(self, context, vip):
         """Delete a Vip
@@ -195,8 +240,8 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
                 vip = self.plugin.get_vip(context, vip_id)
                 extended_vip = self.plugin.populate_vip_graph(context, vip)
                 self._update_workflow(
-                    pool['id'], L4_ACTION_NAME,
-                    extended_vip, delete, lb_db.Pool, pool['id'])
+                    pool['id'], self.l4_action_name,
+                    extended_vip, context, delete, lb_db.Pool, pool['id'])
         else:
             if delete:
                 self.plugin._delete_db_pool(context, pool['id'])
@@ -223,8 +268,9 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
             vip = self.plugin.get_vip(context, vip_id)
             extended_vip = self.plugin.populate_vip_graph(context, vip)
             self._update_workflow(
-                member['pool_id'], L4_ACTION_NAME,
-                extended_vip, delete, lb_db.Member, member['id'])
+                member['pool_id'], self.l4_action_name,
+                extended_vip, context,
+                delete, lb_db.Member, member['id'])
         # We have to delete this member but it is not connected to a vip yet
         elif delete:
             self.plugin._delete_db_member(context, member['id'])
@@ -267,8 +313,8 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
         if vip_id:
             vip = self.plugin.get_vip(context, vip_id)
             extended_vip = self.plugin.populate_vip_graph(context, vip)
-            self._update_workflow(pool_id, L4_ACTION_NAME,
-                                  extended_vip,
+            self._update_workflow(pool_id, self.l4_action_name,
+                                  extended_vip, context,
                                   delete, lb_db.PoolMonitorAssociation,
                                   health_monitor['id'])
         elif delete:
@@ -289,15 +335,19 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
         return subnet['network_id']
 
     @call_log.log
-    def _update_workflow(self, wf_name, action, wf_params, delete=False,
+    def _update_workflow(self, wf_name, action,
+                         wf_params, context,
+                         delete=False,
                          lbaas_entity=None, entity_id=None):
         """Update the WF state. Push the result to a queue for processing."""
 
-        if not self.workflows_were_uploaded:
-            self._upload_workflows_templates()
+        if not self.workflow_templates_exists:
+            self._verify_workflow_templates()
 
-        if action not in ACTIONS_TO_SKIP:
-            params = _translate_vip_object_graph(wf_params)
+        if action not in self.actions_to_skip:
+            params = _translate_vip_object_graph(wf_params,
+                                                 self.plugin,
+                                                 context)
         else:
             params = wf_params
 
@@ -307,7 +357,7 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
                                  TEMPLATE_HEADER))
         LOG.debug(_('_update_workflow response: %s '), response)
 
-        if action not in ACTIONS_TO_SKIP:
+        if action not in self.actions_to_skip:
             ids = params.pop('__ids__', None)
             if not ids:
                 raise q_exc.NeutronException(
@@ -323,7 +373,7 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
             self.queue.put_nowait(oper)
 
     def _remove_workflow(self, wf_params, context):
-        params = _translate_vip_object_graph(wf_params)
+        params = _translate_vip_object_graph(wf_params, self.plugin, context)
         ids = params.pop('__ids__', None)
         if not ids:
             raise q_exc.NeutronException(
@@ -361,20 +411,20 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
         create a service and create l2_l2 WF.
 
         """
+        if not self.workflow_templates_exists:
+            self._verify_workflow_templates()
         incoming_service_name = 'srv_' + network_id
         service_name = self._get_available_service(incoming_service_name)
         if not service_name:
             LOG.debug(
                 'Could not find a service named ' + incoming_service_name)
             service_name = self._create_service(pool_id, network_id)
-            L2_CTOR_PARAMS["service"] = incoming_service_name
+            self.l2_l3_ctor_params["service"] = incoming_service_name
             wf_name = 'l2_l3_' + network_id
-            if not self.workflows_were_uploaded:
-                self._upload_workflows_templates()
             self._create_workflow(
-                wf_name, L2_L3_WORKFLOW_TEMPLATE_NAME, L2_CTOR_PARAMS)
+                wf_name, self.l2_l3_wf_name, self.l2_l3_ctor_params)
             self._update_workflow(
-                wf_name, "setup_l2_l3", L2_SETUP_L2_L3_PARAMS)
+                wf_name, "setup_l2_l3", self.l2_l3_setup_params, None)
         else:
             LOG.debug('A service named ' + service_name + ' was found.')
         return service_name
@@ -424,8 +474,8 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
     def _create_workflow(self, wf_name, wf_template_name,
                          create_workflow_params=None):
         """Create a WF if it doesnt exists yet."""
-        if not self.workflows_were_uploaded:
-                self._upload_workflows_templates()
+        if not self.workflow_templates_exists:
+                self._verify_workflow_templates()
         if not self._workflow_exists(wf_name):
             if not create_workflow_params:
                 create_workflow_params = {}
@@ -438,10 +488,10 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
                                                            TEMPLATE_HEADER))
             LOG.debug(_('create_workflow response: %s'), str(response))
 
-    def _upload_workflows_templates(self):
-        """Upload the driver workflows to vDirect server."""
-        workflows = {L2_L3_WORKFLOW_TEMPLATE_NAME:
-                     False, L4_WORKFLOW_TEMPLATE_NAME: False}
+    def _verify_workflow_templates(self):
+        """Verify the existance of workflows on vDirect server."""
+        workflows = {self.l2_l3_wf_name:
+                     False, self.l4_wf_name: False}
         resource = '/api/workflowTemplate'
         response = _rest_wrapper(self.rest_client.call('GET',
                                                        resource,
@@ -454,46 +504,9 @@ class LoadBalancerDriver(abstract_driver.LoadBalancerAbstractDriver):
                     break
         for wf, found in workflows.items():
             if not found:
-                self._upload_workflow_template(wf)
-        self.workflows_were_uploaded = True
-
-    def _upload_workflow_template(self, wf_template_name):
-        """Upload a wf template to vDirect server."""
-        def _get_folders():
-            current_folder = os.path.dirname(os.path.realpath(__file__))
-            folders = [current_folder + '/workflows/' + wf_template_name,
-                       current_folder + '/workflows/common']
-            return folders
-
-        LOG.debug(_('About to upload wf template named %s.zip'),
-                  wf_template_name)
-        data = self._get_workflow_zip_data(_get_folders())
-        _rest_wrapper(self.rest_client.call('POST',
-                                            '/api/workflowTemplate',
-                                            data,
-                                            ZIP_HEADER, binary=True), [201])
-
-    def _get_workflow_zip_data(self, folders):
-        """Create a zip file on the fly and return its content."""
-        def _file_to_zip(f):
-            n, ext = os.path.splitext(f)
-            LOG.debug("file name = " + n + " ext = " + ext)
-            return f == 'workflow.xml' or ext in ['.vm', '.groovy']
-        in_memory_file = StringIO()
-        zip_file = ZipFile(in_memory_file, 'w')
-        LOG.debug(_('Folders are %s'), folders)
-        for folder in folders:
-            LOG.debug(_('Folder is %s'), folder)
-            for root, dirs, files in os.walk(folder):
-                for file in files:
-                    if _file_to_zip(file):
-                        LOG.debug(_('About to add file %s to zip'), str(file))
-                        LOG.debug(_('Path: %s'), os.path.join(root, file))
-                        zip_file.write(os.path.join(root, file),
-                                       os.path.basename(file))
-                        LOG.debug(_('File %s was added to zip'), str(file))
-        zip_file.close()
-        return in_memory_file.getvalue()
+                msg = _('The workflow %s does not exist on vDirect.') % wf
+                raise q_exc.NeutronException(msg)
+        self.workflow_templates_exists = True
 
 
 class vDirectRESTClient:
@@ -501,9 +514,10 @@ class vDirectRESTClient:
 
     def __init__(self,
                  server='localhost',
-                 port=2188,
-                 ssl=None,
-                 auth=None,
+                 user=None,
+                 password=None,
+                 port=2189,
+                 ssl=True,
                  timeout=5000,
                  base_uri=''):
         self.server = server
@@ -511,9 +525,12 @@ class vDirectRESTClient:
         self.ssl = ssl
         self.base_uri = base_uri
         self.timeout = timeout
-        self.auth = None
-        if auth:
-            self.auth = 'Basic ' + base64.encodestring(auth).strip()
+        if user and password:
+            self.auth = base64.encodestring('%s:%s' % (user, password))
+            self.auth = self.auth.replace('\n', '')
+        else:
+            msg = _('User and password must be specified')
+            raise q_exc.NeutronException(msg)
         debug_params = {'server': self.server,
                         'port': self.port,
                         'ssl': self.ssl}
@@ -535,8 +552,9 @@ class vDirectRESTClient:
         debug_data = 'binary' if binary else body
         debug_data = debug_data if debug_data else 'EMPTY'
         if not headers:
-            headers = {}
-
+            headers = {'Authorization': 'Basic %s' % self.auth}
+        else:
+            headers['Authorization'] = 'Basic %s' % self.auth
         conn = None
         if self.ssl:
             conn = httplib.HTTPSConnection(
@@ -733,7 +751,7 @@ def _remove_object_from_db(plugin, context, oper):
     if oper.lbaas_entity == lb_db.PoolMonitorAssociation:
         plugin._delete_db_pool_health_monitor(context,
                                               oper.entity_id,
-                                              oper.object_graph['pool_id'])
+                                              oper.object_graph['pool'])
     elif oper.lbaas_entity == lb_db.Member:
         plugin._delete_db_member(context, oper.entity_id)
     elif oper.lbaas_entity == lb_db.Vip:
@@ -762,7 +780,7 @@ HEALTH_MONITOR_PROPERTIES = ['type', 'delay', 'timeout', 'max_retries',
                              'expected_codes', 'id']
 
 
-def _translate_vip_object_graph(extended_vip):
+def _translate_vip_object_graph(extended_vip, plugin, context):
     """Translate the extended vip
 
     translate to a structure that can be
@@ -799,35 +817,25 @@ def _translate_vip_object_graph(extended_vip):
     for member_property in MEMBER_PROPERTIES:
         trans_vip[_create_key('member', member_property)] = []
     for member in extended_vip['members']:
-        for member_property in MEMBER_PROPERTIES:
-            trans_vip[_create_key('member', member_property)].append(
-                member.get(member_property,
-                           TRANSLATION_DEFAULTS.get(member_property)))
+        if member['status'] != constants.PENDING_DELETE:
+            for member_property in MEMBER_PROPERTIES:
+                trans_vip[_create_key('member', member_property)].append(
+                    member.get(member_property,
+                               TRANSLATION_DEFAULTS.get(member_property)))
     for hm_property in HEALTH_MONITOR_PROPERTIES:
         trans_vip[
             _create_key('hm', _trans_prop_name(hm_property))] = []
     for hm in extended_vip['health_monitors']:
-        for hm_property in HEALTH_MONITOR_PROPERTIES:
-            value = hm.get(hm_property,
-                           TRANSLATION_DEFAULTS.get(hm_property))
-            trans_vip[_create_key('hm',
-                      _trans_prop_name(hm_property))].append(value)
+        hm_pool = plugin.get_pool_health_monitor(context,
+                                                 hm['id'],
+                                                 extended_vip['pool']['id'])
+        if hm_pool['status'] != constants.PENDING_DELETE:
+            for hm_property in HEALTH_MONITOR_PROPERTIES:
+                value = hm.get(hm_property,
+                               TRANSLATION_DEFAULTS.get(hm_property))
+                trans_vip[_create_key('hm',
+                          _trans_prop_name(hm_property))].append(value)
     ids = get_ids(extended_vip)
     trans_vip['__ids__'] = ids
     LOG.debug('Translated Vip graph: ' + str(trans_vip))
     return trans_vip
-
-
-def _drop_pending_delete_elements(extended_vip):
-    """Traverse the Vip object graph and drop PENDEING_DELETE nodes."""
-    # What if the pool is pendening_delete?
-    extended_vip['health_monitors'] = [
-        hm for hm in extended_vip['health_monitors']
-        if hm['status'] != constants.PENDING_DELETE
-    ]
-    extended_vip['members'] = [
-        member for member in extended_vip['members']
-        if member['status'] != constants.PENDING_DELETE
-    ]
-
-    return extended_vip
diff --git a/neutron/services/loadbalancer/drivers/radware/workflows/common/groovy/wait_for_service.groovy b/neutron/services/loadbalancer/drivers/radware/workflows/common/groovy/wait_for_service.groovy
deleted file mode 100644 (file)
index c5f6414..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-import com.radware.alteon.beans.adc.*;\r
-import com.radware.alteon.api.*;\r
-import com.radware.alteon.sdk.*\r
-import com.radware.alteon.sdk.rpm.*\r
-import com.radware.alteon.api.impl.AlteonCliUtils;\r
-import com.radware.alteon.cli.CliSession;\r
-\r
-\r
-\r
-service.provision()\r
-\r
-//\r
-// temp patch until provision will make sure SSH is active\r
-// sleep up to 5 min\r
-\r
-counter = 0\r
-logger.info("Start waiting for SSH connection.")\r
-COUNTER_MAX = 300\r
-SLEEP_TIME = 2000\r
-\r
-while (counter < COUNTER_MAX) {\r
-  try {\r
-        validateAdcCLIConnection(service.getPrimary());\r
-        logger.info("Validated primary (" + counter + ")")\r
-        if (service.request.ha) {\r
-            validateAdcCLIConnection(service.getSecondary());\r
-            logger.info("Validated secondary (" + counter + ")")\r
-        }\r
-        break\r
-  } catch (Exception e) {\r
-      counter++\r
-      sleep(SLEEP_TIME)\r
-  }\r
-}\r
-\r
-if(counter >= COUNTER_MAX) {\r
-    throw new Exception("Could not validate SSH connection after " + (COUNTER_MAX * SLEEP_TIME) / 1000 + " seconds.")\r
-}\r
-\r
-logger.info("Validated SSH connection..")\r
-\r
-def validateAdcCLIConnection(AdcCLIConnection connection) {\r
-    CliSession s = new CliSession(AlteonCliUtils.convertConnection(connection));\r
-    try {\r
-        s.connect();\r
-        s.close();\r
-    } catch (Exception e) {\r
-        throw new AdcConnectionException("IOException while validating the connection.  Please check the connection settings.",e);\r
-    }\r
-}\r
-\r
diff --git a/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l2_l3/groovy/read_ips_data_from_service.groovy b/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l2_l3/groovy/read_ips_data_from_service.groovy
deleted file mode 100644 (file)
index 8a6bd7d..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-import groovy.transform.ToString\r
-import groovy.transform.EqualsAndHashCode\r
-\r
-import com.radware.alteon.beans.adc.*;\r
-import com.radware.alteon.api.*;\r
-import com.radware.alteon.sdk.*\r
-import com.radware.alteon.sdk.rpm.*\r
-import com.radware.alteon.api.impl.AlteonCliUtils;\r
-import com.radware.alteon.cli.CliSession;\r
-\r
-\r
-@ToString(includeNames=true)\r
-@EqualsAndHashCode(excludes=["gateway","mask","ips"])\r
-class SubnetInfo {\r
-  String id\r
-  String gateway\r
-  String mask\r
-  String ips\r
-}\r
-\r
-@ToString(includeNames=true)\r
-@EqualsAndHashCode(excludes=["subnets"])\r
-class PortInfo {\r
-  String name\r
-  def subnets = [:]\r
-}\r
-\r
-\r
-def tokenize_key(map_key) {\r
-    def ret_arr = map_key.tokenize(".")\r
-    if (ret_arr.size > 0 && ret_arr[0].startsWith("port")) {\r
-        return ret_arr\r
-    }\r
-    else\r
-        return null;\r
-}\r
-\r
-\r
-def parse(advanced_props) {\r
-    def ports = [:]\r
-    advanced_props.each {\r
-        key, value ->\r
-        def parsed_key = tokenize_key(key)\r
-        if (parsed_key) {\r
-            def port_name = parsed_key[0]\r
-            def subnet_id = parsed_key[1]\r
-            def property = parsed_key[2]\r
-            def port_info = ports.get(port_name)\r
-            if (port_info) {\r
-                def subnet_info = port_info.subnets.get(subnet_id)\r
-                if (subnet_info) {\r
-                    subnet_info[property] = value\r
-                }\r
-                else {\r
-                    subnet_info = new SubnetInfo(id:subnet_id)\r
-                    subnet_info[property] = value\r
-                    port_info.subnets.put(subnet_id, subnet_info)\r
-                }\r
-            }\r
-            else {\r
-                port_info = new PortInfo(name:port_name)\r
-                subnet_info = new SubnetInfo(id:subnet_id)\r
-                subnet_info[property] = value\r
-                port_info.subnets.put(subnet_id, subnet_info)\r
-                ports.put(port_name, port_info)\r
-            }\r
-        }\r
-    }\r
-    return ports\r
-}\r
-\r
-def get_property_per_port (ports, port_name, property_name) {\r
-    port_info = ports[port_name]\r
-    if (port_info) {\r
-        port_subnet = port_info.subnets\r
-        if (port_subnet && !port_subnet.isEmpty()) {\r
-            port_subnet_item = port_subnet.values().iterator().next()\r
-            port_subnet_property = port_subnet_item[property_name]\r
-            if (port_subnet_property) {\r
-                val_array = port_subnet_property.tokenize(",")\r
-                if (!val_array.isEmpty())\r
-                    return val_array[0]\r
-            }\r
-        }\r
-    }\r
-    else {\r
-        return null\r
-    }\r
-}\r
-\r
-def cidr_to_mask(cidr) throws NumberFormatException {\r
-\r
-    String[] st = cidr.split("\\/");\r
-    if (st.length != 2) {\r
-        throw new NumberFormatException("Invalid CIDR format '"\r
-                + cidr + "', should be: xx.xx.xx.xx/xx");\r
-    }\r
-    String symbolicIP = st[0];\r
-    String symbolicCIDR = st[1];\r
-\r
-    Integer numericCIDR = new Integer(symbolicCIDR);\r
-    if (numericCIDR > 32) {\r
-        throw new NumberFormatException("CIDR can not be greater than 32");\r
-    }\r
-    //Get IP\r
-    st = symbolicIP.split("\\.");\r
-    if (st.length != 4) {\r
-        throw new NumberFormatException("Invalid IP address: " + symbolicIP);\r
-    }\r
-    int i = 24;\r
-    baseIPnumeric = 0;\r
-    for (int n = 0; n < st.length; n++) {\r
-        int value = Integer.parseInt(st[n]);\r
-        if (value != (value & 0xff)) {\r
-            throw new NumberFormatException("Invalid IP address: " + symbolicIP);\r
-        }\r
-        baseIPnumeric += value << i;\r
-        i -= 8;\r
-    }\r
-    //Get netmask\r
-    if (numericCIDR < 1)\r
-        throw new NumberFormatException("Netmask CIDR can not be less than 1");\r
-    netmaskNumeric = 0xffffffff;\r
-    netmaskNumeric = netmaskNumeric << (32 - numericCIDR);\r
-    return netmaskNumeric\r
-}\r
-\r
-\r
-def String convert_numeric_ip_to_symbolic(ip) {\r
-    StringBuffer sb = new StringBuffer(15);\r
-    for (int shift = 24; shift > 0; shift -= 8) {\r
-        // process 3 bytes, from high order byte down.\r
-        def tmp = (ip >>> shift) & 0xff\r
-        sb.append(tmp)\r
-        sb.append('.');\r
-    }\r
-    sb.append(ip & 0xff);\r
-    return sb.toString();\r
-}\r
-\r
-\r
-primary_adc = sdk.read(service.getPrimaryId())\r
-primary_config = primary_adc.adcInfo.advancedConfiguration\r
-primary_ports = parse(primary_config)\r
-data_ip_address = get_property_per_port(primary_ports, "port1", "ips")\r
-data_ip_mask = convert_numeric_ip_to_symbolic(cidr_to_mask(get_property_per_port(primary_ports, "port1", "mask")))\r
-gateway = get_property_per_port(primary_ports, "port1", "gateway")\r
-\r
-if (service.request.ha) {\r
-    secondary_adc = sdk.read(service.getSecondaryId())\r
-    secondary_config = secondary_adc.adcInfo.advancedConfiguration\r
-    secondary_ports = parse(secondary_config)\r
-    ha_ip_address_1 = get_property_per_port(primary_ports, "port2", "ips")\r
-    ha_ip_address_2 = get_property_per_port(secondary_ports, "port2", "ips")\r
-    ha_vrrp_ip_address = ha_ip_address_1\r
-    ha_ip_mask = convert_numeric_ip_to_symbolic(cidr_to_mask(get_property_per_port(primary_ports, "port2", "mask")))\r
-}\r
-else {\r
-    secondary_adc = null\r
-    secondary_config = null\r
-    secondary_ports = null\r
-    ha_ip_address_1 = "1.1.1.1"\r
-    ha_ip_address_2 = "1.1.1.2"\r
-    ha_vrrp_ip_address = "1.1.1.3"\r
-    ha_ip_mask = "255.255.255.255"\r
-    ha_group_vr_id = 2\r
-}\r
-\r
diff --git a/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l2_l3/templates/setup_l2_l3.vm b/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l2_l3/templates/setup_l2_l3.vm
deleted file mode 100644 (file)
index eee520d..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-\r
-#property('description', 'Configures VLANs and L3 interface for data and HA networks - v1')\r
-\r
-#param("data_port", "int", "in", "min=1", "max=2", "prompt=Data Port")\r
-#param("data_ip_address", "ip", "in", "prompt=Data IP Address")\r
-#param("data_ip_mask", "ip", "in", "prompt=Data IP Mask")\r
-#param("gateway", "ip", "in", "prompt=Default Gateway IP Address")\r
-\r
-#param("ha_enabled", "bool", "in", "prompt=HA Enabled?")\r
-#param("ha_port", "int", "in", "min=1", "max=2", "prompt=HA Port")\r
-#param("ha_ip_address", "ip", "in", "prompt=HA IP Address")\r
-#param("ha_ip_mask", "ip", "in", "prompt=HA IP Mask")\r
-#param("ha_vrrp_ip_address", "ip", "in", "prompt=HA VRRP IP Address")\r
-#param("ha_group_vr_id", "int", "in", "min=2", "max=1024", "prompt=HA Group VR ID (1 is allocated to the interface VR)")\r
-\r
-#param("data_interface_id", "int", "out")\r
-#param("gateway_id", "int", "out")\r
-#param("ha_interface_id", "int", "out")\r
-#param("data_vlan", "int", "out")\r
-#param("ha_vlan", "int", "out")\r
-\r
-#if($data_port == $ha_port)\r
-    #error("Data Port and HA Port must be on different Ports!!")\r
-#end\r
-\r
-#set($port = $adc.newBean('AgPortNewCfgTableEntry'))\r
-#set($port.Indx = $data_port)\r
-#set($port = $adc.read($port))\r
-#if ($adc.isNull($port))\r
-    ##Port was not found. not too realistic but if so raise an error\r
-    #error("Port $data_port was not found!!")\r
-#else\r
-    #set($data_vlan = $port.PVID)\r
-#end\r
-\r
-#set($port = $adc.newBean('AgPortNewCfgTableEntry'))\r
-#set($port.Indx = $ha_port)\r
-#set($port = $adc.read($port))\r
-#if ($adc.isNull($port))\r
-    ##Port was not found. not too realistic but if so raise an error\r
-    #error("Port $ha_port was not found!!")\r
-#else\r
-    #set($ha_vlan = $port.PVID)\r
-#end\r
-\r
-#set($Integer = 0)\r
-\r
-#set($data_interface_string = "#get_interface_id($data_ip_address, 1)")\r
-#set($data_interface_id = $Integer.parseInt($data_interface_string.trim()))\r
-#create_interface($data_ip_address, $data_ip_mask, $data_vlan, $data_interface_id)\r
-\r
-#set($gwb = $adc.newBean('/c/l3/gw'))\r
-#set($gwb.addr = $gateway)\r
-#set($gwb = $adc.findFirst($gwb))\r
-#if ($adc.isNull($gwb))\r
-    #set($gateway_id = $adc.getFreeIndexWithDefault('/c/l3/gw', 1))\r
-#else\r
-    #error("Gateway with address $gateway already exists on index $gwb.index")\r
-#end\r
-\r
-#if ($gateway_id < 5)\r
-/c/l3/gw $gateway_id\r
-       addr $gateway\r
-    arp ena\r
-       ena\r
-#else\r
-    #log('error', "The available gateway index $gatewayId cannot be used for a default gateway!")\r
-    #error("No available index for a default gateway!")\r
-#end\r
-\r
-#if($ha_enabled)\r
-    #set($ha_interface_string = "#get_interface_id($ha_ip_address, $data_interface_id)")\r
-    #set($ha_interface_id = $Integer.parseInt($ha_interface_string.trim()))\r
-    #create_interface($ha_ip_address, $ha_ip_mask, $ha_vlan, $ha_interface_id)\r
-\r
-    /c/l3/vrrp/on\r
-    /c/l3/vrrp/hotstan enabled\r
-\r
-    /c/l3/vrrp/vr 1\r
-        ena\r
-        ipver v4\r
-        vrid 1\r
-        if $ha_interface_id\r
-        addr $ha_vrrp_ip_address\r
-        share dis\r
-\r
-    /c/l3/vrrp/group\r
-        ena\r
-        ipver v4\r
-        vrid $ha_group_vr_id\r
-        if $ha_interface_id\r
-        share dis\r
-\r
-    /c/slb/port $data_port\r
-        hotstan ena\r
-\r
-    /c/slb/port $ha_port\r
-        intersw ena\r
-#else\r
-    #set($ha_interface_id = 0)\r
-#end\r
-\r
-/c/slb\r
-    on\r
-\r
-/c/slb/port $data_port\r
-    client ena\r
-    server ena\r
-    proxy ena\r
-\r
-#macro(get_interface_id, $address, $default_index)\r
-    #set($interface = $adc.newBean('/c/l3/if'))\r
-    #set($interface.addr = $address)\r
-    #set($interface = $adc.findFirst($interface))\r
-    #if ($adc.isNull($interface))\r
-        ## IP address not found\r
-        #set($interface_id = $adc.getFreeIndexWithDefault('/c/l3/if', $default_index))\r
-        $interface_id\r
-    #else\r
-       ## Found existing interface with this address\r
-        #error("Found existing interface with address $address on index $interface.index!!")\r
-    #end\r
-#end\r
-\r
-#macro(create_interface, $address, $mask, $vlan, $interface_id)\r
-    /c/l3/if $interface_id\r
-    addr $address\r
-    mask $mask\r
-    vlan $vlan\r
-    ena\r
-#end\r
diff --git a/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l2_l3/templates/teardown_l2_l3.vm b/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l2_l3/templates/teardown_l2_l3.vm
deleted file mode 100644 (file)
index 8cbcf60..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-\r
-#property('description', 'Cleanup VLANs and L3 interface for data and HA networks - v1')\r
-\r
-#param("data_port", "int", "in", "min=1", "max=2", "prompt=Data Port")\r
-#param("data_interface_id", "int", "in", "min=1", "max=256", "prompt=Data Interface ID")\r
-#param("gateway_id", "int", "in", "min=1", "max=4", "prompt=Default Gateway ID")\r
-#param("ha_enabled", "bool", "in", "prompt=HA Enabled?")\r
-#param("ha_port", "int", "in", "min=1", "max=2", "prompt=HA Port")\r
-#param("ha_interface_id", "int", "in", "min=1", "max=256", "prompt=HA Interface ID")\r
-\r
-\r
-#if($ha_enabled)\r
-    /c/slb/port $data_port\r
-        hotstan dis\r
-\r
-    /c/slb/port $ha_port\r
-        intersw dis\r
-\r
-    /c/l3/vrrp/group\r
-        del\r
-\r
-    /c/l3/vrrp/vr 1\r
-        del\r
-\r
-    /c/l3/vrrp/hotstan dis\r
-\r
-    /c/l3/vrrp/off\r
-\r
-    #delete_interface($ha_interface_id)\r
-\r
-#end\r
-\r
-/c/slb\r
-    off\r
-\r
-/c/l3/gw $gateway_id\r
-    del\r
-\r
-#delete_interface($data_interface_id)\r
-\r
-\r
-#macro(delete_interface, $interface_id)\r
-/c/l3/if $interface_id\r
-    del\r
-#end\r
diff --git a/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l2_l3/workflow/workflow.xml b/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l2_l3/workflow/workflow.xml
deleted file mode 100644 (file)
index 48c0c40..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" ?>
-<workflow createAction="init" deleteAction="teardown_l2_l3" name="openstack_l2_l3" xmlns="http://www.radware.com/vdirect">
-  <description>Workflow to setup L2 and L3 for Alteon VA, Single or HA Pair, in Hot Standbye [2013-07-25 11:50:20.285000]</description>
-  <persist>
-    <!-- Declare the persistent parameters of the workflow -->
-    <parameters>
-      <parameter name="service" prompt="ADC service" type="adcService"/>
-      <parameter defaultValue="HA-Network" name="ha_network_name" prompt="HA Network Name" type="string"/>
-      <!-- Data Info-->
-      <parameter defaultValue="1" max="2" min="1" name="data_port" prompt="Data Port" type="int"/>
-      <parameter name="data_ip_address" prompt="Data IP Address" type="ip"/>
-      <parameter name="data_ip_mask" prompt="Data IP Mask" type="ip"/>
-      <parameter name="gateway" prompt="Default Gateway IP Address" type="ip"/>
-      <!-- HA Info -->
-      <parameter defaultValue="2" max="2" min="1" name="ha_port" prompt="HA Port" type="int"/>
-      <parameter name="ha_ip_address_1" prompt="HA IP Address for Primary ADC" type="ip"/>
-      <parameter name="ha_ip_address_2" prompt="HA IP Address for Secondary ADC" type="ip"/>
-      <parameter name="ha_vrrp_ip_address" prompt="HA VRRP IP Address" type="ip"/>
-      <parameter name="ha_ip_mask" prompt="Data IP Mask" type="ip"/>
-      <parameter max="1024" min="2" name="ha_group_vr_id" prompt="HA Group VR ID (1 is allocated to the interface VR)" type="int"/>
-      <parameter defaultValue="save" name="apply_type" prompt="Device apply type" type="string" values="none,apply,save"/>
-      <!-- Calculated -->
-      <parameter name="ha_enabled" type="bool"/>
-      <parameter name="ha_network" type="network"/>
-      <parameter name="ha_vrrp_pool" type="vrrpPool"/>
-      <parameter name="data_interface_id_1" type="int"/>
-      <parameter name="data_interface_id_2" type="int"/>
-      <parameter name="gateway_id_1" type="int"/>
-      <parameter name="gateway_id_2" type="int"/>
-      <parameter name="ha_interface_id_1" type="int"/>
-      <parameter name="ha_interface_id_2" type="int"/>
-      <parameter name="data_vlan_1" type="int"/>
-      <parameter name="data_vlan_2" type="int"/>
-      <parameter name="ha_vlan_1" type="int"/>
-      <parameter name="ha_vlan_2" type="int"/>
-    </parameters>
-  </persist>
-  <!-- Declare the states used by this workflow -->
-  <states>
-    <state name="initialized"/>
-    <state name="applied"/>
-    <state name="removed"/>
-  </states>
-  <!-- Declare the workflow actions -->
-  <actions>
-    <action fromState="none" name="init" toState="initialized">
-      <inputs>
-        <parameters>
-          <parameter name="service"/>
-          <parameter name="ha_network_name"/>
-        </parameters>
-      </inputs>
-      <sequence>
-        <log message="This may take time... making sure that the service is provisioned."/>
-        <script file="wait_for_service.groovy" name="wait_for_service"/>
-        <log message="Service is provisioned."/>
-        <set saveAs="$ha_enabled" value="$service.request.ha"/>
-      </sequence>
-      <sequence if="$ha_enabled">
-        <set saveAs="$ha_network" value="${service.containerResourcePool.getNetwork($ha_network_name)}"/>
-        <error if="$workflow.isNull($ha_network)" message="Requested to allocate HA IPs while HA Network $ha_network_name not found!"/>
-      </sequence>
-      <sequence>
-        <log message="Read HA and Data IP addresses from the instances"/>
-        <script file="read_ips_data_from_service.groovy" name="read_ips_data_from_service"/>
-        <!-- out:  data_ip_address, data_ip_mask, gateway, ha_ip_address_1, ha_ip_address_2, ha_vrrp_ip_address, ha_ip_mask-->
-      </sequence>
-      <sequence if="$ha_enabled &amp;&amp; $workflow.isNotNull($ha_network)">
-        <set saveAs="$ha_vrrp_pool" value="${ha_network.getVrrpPool()}"/>
-        <error if="$workflow.isNull($ha_vrrp_pool)" message="Requested to allocate HA VRRP while VRRP Pool not found in HA network $ha_network_name!"/>
-        <acquireResource comment="HA VR for service $service.id" owner="$service.id" pool="$ha_vrrp_pool" saveAs="$ha_group_vr_id"/>
-      </sequence>
-      <onError>
-        <autoReleaseResource/>
-      </onError>
-    </action>
-    <!-- setup l2 and l3 on the two devices -->
-    <action fromState="initialized" name="setup_l2_l3" toState="applied">
-      <devices>
-        <device device="$service.primary" name="adc1"/>
-        <device device="$service.secondary" if="$ha_enabled" name="adc2"/>
-      </devices>
-      <sequence>
-        <error if="$workflow.isNull($ha_ip_address_1)" message="HA IP address for primary ADC is not set!"/>
-        <error if="$ha_enabled &amp;&amp; $workflow.isNull($ha_ip_address_2)" message="HA IP address for secondary ADC is not set!"/>
-        <error if="$ha_enabled &amp;&amp; $workflow.isNull($ha_vrrp_ip_address)" message="HA VRRP IP address is not set!"/>
-        <error if="$workflow.isNull($ha_ip_mask)" message="HA IP mask is not set!"/>
-        <error if="$workflow.isNull($ha_group_vr_id)" message="HA group VR id is not set!"/>
-        <error if="$workflow.isNull($data_ip_address)" message="Data IP address is not set!"/>
-        <error if="$workflow.isNull($data_ip_mask)" message="Data IP mask is not set!"/>
-        <error if="$workflow.isNull($gateway)" message="Gateway IP address is not set!"/>
-        <log message="Start 'setup l2 l3 adc1' step."/>
-        <configuration file="setup_l2_l3.vm" name="setup_l2_l3_adc1">
-          <parameterMapping>
-            <map from="$adc1" to="$adc"/>
-            <map from="$ha_ip_address_1" to="$ha_ip_address"/>
-            <!--  Outputs -->
-            <map from="$data_interface_id_1" to="$data_interface_id"/>
-            <map from="$gateway_id_1" to="$gateway_id"/>
-            <map from="$ha_interface_id_1" to="$ha_interface_id"/>
-            <map from="$data_vlan_1" to="$data_vlan"/>
-            <map from="$ha_vlan_1" to="$ha_vlan"/>
-          </parameterMapping>
-        </configuration>
-        <log message="Completed 'setup l2 l3 adc1' step."/>
-        <log if="$ha_enabled" message="Start 'setup l2 l3 adc2' step."/>
-        <configuration if="$ha_enabled" file="setup_l2_l3.vm" name="setup_l2_l3_adc2">
-          <parameterMapping>
-            <map from="$adc2" to="$adc"/>
-            <map from="$ha_ip_address_2" to="$ha_ip_address"/>
-            <!--  Outputs -->
-            <map from="$data_interface_id_2" to="$data_interface_id"/>
-            <map from="$gateway_id_2" to="$gateway_id"/>
-            <map from="$ha_interface_id_2" to="$ha_interface_id"/>
-            <map from="$data_vlan_2" to="$data_vlan"/>
-            <map from="$ha_vlan_2" to="$ha_vlan"/>
-          </parameterMapping>
-        </configuration>
-        <log if="$ha_enabled" message="Completed 'setup l2 l3 adc2' step."/>
-        <commit apply="$apply_type != 'none'" save="$apply_type == 'save'"/>
-      </sequence>
-      <onError>
-        <autoRevert/>
-      </onError>
-    </action>
-    <action name="teardown_l2_l3" toState="removed">
-      <!-- Called when workflow is destroyed. A placeholder for 'setup' operations -->
-      <devices>
-        <device device="$service.primary" name="adc1"/>
-        <device device="$service.secondary" if="$ha_enabled" name="adc2"/>
-      </devices>
-      <sequence ifState="applied">
-        <log message="Start 'teardown l2 l3 adc1' step."/>
-        <configuration file="teardown_l2_l3.vm" name="teardown_l2_l3_adc1">
-          <parameterMapping>
-            <map from="$adc1" to="$adc"/>
-            <map from="$data_interface_id_1" to="$data_interface_id"/>
-            <map from="$gateway_id_1" to="$gateway_id"/>
-            <map from="$ha_interface_id_1" to="$ha_interface_id"/>
-          </parameterMapping>
-        </configuration>
-        <log message="Completed teardown l2 l3 adc1' step."/>
-        <log if="$ha_enabled" message="Start 'teardown l2 l3 adc2' step."/>
-        <configuration if="$ha_enabled" file="teardown_l2_l3.vm" name="teardown_l2_l3_adc2">
-          <parameterMapping>
-            <map from="$adc2" to="$adc"/>
-            <map from="$data_interface_id_2" to="$data_interface_id"/>
-            <map from="$gateway_id_2" to="$gateway_id"/>
-            <map from="$ha_interface_id_2" to="$ha_interface_id"/>
-          </parameterMapping>
-        </configuration>
-        <log if="$ha_enabled" message="Completed teardown l2 l3 adc2' step."/>
-        <commit apply="$apply_type != 'none'" save="$apply_type == 'save'"/>
-      </sequence>
-      <sequence if="$ha_enabled">
-        <releaseResource pool="$ha_vrrp_pool" resource="$ha_group_vr_id"/>
-        <set saveAs="$ha_enabled" value="false"/>
-      </sequence>
-      <onError>
-        <autoRevert/>
-               <!-- The resource is released as the next step will be to delete the ADC service itself so it is better to have the resource back to its pool -->
-        <releaseResource if="$ha_enabled" pool="$ha_vrrp_pool" resource="$ha_group_vr_id"/>
-      </onError>
-    </action>
-  </actions>
-</workflow>
diff --git a/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_common.vm b/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_common.vm
deleted file mode 100644 (file)
index 2d4905b..0000000
+++ /dev/null
@@ -1,247 +0,0 @@
-\r
-#property("summary", "Openstack - common macros and constants.")\r
-\r
-## --------------------\r
-## Common "constants"\r
-## --------------------\r
-#set($NONE="none")\r
-#set($DEFAULT_HEALTH_MONITOR_TYPE="arp")\r
-#set($HC_TYPE_CONVERSION={"PING":"icmp","TCP":"tcp","HTTP":"http","HTTPS":"http"})\r
-#set($SERVICE_ALGO_CONVERSION={"ROUND_ROBIN":"roundrobin","LEAST_CONNECTIONS":"leastconns","SOURCE_IP":"phash"})\r
-#set($HC_TYPE_TO_POJO_CONVERSION={"HTTP":"SlbNewAdvhcHttpEntry","HTTPS":"SlbNewAdvhcHttpEntry","PING":"SlbNewAdvhcIcmpEntry","TCP":"SlbNewAdvhcTcpEntry"})\r
-#set($HC_MAX_HCS_PER_GROUP=8)\r
-#set($HC_MAX_DELAY=600)\r
-#set($HC_MAX_TIMEOUT=600)\r
-#set($HC_HTTP_METHODS=['get','head','post'])\r
-#set($SERVICE_TYPES=["http","https","ssl","dns","rtsp","wts","basic-slb"])\r
-#set($HC_HTTP_MAX_RESPONSE_STRING_SIZE=47)\r
-#set($HC_HTTP_MAX_RESPONSE_ELEMENT_COUNT=12)\r
-#set($HC_MAX_ID_LENGTH=32)\r
-#set($GROUP_NAME_MAX_LENGTH=31)\r
-\r
-#set($NO_IP="0.0.0.0")\r
-#set($SESSION_PERSISTENCE_COOKIE_SIZE=64)\r
-#set($CREATE_MODE = "CREATE")\r
-#set($DELETE_MODE = "DELETE")\r
-#set($DOT = ".")\r
-\r
-#set($IPV4="v4")\r
-#set($IPV6="v6")\r
-\r
-#set ($IP_FIELDS = {$IPV4 : "IpAddr" , $IPV6 : "Ipv6Addr"})\r
-#set ($VIRT_IP_FIELDS = {$IPV4 : "IpAddress" , $IPV6 : "Ipv6Addr"})\r
-\r
-#set($IPV4_REGEX = ""+'\'+"A(25[0-5]|2[0-4]" + '\' + "d|[0-1]?" + '\' + "d?" + '\' + "d)(" + '\' + ".(25[0-5]|2[0-4]" + '\' + "d|[0-1]?" + '\' + "d?" + '\' + "d)){3}" + '\' + "z")\r
-#set($IPV6_HEX4DECCOMPRESSED_REGEX = "" + '\' + "A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::((?:[0-9A-Fa-f]{1,4}:)*)(25[0-5]|2[0-4]" + '\' + "d|[0-1]?" + '\' + "d?" + '\' + "d)(" + '\' + ".(25[0-5]|2[0-4]" + '\' + "d|[0-1]?" + '\' + "d?" + '\' + "d)){3}" + '\' + "z")\r
-#set($IPV6_6HEX4DEC_REGEX = "" + '\' + "A((?:[0-9A-Fa-f]{1,4}:){6,6})(25[0-5]|2[0-4]" + '\' + "d|[0-1]?" + '\' + "d?" + '\' + "d)(" + '\' + ".(25[0-5]|2[0-4]" + '\' + "d|[0-1]?" + '\' + "d?" + '\' + "d)){3}" + '\' + "z")\r
-#set($IPV6_HEXCOMPRESSED_REGEX = "" + '\' + "A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)" + '\' + "z")\r
-#set($IPV6_REGEX = "" + '\' + "A(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}" + '\' + "z")\r
-\r
-## ------------------------------------ macros ------------------------------------------------------------------\r
-\r
-#macro(os_print_hc_config,$hcType, $hcUUID,$hcRefCount,$hcMxRetries,$hcDelay, $hcTimeout,$hcUrlPath,$hcExpectedCodes)\r
-    #os_print_health_check_header($hcType, $hcUUID)\r
-    dport   none\r
-    name    "$hcRefCount"\r
-    retry   $hcMxRetries\r
-    #os_print_inter_and_timeout($hcDelay, $hcTimeout)\r
-    #if($hcType.startsWith("HTTP"))\r
-        #if($hcType=="HTTPS")\r
-            ssl enabled\r
-        #end\r
-        http\r
-        #os_print_http_method($hcHttpMethod, $hcUUID)\r
-        path "$hcUrlPath"\r
-        #os_print_http_response($hcExpectedCodes, $hcUUID)\r
-    #end\r
-#end\r
-\r
-#macro(os_print_inter_and_timeout, $hcDelay, $hcTimeout)\r
-    ##Alteon requires that the timeout will be samller or equal to the interval.\r
-    #if($hcTimeout > $hcDelay)\r
-        #set($hcDelay=$hcTimeout)\r
-    #end\r
-    #if($hcDelay>$HC_MAX_DELAY)\r
-        #set($hcDelay=$HC_MAX_DELAY)\r
-    #end\r
-    inter   $hcDelay\r
-    #if($hcTimeout>$HC_MAX_TIMEOUT)\r
-        #set($hcTimeout=$HC_MAX_TIMEOUT)\r
-    #end\r
-    timeout $hcTimeout\r
-#end\r
-\r
-#macro(os_get_ref_count_for_hc, $hcUUID, $hcType, $refCountRetArray)\r
-        ## find the vDirect POJO for the given $hcType\r
-        #set($hceName=$HC_TYPE_TO_POJO_CONVERSION.get($hcType))\r
-        #if($adc.isNull($hceName))\r
-            #error("Unknown Health Check type occured $hcType with id $hcUUID!")\r
-        #end\r
-        ## strip the uuid\r
-        #set($stripped_uuid=[-1])\r
-        #os_strip_uuid($hcUUID,$stripped_uuid)\r
-        ## allocate a bean and look for it by its ID (openstack uuid is used here)\r
-        #set($hce = $adc.newBean($hceName))\r
-        #set($hce.ID = $stripped_uuid[0])\r
-        #set($hce2 = $adc.read($hce))\r
-        #if ($hce2.isEmpty())\r
-            ## hc was not found on the device - RefCount is zero\r
-            #set($refCountRetArray[0]=0)\r
-        #else\r
-            ## hc was found on the device - we use the 'Name' field to store its reference count\r
-            #set($hcRefCountStr=$hce2.Name)\r
-            #set($hcRefCount=0)\r
-            #set($hcRefCount=$hcRefCount.parseInt($hcRefCountStr))\r
-            #set($refCountRetArray[0]=$hcRefCount)\r
-        #end\r
-#end\r
-\r
-#macro(os_print_health_check_header, $hcType, $hcUUID)\r
-    #set($stripped_uuid=[-1])\r
-    #os_strip_uuid($hcUUID,$stripped_uuid)\r
-    #if($hcType==$NONE)\r
-        /c/slb/advhc/health $stripped_uuid[0]\r
-    #else\r
-        #set($calcHcType=$HC_TYPE_CONVERSION.get($hcType))\r
-        #if($adc.isNull($calcHcType))\r
-            #error("Unsupported Health Monitor type $hcType in id $hcUUID!")\r
-        #else\r
-            /c/slb/advhc/health $stripped_uuid[0] $calcHcType\r
-        #end\r
-    #end\r
-#end\r
-\r
-#macro(os_print_http_method, $method, $hcUUID)\r
-    #set($lower_method=$method.toLowerCase())\r
-    #set($found=$HC_HTTP_METHODS.contains($lower_method))\r
-    #if(!$found)\r
-        #error("Unsupported HTTP method $method for id $hcUUID!")\r
-    #else\r
-        method $lower_method\r
-    #end\r
-#end\r
-\r
-#macro(os_convert_range_into_two_integers, $response,$result)\r
-    #set($left=$response.substring(0,$dash_index))\r
-    #set($offset=$dash_index + 1)\r
-    #set($right=$response.substring($offset,$response.length()))\r
-    #set($leftInt=0)\r
-    #set($leftInt=$leftInt.parseInt($left))\r
-    #set($rightInt=0)\r
-    #set($rightInt=$rightInt.parseInt($right))\r
-    #set($result[0]=$leftInt)\r
-    #set($result[1]=$rightInt)\r
-#end\r
-\r
-#macro(os_print_http_response, $response, $hcUUID)\r
-    #set($dash_index=$response.indexOf('-'))\r
-    #if($dash_index != -1)\r
-        #set($result=[-1,-1])\r
-        #os_convert_range_into_two_integers($response,$result)\r
-        #set($range_size=$result[1] - $result[0])\r
-        #if($range_size > $HC_HTTP_MAX_RESPONSE_ELEMENT_COUNT)\r
-            #error("Too many reponse codes in the range $response ($range_size) for id $hcUUID! Up to $HC_HTTP_MAX_RESPONSE_ELEMENT_COUNT reponse codes are supported!")\r
-        #else\r
-            #set($calc_reponse="")\r
-            #foreach($response_code in [$leftInt..$rightInt])\r
-                #set($calc_reponse=$calc_reponse + $response_code + ",")\r
-            #end\r
-            #set($len=$calc_reponse.length() - 1))\r
-            #set($calc_reponse=$calc_reponse.substring(0,$len))\r
-            response $calc_reponse none ""\r
-        #end\r
-    #else\r
-        #if($response.length() > $HC_HTTP_MAX_RESPONSE_STRING_SIZE)\r
-            #error("Too many reponse codes in the range $response ($range_size) for id $hcUUID! Up to $HC_HTTP_MAX_RESPONSE_ELEMENT_COUNT reponse codes are supported!")\r
-        #else\r
-            response $response none ""\r
-        #end\r
-    #end\r
-#end\r
-\r
-## Remove the "-" from $uuid\r
-## Make sure it is not too long\r
-## Return value using $result\r
-#macro(os_strip_uuid,$uuid,$result)\r
-    #set($strippedUUID=$uuid.replaceAll("-",""))\r
-    #if($strippedUUID.length() > $HC_MAX_ID_LENGTH)\r
-        #error("UUID $strippedUUID is too long and cant be used as Health Monitor ID. Maximum length is $HC_MAX_ID_LENGTH.")\r
-    #end\r
-    #set($result[0]=$strippedUUID)\r
-#end\r
-\r
-## --------------------------------------------------------------\r
-## Get the IP version of the incoming argument\r
-## Raise an exception if no match was found\r
-## --------------------------------------------------------------\r
-#macro(os_get_ip_version, $ip)\r
-    #if($ip.matches($IPV4_REGEX))\r
-        $IPV4\r
-    #elseif($ip.matches($IPV6_REGEX) || $ip.matches($IPV6_HEXCOMPRESSED_REGEX) || $ip.matches($IPV6_6HEX4DEC_REGEX) || $ip.matches($IPV6_HEX4DECCOMPRESSED_REGEX))\r
-        $IPV6\r
-    #else\r
-        #error("IP Address $ip is not a valid IP!")\r
-    #end\r
-#end\r
-\r
-\r
-#macro(os_print_persist_command, $persistMethod, $cookieName, $serviceType)\r
-    #if ($persistMethod=="APP_COOKIE")\r
-            pbind cookie passive "$cookieName" 1 64 enable\r
-    #elseif ($persistMethod=="HTTP_COOKIE")\r
-            pbind cookie insert "$cookieName" secure\r
-    #elseif ($persistMethod=="SOURCE_IP")\r
-        #if($serviceType=="https")\r
-            pbind sslid\r
-        #else\r
-            pbind clientip norport\r
-        #end\r
-    #end\r
-#end\r
-\r
-\r
-#macro(os_get_service_type, $serviceType)\r
-    #set($serviceType=$serviceType.toLowerCase())\r
-    #if($SERVICE_TYPES.contains($serviceType))\r
-        $serviceType\r
-    #else\r
-        #if($serviceType=="tcp")\r
-            "basic-slb"\r
-        #else\r
-            #error("Unsupported service type $serviceType!")\r
-        #end\r
-    #end\r
-#end\r
-\r
-\r
-#macro(os_print_metric_command, $serviceAlgorithm)\r
-    #set($algo=$SERVICE_ALGO_CONVERSION.get($serviceAlgorithm))\r
-    #if($adc.isNull($algo))\r
-        #error("Unsupported group metric type $serviceAlgorithm!")\r
-    #else\r
-        metric $algo\r
-    #end\r
-#end\r
-\r
-##\r
-## Verify that a field is not NULL/Empty and its lenght is < maximal length\r
-##\r
-#macro(verify_field_length,$field_name,$field_value,$max_len)\r
-    #if($adc.isNull($field_value) || $field_value.isEmpty())\r
-        #error("Field '$field_name' can not be NULL or empty.")\r
-    #end\r
-    #if($field_value.length() > $max_len)\r
-        #error("Field '$field_name' can not be longer than $max_len chars. Current length is $field_value.length()")\r
-    #end\r
-#end\r
-\r
-##\r
-## Map boolean value to ena/dis\r
-##\r
-#macro(os_print_bool_to_ena_dis, $boolean_val)\r
-    #if($boolean_val)\r
-        ena\r
-    #else\r
-        dis\r
-    #end\r
-#end\r
diff --git a/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_init_indexes.vm b/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_init_indexes.vm
deleted file mode 100644 (file)
index e673115..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-\r
-#property("summary", "Init Indexes - date: [2013-05-08]")\r
-\r
-#param("vip", "ip", "in", "prompt = IP address for the virtual service")\r
-#param("virtSvcPort", "int", "in", "prompt = Virtual service tcp port")\r
-\r
-## The index of the real server group\r
-#param("groupId", "int", "out")\r
-\r
-## The index of the virtual server\r
-#param("virtId", "int", "out")\r
-\r
-## If values are new or were pre-exsiting\r
-#param("newValues", "bool", "out")\r
-\r
-#set($newValues=true)\r
-#set($virt = $adc.newBean("/c/slb/virt"))\r
-#set($virt.ipAddress = $vip)\r
-#set($virts = $adc.findAll($virt))\r
-#foreach($virt in $virts)\r
-    #set($groupId = 0)\r
-    #set($virtId = $virt.index)\r
-    #set($virse=$adc.newBean("/c/slb/virt/service"))\r
-    #set($virse.VirtualServerIndex=$virtId)\r
-    #set($virse.VirtPort=$virtSvcPort)\r
-    ##consider to also set $virse.Index=0 and do $adc.Read\r
-    #set($service=$adc.findFirst($virse))\r
-    #if($adc.isNotNull($service))\r
-        #set($newValues = false)\r
-        #set($virtId = $service.VirtualServerIndex)\r
-        #set($groupId = $service.RealGroup)\r
-        #break\r
-    #end\r
-#end\r
-#if($newValues)\r
-    #set($virtId = $adc.getFreeIndexWithDefault("/c/slb/virt", 1))\r
-    #set($groupId = $adc.getFreeIndexWithDefault("/c/slb/group", 1))\r
-#end\r
diff --git a/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_manage_hcs.vm b/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_manage_hcs.vm
deleted file mode 100644 (file)
index 6da1909..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-\r
-#property("summary", "Manage Health Checks - date: [2013-05-13 4]")\r
-\r
-## Manage Health Checks\r
-\r
-#parse("openstack_l4/openstack_common.vm")\r
-\r
-#param("group_id", "int", "in", "prompt=Group ID")\r
-#param("curr_hm_uuid_array", "string[]", "in", "prompt=Current Health monitors UUID array")\r
-#param("curr_hm_type_array", "string[]", "in", "prompt=Current Health monitors type array")\r
-#param("hm_uuid_array", "string[]", "in", "prompt=Health monitors UUID array")\r
-#param("hm_type_array", "string[]", "in", "prompt=Health monitors type array")\r
-#param("hm_delay_array", "int[]", "in", "prompt=Health monitors delay array")\r
-#param("hm_timeout_array", "int[]", "in", "prompt=Health monitors timeout array")\r
-#param("hm_max_retries_array", "int[]", "in", "prompt=Health monitors max retries array")\r
-#param("hm_admin_state_up_array", "bool[]", "in", "prompt=Health monitors admin state array")\r
-#param("hm_url_path_array", "string[]", "in", "prompt=Health monitors url path array")\r
-#param("hm_http_method_array", "string[]", "in", "prompt=Health monitors http method array")\r
-#param("hm_expected_codes_array", "string[]", "in", "prompt=Health monitor expected codes_array")\r
-\r
-#if($hm_uuid_array.size() > $HC_MAX_HCS_PER_GROUP)\r
-    #error("Got $hm_uuid_array.length ammount of health monitors which is more than the supported $HC_MAX_HCS_PER_GROUP health monitors per pool with alteon id $group_id on device $adc")\r
-#end\r
-\r
-## -----------------------------------------------------------------------------\r
-## perpare a map of hcs connected to the group with their ref count\r
-## -----------------------------------------------------------------------------\r
-#set($currHCs={})\r
-#set($counter=0)\r
-#foreach ($hcUUID in $curr_hm_uuid_array)\r
-    #if($hcUUID != $NONE)\r
-        #set($hcType=$curr_hm_type_array[$counter])\r
-        #set($refCountRetArray=[-1])\r
-        #os_get_ref_count_for_hc($hcUUID, $hcType, $refCountRetArray)\r
-        ##consider raising error if ref count is 0\r
-        #set($not_in_use=$currHCs.put($hcUUID, $refCountRetArray[0]))\r
-        #set($counter=$counter+1)\r
-    #end\r
-#end\r
-\r
-## ----------------------------------------------------\r
-## prepare map of hcs to be connected to the group\r
-## ----------------------------------------------------\r
-#set($newHCs={})\r
-#set($hcrIndex=0)\r
-#foreach ($hcUUID in $hm_uuid_array)\r
-    #if($hcUUID!=$NONE)\r
-        #set($not_in_use=$newHCs.put($hcUUID, $hcrIndex))\r
-    #end\r
-    #set($hcrIndex=$hcrIndex+1)\r
-#end\r
-\r
-## ---------------------------------------\r
-## handle the hcs that should be updated\r
-## ---------------------------------------\r
-#set($toUpdateHCs={})\r
-#set($not_in_use=$toUpdateHCs.putAll($currHCs))\r
-#set($not_in_use=$toUpdateHCs.keySet().retainAll($newHCs.keySet()))\r
-#log("Health monitors to be updated: $toUpdateHCs")\r
-#foreach ($entry in $toUpdateHCs.entrySet())\r
-    #set($hcRefCount=$entry.getValue())\r
-    #set($hcUUID=$entry.getKey())\r
-    #set($hcIndex=$newHCs.get($hcUUID))\r
-    #set($hcType=$hm_type_array[$hcIndex])\r
-    #set($hcDelay=$hm_delay_array[$hcIndex])\r
-    #set($hcTimeout=$hm_timeout_array[$hcIndex])\r
-    #set($hcMxRetries=$hm_max_retries_array[$hcIndex])\r
-    #set($hcAdminStateUp=$hm_admin_state_up_array[$hcIndex])\r
-    #set($hcUrlPath=$hm_url_path_array[$hcIndex])\r
-    #set($hcHttpMethod=$hm_http_method_array[$hcIndex])\r
-    #set($hcExpectedCodes=$hm_expected_codes_array[$hcIndex])\r
-    #os_print_hc_config($hcType, $hcUUID,$hcRefCount,$hcMxRetries,$hcDelay, $hcTimeout,$hcUrlPath,$hcExpectedCodes)\r
-#end\r
-\r
-## ---------------------------------------\r
-## handle the hcs that should be created\r
-## ---------------------------------------\r
-#set($toCreateHCs={})\r
-#set($not_in_use=$toCreateHCs.putAll($newHCs))\r
-#set($not_in_use=$toCreateHCs.keySet().removeAll($currHCs.keySet()))\r
-#log("Health monitors to be created: $toCreateHCs")\r
-#foreach ($entry in $toCreateHCs.entrySet())\r
-    #set($hcUUID=$entry.getKey())\r
-    #set($hcIndex=$newHCs.get($hcUUID))\r
-    #set($hcType=$hm_type_array[$hcIndex])\r
-    #set($hcDelay=$hm_delay_array[$hcIndex])\r
-    #set($hcTimeout=$hm_timeout_array[$hcIndex])\r
-    #set($hcMxRetries=$hm_max_retries_array[$hcIndex])\r
-    #set($hcAdminStateUp=$hm_admin_state_up_array[$hcIndex])\r
-    #set($hcUrlPath=$hm_url_path_array[$hcIndex])\r
-    #set($hcHttpMethod=$hm_http_method_array[$hcIndex])\r
-    #set($hcExpectedCodes=$hm_expected_codes_array[$hcIndex])\r
-\r
-    #set($hcRefCount=1)\r
-    #set($refCountRetArray=[-1])\r
-    ## query the device and check how many references this hc has already\r
-    #os_get_ref_count_for_hc($hcUUID, $hcType, $refCountRetArray)\r
-    #set($hcRefCount=$hcRefCount+$refCountRetArray[0])\r
-\r
-    #os_print_hc_config($hcType, $hcUUID,$hcRefCount,$hcMxRetries,$hcDelay, $hcTimeout,$hcUrlPath,$hcExpectedCodes)\r
-#end\r
-\r
-## ---------------------------------------\r
-## handle the hcs that should be deleted\r
-## ---------------------------------------\r
-#set($toDelHCs={})\r
-#set($not_in_use=$toDelHCs.putAll($currHCs))\r
-#set($not_in_use=$toDelHCs.keySet().removeAll($newHCs.keySet()))\r
-#log("Health monitors to be deleted: $toDelHCs")\r
-#foreach ($entry in $toDelHCs.entrySet())\r
-    #set($hcUUID=$entry.getKey())\r
-    #set($hcRefCount=$entry.getValue())\r
-    #set($hcRefCount=$hcRefCount - 1)\r
-    #os_print_health_check_header($NONE, $hcUUID)\r
-    ## if we still have positive ref count - keep the hc, else - remove it\r
-    #if($hcRefCount > 0)\r
-        name "$hcRefCount"\r
-    #else\r
-        del\r
-    #end\r
-#end\r
-\r
-## ------------------------------\r
-## handle the logexp config block\r
-## ------------------------------\r
-#set($logExp="")\r
-#set($counter=0)\r
-#if($hm_uuid_array.size() > 0)\r
-    #foreach($hcUUID in $hm_uuid_array)\r
-        #if($hm_admin_state_up_array[$counter] && $hcUUID != $NONE)\r
-            #set($stripped_uuid=[-1])\r
-            #os_strip_uuid($hcUUID,$stripped_uuid)\r
-            #set($_log_exp_uuid=$stripped_uuid[0])\r
-            #set($logExp=$logExp + $_log_exp_uuid + "&")\r
-        #end\r
-        #set($counter=$counter+1)\r
-    #end\r
-    #if($logExp.length() > 0)\r
-        #set($len=$logExp.length() - 1)\r
-        #set($logExp=$logExp.substring(0,$len))\r
-    #else\r
-        #set($logExp=$DEFAULT_HEALTH_MONITOR_TYPE)\r
-    #end\r
-#else\r
-    #set($logExp=$DEFAULT_HEALTH_MONITOR_TYPE)\r
-#end\r
-\r
-/c/slb/advhc/health HC_Group_$group_id LOGEXP\r
-        logexp $logExp\r
-\r
-/c/slb/group $group_id\r
-        health HC_Group_$group_id\r
-\r
-\r
diff --git a/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_manage_l4.vm b/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_manage_l4.vm
deleted file mode 100644 (file)
index 6874e8c..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-\r
-#parse("openstack_l4/openstack_common.vm")\r
-\r
-#property("summary", "Manage Configuration of L4 HA service date: [2013-05-08]")\r
-\r
-#param("groupId", "int", "in", "prompt = Group id")\r
-#param("virtId", "int", "in", "prompt = Virt id")\r
-#param("virtServerEnabled", "bool", "in" "prompt = Is VIP enabled?")\r
-#param("vip", "ip", "in", "prompt = IP address for the virtual service")\r
-#param("virtSvcPort", "int", "in", "prompt = Virtual Service Port (0 means no value)")\r
-#param("virtSvcType", "string", "in", "prompt = Virtual Service Type", "values=HTTP,HTTPS,TCP")\r
-#param("svcPortAlgorithm", "string", "in", "prompt = Memeber Selection Algorithm", "values=ROUND_ROBIN,LEAST_CONNECTIONS,SOURCE_IP")\r
-#param("groupEnabled", "bool", "in" "prompt = Is Group enabled?")\r
-#param("virtSvcPersistMethod", "string", "in", "prompt = Virtual Service Persistence Method", "values=SOURCE_IP,HTTP_COOKIE,APP_COOKIE")\r
-#param("virtSvcCookieName", "string", "in", "prompt = Virtual Service Cookie Name")\r
-\r
-\r
-\r
-##setup global slb flags\r
-/c/slb/adv/direct ena\r
-\r
-\r
-#set($vipIpVer="#os_get_ip_version($vip)")\r
-#set($vipIpVer=$vipIpVer.trim())\r
-\r
-## name is maximum 31 characters\r
-/c/slb/group $groupId\r
-    #verify_field_length("Group name","$groupId",$GROUP_NAME_MAX_LENGTH)\r
-    name "$groupId"\r
-    #os_print_metric_command($svcPortAlgorithm)\r
-##  The admin state of opens stack exists both on vip, pool and members\r
-##  As a memeber can only be assigned to one pool the effect of disabling the pool is the same as disbaling all of its memebers\r
-##  Currently, alteon does not have a method to disbale the pool\r
-##    #if($groupEnabled)\r
-##    ena\r
-##    #else\r
-##    dis\r
-##    #end\r
-\r
-##clean the virt and virs before redoing the definition\r
-/c/slb/virt $virtId\r
-    del\r
-## vname is maximum 32 characters\r
-/c/slb/virt $virtId\r
-    ipver $vipIpVer\r
-    vip $vip\r
-    #os_print_bool_to_ena_dis($virtServerEnabled)\r
-\r
-#set($serviceType="#os_get_service_type($virtSvcType)")\r
-#set($serviceType=$serviceType.trim())\r
-/c/slb/virt $virtId/service $virtSvcPort $serviceType\r
-    group $groupId\r
-    rport 0\r
-/c/slb/virt $virtId/service $virtSvcPort $serviceType\r
-    #os_print_persist_command($virtSvcPersistMethod, $virtSvcCookieName, $serviceType)\r
-/c/slb/virt $virtId/service $virtSvcPort $serviceType/pip\r
-    mode address\r
-    #if($vipIpVer==$IPV4)\r
-    addr v4 $vip 255.255.255.255 v6 none persist disable\r
-    #else\r
-    addr v4 none v6 $vip 128 persist disable\r
-    #end\r
diff --git a/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_manage_rips.vm b/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_manage_rips.vm
deleted file mode 100644 (file)
index e698eea..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-\r
-#parse("openstack_l4/openstack_common.vm")\r
-\r
-#property("summary", "Manage Real IPs - date: [2013-05-13]")\r
-\r
-##I am corrently using the needed function from this file so not to handle the path structure.\r
-##parse("common_lib.vm")\r
-\r
-## Manage RIPs\r
-\r
-## Layer 4 part\r
-#param("groupId", "int", "in", "prompt=Group ID")\r
-#param("curRealServerIds", "int[]", "in", "prompt=Current Real Server IDs")\r
-#param("memberIps", "ip[]", "in", "prompt=Updated Real Server IPs (0.0.0.0 means no value)")\r
-#param("memberWeights", "int[]", "in", "prompt=Real Server Weights")\r
-#param("memberPorts", "int[]", "in", "prompt=Real Server Ports")\r
-#param("memberAdminStates", "bool[]", "in", "prompt=Real Server Admin States")\r
-\r
-#param("realServerIds", "int[]", "out")\r
-\r
-## implementation\r
-\r
-#set($currRealServers={})\r
-## calculate the current list of servers connected to the group\r
-#foreach ($serverId in $curRealServerIds)\r
-    #if($serverId>0)\r
-        #set($rse = $adc.newBean("/c/slb/real"))\r
-        #set($rse.Index = $serverId)\r
-        #set($rse2 = $adc.read($rse))\r
-        #if ($adc.isNull($rse2))\r
-            #error ("Server $serverId was not found")\r
-        #end\r
-        #set($key="#generate_key($rse2)")\r
-        #set($key=$key.trim())\r
-        #set($addStatus=$currRealServers.put($key, $serverId))\r
-    #end\r
-#end\r
-\r
-#set($newRealServers={})\r
-#set($memberIndex=0)\r
-## calculate the new list of servers connected to the group\r
-#foreach ($memberIp in $memberIps)\r
-    #if($memberIp!=$NO_IP)\r
-        #set($memberPort=$memberPorts[$memberIndex])\r
-        #set($key="#generate_key2($memberIp, $memberPort)")\r
-        #set($key=$key.trim())\r
-        #set($addStatus=$newRealServers.put($key, $memberIndex))\r
-    #end\r
-    #set($memberIndex=$memberIndex+1)\r
-#end\r
-\r
-#set($toUpdateRealServers={})\r
-#set($addStatus=$toUpdateRealServers.putAll($currRealServers))\r
-#set($addStatus=$toUpdateRealServers.keySet().retainAll($newRealServers.keySet()))\r
-#log("Real servers to be updated: $toUpdateRealServers")\r
-#foreach ($entry in $toUpdateRealServers.entrySet())\r
-    #set($updateId=$entry.getValue())\r
-    #set($updateKey=$entry.getKey())\r
-    #set($memberIndex=$newRealServers.get($updateKey))\r
-    #set($memberWeight=$memberWeights[$memberIndex])\r
-    #set($memberAdminState=$memberAdminStates[$memberIndex])\r
-\r
-/c/slb/real $updateId\r
-    #print_weight($memberWeight)\r
-    #os_print_bool_to_ena_dis($memberAdminState)\r
-\r
-#end\r
-\r
-#set($createId=0)\r
-#set($toCreateRealServers={})\r
-#set($addStatus=$toCreateRealServers.putAll($newRealServers))\r
-#set($addStatus=$toCreateRealServers.keySet().removeAll($currRealServers.keySet()))\r
-#log("Real servers to be created: $toCreateRealServers")\r
-#foreach ($entry in $toCreateRealServers.entrySet())\r
-    #set($createId=$adc.getFreeIndex("/c/slb/real", $createId))\r
-    #set($memberIndex=$entry.getValue())\r
-    #set($memberWeight=$memberWeights[$memberIndex])\r
-    #set($memberPort=$memberPorts[$memberIndex])\r
-    #set($memberIp=$memberIps[$memberIndex])\r
-    #set($memberIpVer="#os_get_ip_version($memberIp)")\r
-    #set($memberIpVer=$memberIpVer.trim())\r
-    #set($memberAdminState=$memberAdminStates[$memberIndex])\r
-\r
-/c/slb/real $createId\r
-    ipver   $memberIpVer\r
-    rip     $memberIp\r
-    #print_weight($memberWeight)\r
-    addport $memberPort\r
-    #os_print_bool_to_ena_dis($memberAdminState)\r
-\r
-/c/slb/group $groupId\r
-    ipver $memberIpVer\r
-    add $createId\r
-\r
-#end\r
-\r
-#set($toDelRealServers={})\r
-#set($addStatus=$toDelRealServers.putAll($currRealServers))\r
-#set($addStatus=$toDelRealServers.keySet().removeAll($newRealServers.keySet()))\r
-#log("Real servers to be deleted: $toDelRealServers")\r
-#foreach ($delId in $toDelRealServers.values())\r
-/c/slb/group $groupId\r
-    rem $delId\r
-\r
-/c/slb/real $delId\r
-    del\r
-\r
-#end\r
-\r
-#set($realServerIds = [])\r
-#set($group1 = $adc.newBean("/c/slb/group"))\r
-#set($group1.Index = $groupId)\r
-#set($group2 = $adc.read($group1))\r
-#set($realServerIds=$adc.readNumbersFromBitmapPlusOne($group2.RealServers))\r
-\r
-\r
-#macro(generate_key, $rsBean)\r
-    #set($ret_key="")\r
-    #if ($rsBean.IpVer == "IPV4")\r
-        #set($ret_key=$ret_key+$rsBean.IpAddr)\r
-    #else\r
-        #set($ret_key=$ret_key+$rsBean.Ipv6Addr)\r
-    #end\r
-    #set($rports=[])\r
-    #set($dummy="#get_real_server_rports($rsBean.Index, $rports)")\r
-    #foreach($rport in $rports)\r
-        #set($ret_key=$ret_key+"-"+$rport)\r
-    #end\r
-\r
-    $ret_key\r
-#end\r
-\r
-#macro(generate_key2, $ip_address, $rport)\r
-    #set($ret_key="")\r
-    #set($ret_key=$ret_key + $ip_address + "-" + $rport)\r
-    $ret_key\r
-#end\r
-\r
-#macro(get_real_server_rports, $rs_id, $rports)\r
-    #set($pe = $adc.newBean('SlbNewCfgRealServPortEntry'))\r
-    #set($pe.Index=1)\r
-    #set($pe.RealServIndex= $rs_id)\r
-    #set($pei = $adc.read($pe))\r
-    #if($adc.isNotNull($pei))\r
-        #set($dummy=$rports.add($pei.RealPort))\r
-    #else\r
-        #set($dummy=$rports.add(0))\r
-    #end\r
-#end\r
-\r
-#macro(print_weight, $weight)\r
-    #set($weight=1+$weight/5)\r
-    weight  $weight\r
-#end\r
-\r
-\r
diff --git a/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_teardown_l4.vm b/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/templates/openstack_teardown_l4.vm
deleted file mode 100644 (file)
index e7cdcb5..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-\r
-#parse("openstack_l4/openstack_common.vm")\r
-\r
-#property("summary", "Delete L4 service and Real Servers - date: [2013-05-12]")\r
-\r
-## Layer 4 part\r
-#param("virtId", "int", "in", "prompt=Virt ID")\r
-#param("groupId", "int", "in", "prompt=Group ID")\r
-#param("curRealServerIds", "int[]", "in", "prompt=Real Server IDs")\r
-#param("curr_hm_uuid_array", "string[]", "in", "prompt=Current Health monitors UUID array")\r
-\r
-## L4 implementation\r
-\r
-/c/slb/virt $virtId\r
-    del\r
-\r
-## set back the group health check to default\r
-/c/slb/group $groupId\r
-    del\r
-\r
-## remove the LOGEXP part\r
-/c/slb/advhc/health HC_Group_$groupId\r
-    del\r
-\r
-#foreach ($uuid in $curr_hm_uuid_array)\r
-    #set($stripped_uuid=[-1])\r
-    #os_strip_uuid($uuid,$stripped_uuid)\r
-    /c/slb/advhc/health $stripped_uuid[0]\r
-        del\r
-#end\r
-\r
-#foreach ($serverId in $curRealServerIds)\r
-/c/slb/real $serverId\r
-    del\r
-#end\r
diff --git a/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/workflow/workflow.xml b/neutron/services/loadbalancer/drivers/radware/workflows/openstack_l4/workflow/workflow.xml
deleted file mode 100644 (file)
index f332f98..0000000
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" ?>
-<workflow createAction="init" deleteAction="teardown" name="openstack_l4" xmlns="http://www.radware.com/vdirect">
-  <description>L4 Workflow for OpenStack LBaaS [2013-07-25 11:50:20.501000]</description>
-  <persist>
-    <parameters>
-      <!-- The vDirect Service -->
-      <parameter name="service" prompt="Radware vDirect ADC Service" type="adcService"/>
-      <!-- Vip -->
-      <parameter defaultValue="1.1.1.1" name="vip_address" prompt="VIP address" type="ip"/>
-      <parameter defaultValue="80" name="vip_protocol_port" prompt="VIP port" type="int"/>
-      <parameter defaultValue="HTTP" name="vip_protocol" prompt="VIP protocol" type="string" values="HTTP,HTTPS,TCP"/>
-      <parameter defaultValue="10" name="vip_connection_limit" prompt="VIP connection limit" type="int"/>
-      <parameter defaultValue="true" name="vip_admin_state_up" prompt="Is VIP enabled?" type="bool"/>
-      <parameter defaultValue="SOURCE_IP" name="vip_session_persistence_type" prompt="VIP session persistence type" type="string" values="SOURCE_IP,HTTP_COOKIE,APP_COOKIE"/>
-      <parameter defaultValue="none" name="vip_session_persistence_cookie_name" prompt="VIP session persistence cookie name" type="string"/>
-      <!-- Pool -->
-      <!-- pool_protocol is currently not used and expected to be the same as the vip_protocol-->
-      <parameter defaultValue="HTTP" name="pool_protocol" prompt="Pool protocol" type="string" values="HTTP,HTTPS,TCP"/>
-      <parameter defaultValue="ROUND_ROBIN" name="pool_lb_method" prompt="Pool LB method" type="string" values="ROUND_ROBIN,LEAST_CONNECTIONS,SOURCE_IP"/>
-      <parameter defaultValue="true" name="pool_admin_state_up" prompt="Is Pool enabled?" type="bool"/>
-      <!-- Members -->
-      <parameter defaultValue="1.1.1.2" name="member_address_array" prompt="Members address array" type="ip[]"/>
-      <parameter defaultValue="81" name="member_protocol_port_array" prompt="Members protocol port array" type="int[]"/>
-      <parameter defaultValue="30" name="member_weight_array" prompt="Members weight array" type="int[]"/>
-      <parameter defaultValue="true" name="member_admin_state_up_array" prompt="Are members enabled?" type="bool[]"/>
-      <!-- Health Monitors -->
-      <parameter defaultValue="none" name="hm_uuid_array" prompt="Health monitors UUID array" type="string[]"/>
-      <parameter defaultValue="HTTP" name="hm_type_array" prompt="Health monitors type array" type="string[]" values="PING,TCP,HTTP,HTTPS"/>
-      <parameter defaultValue="10" name="hm_delay_array" prompt="Health monitors delay array" type="int[]"/>
-      <parameter defaultValue="20" name="hm_timeout_array" prompt="Health monitors timeout array" type="int[]"/>
-      <parameter defaultValue="3" name="hm_max_retries_array" prompt="Health monitors max retries array" type="int[]"/>
-      <parameter defaultValue="true" name="hm_admin_state_up_array" prompt="Health monitors admin state array" type="bool[]"/>
-      <parameter defaultValue="/" name="hm_url_path_array" prompt="Health monitors url path array" type="string[]"/>
-      <parameter defaultValue="GET" name="hm_http_method_array" prompt="Health monitors http method array" type="string[]"/>
-      <parameter defaultValue="200" name="hm_expected_codes_array" prompt="Health monitor expected codes_array" type="string[]"/>
-      <parameter defaultValue="save" name="apply_type" prompt="Device apply type" type="string" values="none,apply,save"/>
-      <!-- Calculated -->
-      <parameter name="ha_enabled" type="bool"/>
-      <parameter name="need_new_values" type="bool"/>
-      <parameter name="virt_id1" type="int"/>
-      <parameter name="group_id1" type="int"/>
-      <parameter name="new_values1" type="bool"/>
-      <parameter name="real_server_ids1" type="int[]"/>
-      <parameter name="virt_id2" type="int"/>
-      <parameter name="group_id2" type="int"/>
-      <parameter name="new_values2" type="bool"/>
-      <parameter name="real_server_ids2" type="int[]"/>
-      <parameter name="curr_hm_uuid_array" type="string[]"/>
-      <parameter name="curr_hm_type_array" type="string[]"/>
-      <parameter defaultValue="none" name="none_value" prompt="Constant for none" type="string" values="none"/>
-      <!-- Calculated -->
-    </parameters>
-  </persist>
-  <states>
-    <state name="initialized"/>
-    <state name="baseapplied"/>
-    <state name="removed"/>
-  </states>
-  <actions>
-    <action fromState="none" name="init" toState="initialized">
-      <inputs>
-        <parameters>
-          <parameter name="service"/>
-        </parameters>
-      </inputs>
-      <sequence>
-        <log message="This may take time... making sure that the service is provisioned."/>
-        <script file="wait_for_service.groovy" name="wait_for_service"/>
-        <log message="Service is provisioned."/>
-        <set saveAs="$ha_enabled" value="$service.request.ha"/>
-      </sequence>
-      <onError>
-        <log message="Service is not ready!!"/>
-      </onError>
-    </action>
-    <action fromState="initialized,baseapplied" name="BaseCreate" toState="baseapplied">
-      <inputs>
-        <parameters>
-          <parameter name="vip_address"/>
-          <parameter name="vip_protocol_port"/>
-          <parameter name="vip_protocol"/>
-          <parameter name="vip_connection_limit"/>
-          <parameter name="vip_admin_state_up"/>
-          <parameter name="vip_session_persistence_type"/>
-          <parameter name="vip_session_persistence_cookie_name"/>
-          <parameter name="pool_protocol"/>
-          <parameter name="pool_lb_method"/>
-          <parameter name="pool_admin_state_up"/>
-          <parameter name="member_address_array"/>
-          <parameter name="member_protocol_port_array"/>
-          <parameter name="member_weight_array"/>
-          <parameter name="member_admin_state_up_array"/>
-          <parameter name="hm_uuid_array"/>
-          <parameter name="hm_type_array"/>
-          <parameter name="hm_delay_array"/>
-          <parameter name="hm_timeout_array"/>
-          <parameter name="hm_max_retries_array"/>
-          <parameter name="hm_admin_state_up_array"/>
-          <parameter name="hm_url_path_array"/>
-          <parameter name="hm_http_method_array"/>
-          <parameter name="hm_expected_codes_array"/>
-        </parameters>
-      </inputs>
-      <devices>
-        <device device="$service.primary" name="adc1"/>
-        <device device="$service.secondary" if="$ha_enabled" name="adc2"/>
-      </devices>
-      <!--Handle the first time we run for all services-->
-      <sequence ifState="initialized">
-        <set saveAs="$need_new_values" value="true"/>
-        <set saveAs="$none_value" value="'none'"/>
-        <set saveAs="$real_server_ids1" value="[0]"/>
-        <set saveAs="$real_server_ids2" value="[0]"/>
-        <set saveAs="$curr_hm_uuid_array" value="['none']"/>
-        <set saveAs="$curr_hm_type_array" value="['none']"/>
-      </sequence>
-      <!--Handle the need to allocated indexes if not allocated-->
-      <sequence if="$need_new_values">
-        <configuration file="openstack_init_indexes.vm" name="init_indexes_adc1">
-          <parameterMapping>
-            <map from="$adc1" to="$adc"/>
-            <map from="$vip_address" to="$vip"/>
-            <map from="$vip_protocol_port" to="$virtSvcPort"/>
-            <!--  Outputs -->
-            <map from="$group_id1" to="$groupId"/>
-            <map from="$virt_id1" to="$virtId"/>
-            <map from="$new_values1" to="$newValues"/>
-          </parameterMapping>
-        </configuration>
-        <error if="!$new_values1" message="Service on vip $vip_address and port $vip_protocol_port already exists on device $adc1!"/>
-        <configuration file="openstack_init_indexes.vm" if="$ha_enabled" name="init_indexes_adc2">
-          <parameterMapping>
-            <map from="$adc2" to="$adc"/>
-            <map from="$vip_address" to="$vip"/>
-            <map from="$vip_protocol_port" to="$virtSvcPort"/>
-            <!--  Outputs -->
-            <map from="$group_id2" to="$groupId"/>
-            <map from="$virt_id2" to="$virtId"/>
-            <map from="$new_values2" to="$newValues"/>
-          </parameterMapping>
-        </configuration>
-        <error if="$ha_enabled &amp;&amp; !$new_values2" message="Service on vip $vip_address and port $vip_protocol_port already exists on device $adc2!"/>
-        <set saveAs="$need_new_values" value="false"/>
-      </sequence>
-      <sequence>
-        <configuration file="openstack_manage_l4.vm" name="manage_l4_adc1">
-          <parameterMapping>
-            <map from="$adc1" to="$adc"/>
-            <map from="$group_id1" to="$groupId"/>
-            <map from="$virt_id1" to="$virtId"/>
-            <map from="$vip_admin_state_up" to="$virtServerEnabled"/>
-            <map from="$vip_address" to="$vip"/>
-            <map from="$vip_protocol_port" to="$virtSvcPort"/>
-            <map from="$vip_protocol" to="$virtSvcType"/>
-            <map from="$pool_lb_method" to="$svcPortAlgorithm"/>
-            <map from="$pool_admin_state_up" to="$groupEnabled"/>
-            <map from="$vip_session_persistence_type" to="$virtSvcPersistMethod"/>
-            <map from="$vip_session_persistence_cookie_name" to="$virtSvcCookieName"/>
-          </parameterMapping>
-        </configuration>
-        <configuration file="openstack_manage_l4.vm" if="$ha_enabled" name="manage_l4_adc2">
-          <parameterMapping>
-            <map from="$adc2" to="$adc"/>
-            <map from="$group_id2" to="$groupId"/>
-            <map from="$virt_id2" to="$virtId"/>
-            <map from="$vip_admin_state_up" to="$virtServerEnabled"/>
-            <map from="$vip_address" to="$vip"/>
-            <map from="$vip_protocol_port" to="$virtSvcPort"/>
-            <map from="$vip_protocol" to="$virtSvcType"/>
-            <map from="$pool_lb_method" to="$svcPortAlgorithm"/>
-            <map from="$pool_admin_state_up" to="$groupEnabled"/>
-            <map from="$vip_session_persistence_type" to="$virtSvcPersistMethod"/>
-            <map from="$vip_session_persistence_cookie_name" to="$virtSvcCookieName"/>
-          </parameterMapping>
-        </configuration>
-        <configuration file="openstack_manage_rips.vm" name="manage_rips_adc1">
-          <parameterMapping>
-            <map from="$adc1" to="$adc"/>
-            <map from="$group_id1" to="$groupId"/>
-            <map from="$real_server_ids1" to="$curRealServerIds"/>
-            <map from="$member_address_array" to="$memberIps"/>
-            <map from="$member_weight_array" to="$memberWeights"/>
-            <map from="$member_protocol_port_array" to="$memberPorts"/>
-            <map from="$member_admin_state_up_array" to="$memberAdminStates"/>
-            <!--output parameters-->
-            <map from="$real_server_ids1" to="$realServerIds"/>
-          </parameterMapping>
-        </configuration>
-        <configuration file="openstack_manage_rips.vm" if="$ha_enabled" name="manage_rips_adc2">
-          <parameterMapping>
-            <map from="$adc2" to="$adc"/>
-            <map from="$group_id2" to="$groupId"/>
-            <map from="$real_server_ids2" to="$curRealServerIds"/>
-            <map from="$member_address_array" to="$memberIps"/>
-            <map from="$member_weight_array" to="$memberWeights"/>
-            <map from="$member_protocol_port_array" to="$memberPorts"/>
-            <map from="$member_admin_state_up_array" to="$memberAdminStates"/>
-            <!--output parameters-->
-            <map from="$real_server_ids2" to="$realServerIds"/>
-          </parameterMapping>
-        </configuration>
-        <configuration file="openstack_manage_hcs.vm" name="manage_hcs_adc1">
-          <parameterMapping>
-            <map from="$adc1" to="$adc"/>
-            <map from="$group_id1" to="$group_id"/>
-          </parameterMapping>
-        </configuration>
-        <configuration file="openstack_manage_hcs.vm" if="$ha_enabled"  name="manage_hcs_adc2">
-          <parameterMapping>
-            <map from="$adc2" to="$adc"/>
-            <map from="$group_id2" to="$group_id"/>
-          </parameterMapping>
-        </configuration>
-      </sequence>
-      <!--Now commit to the device-->
-      <sequence>
-        <commit apply="$apply_type != 'none'" save="$apply_type == 'save'"/>
-        <set saveAs="$curr_hm_uuid_array" value="$hm_uuid_array"/>
-        <set saveAs="$curr_hm_type_array" value="$hm_type_array"/>
-      </sequence>
-      <onError>
-        <autoRevert/>
-      </onError>
-    </action>
-    <action name="teardown" toState="removed">
-      <devices>
-        <device device="$service.primary" name="adc1"/>
-        <device device="$service.secondary" if="$ha_enabled" name="adc2"/>
-      </devices>
-      <!--handle when service was defined-->
-      <sequence if="!$need_new_values">
-        <configuration file="openstack_teardown_l4.vm" name="teardown_adc1">
-          <parameterMapping>
-            <map from="$adc1" to="$adc"/>
-            <map from="$virt_id1" to="$virtId"/>
-            <map from="$group_id1" to="$groupId"/>
-            <map from="$real_server_ids1" to="$curRealServerIds"/>
-          </parameterMapping>
-        </configuration>
-        <configuration file="openstack_teardown_l4.vm" if="$ha_enabled" name="teardown_adc2">
-          <parameterMapping>
-            <map from="$adc2" to="$adc"/>
-            <map from="$virt_id2" to="$virtId"/>
-            <map from="$group_id2" to="$groupId"/>
-            <map from="$real_server_ids2" to="$curRealServerIds"/>
-          </parameterMapping>
-        </configuration>
-      </sequence>
-      <!--Now commit to the device-->
-      <sequence>
-        <commit apply="$apply_type != 'none'" save="$apply_type == 'save'"/>
-      </sequence>
-      <onError>
-        <autoRevert/>
-      </onError>
-    </action>
-  </actions>
-</workflow>
diff --git a/neutron/services/loadbalancer/drivers/radware/workflows/readme.txt b/neutron/services/loadbalancer/drivers/radware/workflows/readme.txt
deleted file mode 100644 (file)
index 872c75b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-The Radware LBaaS driver uploads ADC workflows on-demand into vDirect. The ADC Workflows are composed from files which are located underneath this workflows directory.
-The workflows directory is part of the Radware LBaaS driver code included in OpenStack.
-
-Those ADC Workflows are instantiated and run in the vDirect Virtual Machine.
-Radware's OpenStack LBaaS driver, uses vDirect REST API to activate those workflows and CRUD configuration in the Alteon device.
-
-An ADC workflow is composed from:
-1. A mandatory XML file called workflow.xml which defines the different states and the transition flow between states as well as "linking" to the actual code that can be done on each state.
-2. ADC Configuration Template files with extension .vm which are using an extended apache velocity template engine syntax
-3. ADC Configuration Groovy script file with extension .groovy
-
index 81f99537c7d654b3c90053e6a87a4cc42a377df9..a905f1ac112a06e3ba2654735dcf8fe2ab3e4f58 100644 (file)
@@ -49,13 +49,16 @@ def rest_call_function_mock(action, resource, data, headers, binary=False):
 
 def _get_handler(resource):
     if resource == GET_200[2]:
-        data = json.loads('[{"name":"a"},{"name":"b"}]')
+        if rest_call_function_mock.TEMPLATES_MISSING:
+            data = []
+        else:
+            data = [{"name": "openstack_l2_l3"}, {"name": "openstack_l4"}]
         return 200, '', '', data
 
     if resource in GET_200:
         return 200, '', '', ''
     else:
-        data = json.loads('{"complete":"True", "success": "True"}')
+        data = {"complete": "True", "success": "True"}
         return 202, '', '', data
 
 
@@ -97,6 +100,8 @@ class TestLoadBalancerPlugin(TestLoadBalancerPluginBase):
 
         rest_call_function_mock.__dict__.update(
             {'RESPOND_WITH_ERROR': False})
+        rest_call_function_mock.__dict__.update(
+            {'TEMPLATES_MISSING': False})
 
         self.rest_call_mock = mock.Mock(name='rest_call_mock',
                                         side_effect=rest_call_function_mock,
@@ -111,6 +116,32 @@ class TestLoadBalancerPlugin(TestLoadBalancerPluginBase):
         self.addCleanup(radware_driver.completion_handler.join)
         self.addCleanup(mock.patch.stopall)
 
+    def test_create_vip_templates_missing(self):
+        """Test the rest call failure handling by Exception raising."""
+        self.rest_call_mock.reset_mock()
+        with self.subnet() as subnet:
+            with self.pool(provider='radware') as pool:
+                vip_data = {
+                    'name': 'vip1',
+                    'subnet_id': subnet['subnet']['id'],
+                    'pool_id': pool['pool']['id'],
+                    'description': '',
+                    'protocol_port': 80,
+                    'protocol': 'HTTP',
+                    'connection_limit': -1,
+                    'admin_state_up': True,
+                    'status': 'PENDING_CREATE',
+                    'tenant_id': self._tenant_id,
+                    'session_persistence': ''
+                }
+
+                rest_call_function_mock.__dict__.update(
+                    {'TEMPLATES_MISSING': True})
+                #TODO(avishayb) Check that NeutronException is raised
+                self.assertRaises(StandardError,
+                                  self.plugin_instance.create_vip,
+                                  (self.ctx, {'vip': vip_data}))
+
     def test_create_vip_failure(self):
         """Test the rest call failure handling by Exception raising."""
         self.rest_call_mock.reset_mock()
@@ -175,18 +206,18 @@ class TestLoadBalancerPlugin(TestLoadBalancerPluginBase):
 
 
                     mock.call('POST', '/api/workflowTemplate/' +
-                              driver.L4_WORKFLOW_TEMPLATE_NAME +
+                              'openstack_l4' +
                               '?name=' + pool['pool']['id'],
                               mock.ANY,
                               driver.TEMPLATE_HEADER),
                     mock.call('POST', '/api/workflowTemplate/' +
-                              driver.L2_L3_WORKFLOW_TEMPLATE_NAME +
+                              'openstack_l2_l3' +
                               '?name=l2_l3_' + subnet['subnet']['network_id'],
                               mock.ANY,
                               driver.TEMPLATE_HEADER),
 
                     mock.call('POST', '/api/workflow/' + pool['pool']['id'] +
-                              '/action/' + driver.L4_ACTION_NAME,
+                              '/action/BaseCreate',
                               mock.ANY, driver.TEMPLATE_HEADER),
                     mock.call('GET', '/api/workflow/' +
                               pool['pool']['id'], None, None)
@@ -238,7 +269,7 @@ class TestLoadBalancerPlugin(TestLoadBalancerPluginBase):
                 # Test REST calls
                 calls = [
                     mock.call('POST', '/api/workflow/' + pool['pool']['id'] +
-                              '/action/' + driver.L4_ACTION_NAME,
+                              '/action/BaseCreate',
                               mock.ANY, driver.TEMPLATE_HEADER),
                 ]
                 self.rest_call_mock.assert_has_calls(calls, any_order=True)
@@ -306,12 +337,12 @@ class TestLoadBalancerPlugin(TestLoadBalancerPluginBase):
                         calls = [
                             mock.call(
                                 'POST', '/api/workflow/' + p['pool']['id'] +
-                                '/action/' + driver.L4_ACTION_NAME,
+                                '/action/BaseCreate',
                                 mock.ANY, driver.TEMPLATE_HEADER
                             ),
                             mock.call(
                                 'POST', '/api/workflow/' + p['pool']['id'] +
-                                '/action/' + driver.L4_ACTION_NAME,
+                                '/action/BaseCreate',
                                 mock.ANY, driver.TEMPLATE_HEADER
                             )
                         ]
@@ -330,12 +361,12 @@ class TestLoadBalancerPlugin(TestLoadBalancerPluginBase):
                         calls = [
                             mock.call(
                                 'POST', '/api/workflow/' + p['pool']['id'] +
-                                '/action/' + driver.L4_ACTION_NAME,
+                                '/action/BaseCreate',
                                 mock.ANY, driver.TEMPLATE_HEADER
                             ),
                             mock.call(
                                 'POST', '/api/workflow/' + p['pool']['id'] +
-                                '/action/' + driver.L4_ACTION_NAME,
+                                '/action/BaseCreate',
                                 mock.ANY, driver.TEMPLATE_HEADER
                             )
                         ]
@@ -379,12 +410,12 @@ class TestLoadBalancerPlugin(TestLoadBalancerPluginBase):
                         calls = [
                             mock.call(
                                 'POST', '/api/workflow/' + p['pool']['id'] +
-                                '/action/' + driver.L4_ACTION_NAME,
+                                '/action/BaseCreate',
                                 mock.ANY, driver.TEMPLATE_HEADER
                             ),
                             mock.call(
                                 'POST', '/api/workflow/' + p['pool']['id'] +
-                                '/action/' + driver.L4_ACTION_NAME,
+                                '/action/BaseCreate',
                                 mock.ANY, driver.TEMPLATE_HEADER
                             )
                         ]