author | Danek Duvall <danek.duvall@oracle.com> |
Tue, 07 Apr 2015 13:31:20 -0700 | |
branch | s11-update |
changeset 4072 | db0cec748ec0 |
parent 3178 | 77584387a894 |
child 5405 | 66fd59fecd68 |
permissions | -rw-r--r-- |
4072
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
1 |
*** neutron-2014.2.2/neutron/agent/l3_agent.py 2015-02-05 07:45:33.000000000 -0800 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
2 |
--- NEW/neutron/agent/l3_agent.py 2015-02-06 11:10:53.164349168 -0800 |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
3 |
*************** |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
4 |
*** 1,5 **** |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
5 |
--- 1,7 ---- |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
6 |
# Copyright 2012 VMware, Inc. All rights reserved. |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
7 |
# |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
8 |
+ # Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
9 |
+ # |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
10 |
# Licensed under the Apache License, Version 2.0 (the "License"); you may |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
11 |
# not use this file except in compliance with the License. You may obtain |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
12 |
# a copy of the License at |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
13 |
*************** |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
14 |
*** 13,18 **** |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
15 |
--- 15,21 ---- |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
16 |
# under the License. |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
17 |
# |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
18 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
19 |
+ import platform |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
20 |
import sys |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
21 |
|
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
22 |
import datetime |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
23 |
*************** |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
24 |
*** 33,38 **** |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
25 |
--- 36,42 ---- |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
26 |
from neutron.agent.linux import iptables_manager |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
27 |
from neutron.agent.linux import ra |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
28 |
from neutron.agent import rpc as agent_rpc |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
29 |
+ from neutron.agent.solaris import ipfilters_manager |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
30 |
from neutron.common import config as common_config |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
31 |
from neutron.common import constants as l3_constants |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
32 |
from neutron.common import ipv6_utils |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
33 |
*************** |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
34 |
*** 257,266 **** |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
35 |
# Invoke the setter for establishing initial SNAT action |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
36 |
self.router = router |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
37 |
self.ns_name = NS_PREFIX + router_id if use_namespaces else None |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
38 |
! self.iptables_manager = iptables_manager.IptablesManager( |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
39 |
! root_helper=root_helper, |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
40 |
! use_ipv6=use_ipv6, |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
41 |
! namespace=self.ns_name) |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
42 |
self.snat_iptables_manager = None |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
43 |
self.routes = [] |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
44 |
# DVR Data |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
45 |
--- 261,274 ---- |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
46 |
# Invoke the setter for establishing initial SNAT action |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
47 |
self.router = router |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
48 |
self.ns_name = NS_PREFIX + router_id if use_namespaces else None |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
49 |
! if platform.system() == "SunOS": |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
50 |
! self.ipfilters_manager = ipfilters_manager.IPfiltersManager() |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
51 |
! self.iptables_manager = None |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
52 |
! else: |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
53 |
! self.iptables_manager = iptables_manager.IptablesManager( |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
54 |
! root_helper=root_helper, |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
55 |
! use_ipv6=use_ipv6, |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
56 |
! namespace=self.ns_name) |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
57 |
self.snat_iptables_manager = None |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
58 |
self.routes = [] |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
59 |
# DVR Data |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
60 |
*************** |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
61 |
*** 2049,2054 **** |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
62 |
--- 2057,2064 ---- |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
63 |
_register_opts(cfg.CONF) |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
64 |
common_config.init(sys.argv[1:]) |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
65 |
config.setup_logging() |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
66 |
+ if platform.system() == "SunOS": |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
67 |
+ manager = 'neutron.agent.evs_l3_agent.EVSL3NATAgent' |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
68 |
server = neutron_service.Service.create( |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
69 |
binary='neutron-l3-agent', |
db0cec748ec0
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3178
diff
changeset
|
70 |
topic=topics.L3_AGENT, |