Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Kilo #935

Open
wants to merge 2 commits into
base: support-kilo
Choose a base branch
from

Conversation

zhaoqin-github
Copy link
Collaborator

@zhaoqin-github zhaoqin-github commented Oct 31, 2018

What issues does this address?

What's this change do?

Archive the code made by SE to support Kilo. Those change will not merged into release branch.

Where should the reviewer start?

Any background context?

@zhaoqin-github
Copy link
Collaborator Author

Two unclear changes. Need to get confirmation from SE.

diff --git a/f5lbaasdriver/v2/bigip/driver_v2.py b/f5lbaasdriver/v2/bigip/driver_v2.py
index f618455..94ce4bd 100644
--- a/f5lbaasdriver/v2/bigip/driver_v2.py
+++ b/f5lbaasdriver/v2/bigip/driver_v2.py

@@ -99,6 +100,7 @@ class F5DriverV2(object):
 
         self.agent_rpc = agent_rpc.LBaaSv2AgentRPC(self)
         self.plugin_rpc = plugin_rpc.LBaaSv2PluginCallbacksRPC(self)
+        self.plugin_rpc.create_rpc_listener()
 
         self.q_client = \
             neutron_client.F5NetworksNeutronClient(self.plugin)
@@ -120,7 +122,7 @@ class F5DriverV2(object):
             LOG.debug("F5DriverV2 with env %s received post neutron child "
                       "fork notification pid(%d) print trigger(%s)" % (
                           self.env, os.getpid(), trigger))
-            self.plugin_rpc.create_rpc_listener()
+            # self.plugin_rpc.create_rpc_listener()
 
         post_fork_callback.__name__ += '_' + str(self.env)
         return post_fork_callback
diff --git a/f5lbaasdriver/v2/bigip/service_builder.py b/f5lbaasdriver/v2/bigip/service_builder.py
index caeee22..f15b5b8 100644
--- a/f5lbaasdriver/v2/bigip/service_builder.py
+++ b/f5lbaasdriver/v2/bigip/service_builder.py
@@ -93,8 +93,10 @@ class LBaaSv2ServiceBuilder(object):
             # if we are running in disconnected service mode
             agent_config = self.deserialize_agent_configurations(
                 agent['configurations'])
+            # segment_data = self.disconnected_service.get_segment_id(
+            #     context, service['loadbalancer']['vip_port_id'], agent_hosts)
             segment_data = self.disconnected_service.get_segment_id(
-                context, service['loadbalancer']['vip_port_id'], agent_hosts)
+                context.session, service['loadbalancer']['vip_port_id'], agent_hosts)
             if segment_data:
                 network['provider:segmentation_id'] = \
                     segment_data.get('segmentation_id', None)
@@ -234,7 +236,7 @@ class LBaaSv2ServiceBuilder(object):
             if port:
                 port_id = port[0]['id']
                 segment_data = self.disconnected_service.get_segment_id(
-                    context, port_id, agent_hosts)
+                    context.session, port_id, agent_hosts)
                 LOG.debug('member segment data: %s' % segment_data)
                 if segment_data:
                     network['provider:segmentation_id'] = \

@zhaoqin-github zhaoqin-github force-pushed the support-cmcc-kilo branch 16 times, most recently from f30afe3 to c3b0ffb Compare November 5, 2018 02:05
@zhang-shengping zhang-shengping changed the title Support CMCC Kilo Support Kilo Feb 7, 2021
Base automatically changed from cmcc-kilo to support-kilo February 8, 2021 09:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant