From ef3c8ac931cf1feb41cc5f5afdcc7b9dc5e23054 Mon Sep 17 00:00:00 2001 From: Ignatious Johnson Christopher Date: Wed, 10 Aug 2016 17:11:58 -0700 Subject: [PATCH] Using dpkg-query and rpm query command to check if the package is installed. Adding use_ssl options to all ulitily scripts that uses VncApi library Change-Id: Ide788ca55cc79c17a01570e9788f66282552134b Closes-Bug: 1611986 Closes-Bug: 1547965 --- src/config/utils/add_route_target.py | 7 ++++++- src/config/utils/contrail-config.py | 3 ++- src/config/utils/contrail-status.py | 10 +++++++--- src/config/utils/contrail_veth_port.py | 8 +++++++- src/config/utils/create_floating_pool.py | 6 +++++- src/config/utils/del_route_target.py | 7 ++++++- src/config/utils/encap.py | 2 +- src/config/utils/net_policy_join.py | 3 +++ src/config/utils/provision.py | 7 ++++++- src/config/utils/provision_analytics_node.py | 7 ++++++- src/config/utils/provision_bgp.py | 7 +++++-- src/config/utils/provision_config_node.py | 7 ++++++- src/config/utils/provision_control.py | 10 ++++++++-- src/config/utils/provision_database_node.py | 7 ++++++- src/config/utils/provision_encap.py | 7 ++++++- src/config/utils/provision_forwarding_mode.py | 4 +++- src/config/utils/provision_linklocal.py | 7 ++++++- src/config/utils/provision_mx.py | 7 ++++++- src/config/utils/provision_physical_device.py | 5 +++++ src/config/utils/provision_static_route.py | 7 ++++++- src/config/utils/service-instance.py | 4 +++- src/config/utils/service-policy.py | 4 +++- src/config/utils/service-template.py | 4 +++- src/config/utils/use_floating_pool.py | 5 ++++- 24 files changed, 119 insertions(+), 26 deletions(-) diff --git a/src/config/utils/add_route_target.py b/src/config/utils/add_route_target.py index 404ada9b2fd..81dfec545d8 100755 --- a/src/config/utils/add_route_target.py +++ b/src/config/utils/add_route_target.py @@ -21,7 +21,8 @@ def __init__(self, args_str=None): bp_obj = BgpProvisioner( self._args.admin_user, self._args.admin_password, self._args.admin_tenant_name, - self._args.api_server_ip, self._args.api_server_port) + self._args.api_server_ip, self._args.api_server_port, + self._args.api_server_use_ssl) bp_obj.add_route_target(self._args.routing_instance_name.split(':'), self._args.router_asn, self._args.route_target_number) @@ -33,6 +34,7 @@ def _parse_args(self, args_str): --router_asn 64512 --api_server_ip 127.0.0.1 --api_server_port 8082 + --api_server_use_ssl False ''' # Source any specified config/ini file @@ -50,6 +52,7 @@ def _parse_args(self, args_str): 'router_asn': '64513', 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, 'admin_user': None, 'admin_password': None, 'admin_tenant_name': None @@ -82,6 +85,8 @@ def _parse_args(self, args_str): parser.add_argument( "--api_server_ip", help="IP address of api server",required=True) parser.add_argument("--api_server_port", help="Port of api server",required=True) + parser.add_argument("--api_server_use_ssl", + help="Use SSL to connect with API server") parser.add_argument( "--admin_user", help="Name of keystone admin user",required=True) parser.add_argument( diff --git a/src/config/utils/contrail-config.py b/src/config/utils/contrail-config.py index d37571d4769..aa3a3aba080 100644 --- a/src/config/utils/contrail-config.py +++ b/src/config/utils/contrail-config.py @@ -31,7 +31,8 @@ def __init__(self, args_str=None): # connect to vnc server self._vnc_lib = VncApi('u', 'p', api_server_host=self._args.listen_ip_addr, - api_server_port=self._args.listen_port) + api_server_port=self._args.listen_port, + api_server_use_ssl=self._args.api_server_use_ssl) self.re_parser = re.compile('[ \t\n]+') self.final_list = [] diff --git a/src/config/utils/contrail-status.py b/src/config/utils/contrail-status.py index 3d7ceae439f..8f6d960e880 100755 --- a/src/config/utils/contrail-status.py +++ b/src/config/utils/contrail-status.py @@ -380,11 +380,15 @@ def supervisor_status(nodetype, options): def package_installed(pkg): if distribution == 'debian': - cmd = "dpkg -l " + pkg + cmd = "dpkg-query -W -f=${VERSION} " + pkg else: - cmd = "rpm -q " + pkg + cmd = "rpm -q --qf %{V} " + pkg with open(os.devnull, "w") as fnull: - return (not subprocess.call(cmd.split(), stdout=fnull, stderr=fnull)) + try: + out = subprocess.check_output(cmd.split(), stderr=fnull) + return True if out else False + except subprocess.CalledProcessError: + return False def main(): parser = OptionParser() diff --git a/src/config/utils/contrail_veth_port.py b/src/config/utils/contrail_veth_port.py index 589b444d8dc..fb36f44d7f7 100755 --- a/src/config/utils/contrail_veth_port.py +++ b/src/config/utils/contrail_veth_port.py @@ -133,6 +133,11 @@ def argparser(cls): default=os.environ.get('CONTRAIL_API_PORT', '8082'), help=("API server port." + " Default: CONTRAIL_API_PORT from env or 8082")) + parser.add_argument( + "--api-server-use-ssl", + default=os.environ.get('CONTRAIL_API_SERVER_USE_SSL', False), + help=("API server use ssl." + + " Default: CONTRAIL_API_SERVER_USE_SSL from env or False")) parser.add_argument( "--project", default=os.environ.get('CONTRAIL_PROJECT', @@ -168,7 +173,8 @@ def vnc_connect(self): if not self.vnc_client: self.vnc_client = vnc_api.VncApi( api_server_host=self.args['api_server'], - api_server_port=self.args['api_port']) + api_server_port=self.args['api_port'], + api_server_use_ssl=self.args['api_server_use_ssl']) return self.vnc_client def create(self): diff --git a/src/config/utils/create_floating_pool.py b/src/config/utils/create_floating_pool.py index 5aa1d7bd219..804fa8d735d 100644 --- a/src/config/utils/create_floating_pool.py +++ b/src/config/utils/create_floating_pool.py @@ -30,7 +30,8 @@ def __init__(self, args_str=None): self._args.admin_password, self._args.admin_tenant_name, self._args.api_server_ip, - self._args.api_server_port, '/') + self._args.api_server_port, '/', + api_server_use_ssl=self._args.api_server_use_ssl) vnc_lib = self._vnc_lib fq_name = self._args.public_vn_name.split(':') @@ -53,6 +54,7 @@ def _parse_args(self, args_str): --floating_ip_pool_name fip_pool --api_server_ip 127.0.0.1 --api_server_port 8082 + --api_server_use_ssl False ''' # Source any specified config/ini file @@ -103,6 +105,8 @@ def _parse_args(self, args_str): parser.add_argument( "--api_server_ip", help="IP address of api server", required=True) parser.add_argument("--api_server_port", help="Port of api server", required=True) + parser.add_argument("--api_server_use_ssl", + help="Use SSL to connect with API server") parser.add_argument( "--admin_user", help="Name of keystone admin user", required=True) parser.add_argument( diff --git a/src/config/utils/del_route_target.py b/src/config/utils/del_route_target.py index ff5d26591a3..7d0038076a2 100755 --- a/src/config/utils/del_route_target.py +++ b/src/config/utils/del_route_target.py @@ -21,7 +21,8 @@ def __init__(self, args_str=None): bp_obj = BgpProvisioner( self._args.admin_user, self._args.admin_password, self._args.admin_tenant_name, - self._args.api_server_ip, self._args.api_server_port) + self._args.api_server_ip, self._args.api_server_port, + self._args.api_server_use_ssl) bp_obj.del_route_target(self._args.routing_instance_name.split(':'), self._args.router_asn, self._args.route_target_number) @@ -33,6 +34,7 @@ def _parse_args(self, args_str): --router_asn 64512 --api_server_ip 127.0.0.1 --api_server_port 8082 + --api_server_use_ssl False ''' # Source any specified config/ini file @@ -50,6 +52,7 @@ def _parse_args(self, args_str): 'router_asn': '64513', 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, 'admin_user': None, 'admin_password': None, 'admin_tenant_name': None @@ -81,6 +84,8 @@ def _parse_args(self, args_str): parser.add_argument( "--api_server_ip", help="IP address of api server", required=True) parser.add_argument("--api_server_port", help="Port of api server", required=True) + parser.add_argument("--api_server_use_ssl", + help="Use SSL to connect with API server") parser.add_argument( "--admin_user", help="Name of keystone admin user", required=True) parser.add_argument( diff --git a/src/config/utils/encap.py b/src/config/utils/encap.py index ba3ce13f922..c25b3506b59 100644 --- a/src/config/utils/encap.py +++ b/src/config/utils/encap.py @@ -7,7 +7,7 @@ sys.exit(0) if __name__ == "__main__": - handle= VncApi(username=sys.argv[2], password= sys.argv[3], tenant_name=sys.argv[4], api_server_host= sys.argv[5], api_server_port= '8082') + handle= VncApi(username=sys.argv[2], password= sys.argv[3], tenant_name=sys.argv[4], api_server_host= sys.argv[5], api_server_port= '8082', api_server_use_ssl=sys.argv[6]) encap_obj=EncapsulationPrioritiesType(encapsulation=['MPLSoGRE','MPLSoUDP','VXLAN']) conf_obj=GlobalVrouterConfig(encapsulation_priorities=encap_obj, evpn_status='true') #conf_obj=GlobalVrouterConfig(encapsulation_priorities=encap_obj,vxlan_network_identifier_mode='automatic') diff --git a/src/config/utils/net_policy_join.py b/src/config/utils/net_policy_join.py index 1ce1e78841e..31458c59121 100755 --- a/src/config/utils/net_policy_join.py +++ b/src/config/utils/net_policy_join.py @@ -54,6 +54,8 @@ parser.add_argument( "--api_port", default=8082, help="Port of api server") +parser.add_argument("--api_server_use_ssl", default=False, + help="Use SSL to connect with API server") parser.add_argument("net1_uuid", help="UUIDs of subnets to join") parser.add_argument("net2_uuid") parser.set_defaults(**arg_defaults) @@ -65,6 +67,7 @@ vnc_lib = vnc_api.VncApi(api_server_host=args.api_host, api_server_port=args.api_port, + api_server_use_ssl=args.api_server_use_ssl, tenant_name=args.auth_tenant, username=args.auth_user, password=args.auth_password, diff --git a/src/config/utils/provision.py b/src/config/utils/provision.py index 80ad4d4d228..00b3316ed20 100644 --- a/src/config/utils/provision.py +++ b/src/config/utils/provision.py @@ -40,7 +40,8 @@ def __init__(self, args_str=None): self._args.admin_password, self._args.admin_tenant_name, self._args.api_server_ip, - self._args.api_server_port, '/') + self._args.api_server_port, '/', + api_server_use_ssl=self._args.api_server_use_ssl) vnc_lib = self._vnc_lib gsc_obj = vnc_lib.global_system_config_read( @@ -117,6 +118,7 @@ def _parse_args(self, args_str): Eg. python provision.py --prov_data_file provision.json --api_server_ip 127.0.0.1 --api_server_port 8082 + --api_server_use_ssl False ''' # Source any specified config/ini file @@ -131,6 +133,7 @@ def _parse_args(self, args_str): 'prov_data_file': 'provision.json', 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, } ksopts = { 'admin_user': 'user1', @@ -163,6 +166,8 @@ def _parse_args(self, args_str): parser.add_argument( "--api_server_ip", help="IP address of api server") parser.add_argument("--api_server_port", help="Port of api server") + parser.add_argument("--api_server_use_ssl", + help="Use SSL to connect with API server") parser.add_argument( "--admin_user", help="Name of keystone admin user") parser.add_argument( diff --git a/src/config/utils/provision_analytics_node.py b/src/config/utils/provision_analytics_node.py index 458da2d45c9..b9af0ceda63 100755 --- a/src/config/utils/provision_analytics_node.py +++ b/src/config/utils/provision_analytics_node.py @@ -29,7 +29,8 @@ def __init__(self, args_str=None): self._args.admin_tenant_name, self._args.api_server_ip, self._args.api_server_port, '/', - auth_host=self._args.openstack_ip) + auth_host=self._args.openstack_ip, + api_server_use_ssl=self._args.api_server_use_ssl) connected = True except ResourceExhaustionError: # haproxy throws 503 if tries < 10: @@ -58,6 +59,7 @@ def _parse_args(self, args_str): --host_ip 10.1.1.1 --api_server_ip 127.0.0.1 --api_server_port 8082 + --api_server_use_ssl False --oper ''' @@ -72,6 +74,7 @@ def _parse_args(self, args_str): defaults = { 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, 'oper': 'add', } ksopts = { @@ -106,6 +109,8 @@ def _parse_args(self, args_str): parser.add_argument( "--api_server_ip", help="IP address of api server", required=True) parser.add_argument("--api_server_port", help="Port of api server") + parser.add_argument("--api_server_use_ssl", + help="Use SSL to connect with API server") parser.add_argument( "--oper", default='add', help="Provision operation to be done(add or del)") diff --git a/src/config/utils/provision_bgp.py b/src/config/utils/provision_bgp.py index 307076f96ce..388b6a0f44a 100644 --- a/src/config/utils/provision_bgp.py +++ b/src/config/utils/provision_bgp.py @@ -18,16 +18,19 @@ def get_ip(ip_w_pfx): class BgpProvisioner(object): - def __init__(self, user, password, tenant, api_server_ip, api_server_port): + def __init__(self, user, password, tenant, api_server_ip, api_server_port, + api_server_use_ssl=False): self._admin_user = user self._admin_password = password self._admin_tenant_name = tenant self._api_server_ip = api_server_ip self._api_server_port = api_server_port + self._api_server_use_ssl = api_server_use_ssl self._vnc_lib = VncApi( self._admin_user, self._admin_password, self._admin_tenant_name, self._api_server_ip, - self._api_server_port, '/') + self._api_server_port, '/', + api_server_use_ssl=self._api_server_use_ssl) # end __init__ def _get_rt_inst_obj(self): diff --git a/src/config/utils/provision_config_node.py b/src/config/utils/provision_config_node.py index 5c2c4539acb..d660522bff7 100755 --- a/src/config/utils/provision_config_node.py +++ b/src/config/utils/provision_config_node.py @@ -29,7 +29,8 @@ def __init__(self, args_str=None): self._args.admin_tenant_name, self._args.api_server_ip, self._args.api_server_port, '/', - auth_host=self._args.openstack_ip) + auth_host=self._args.openstack_ip, + api_server_use_ssl=self._args.api_server_use_ssl) connected = True except ResourceExhaustionError: # haproxy throws 503 if tries < 10: @@ -58,6 +59,7 @@ def _parse_args(self, args_str): --host_ip 10.1.1.1 --api_server_ip 127.0.0.1 --api_server_port 8082 + --api_server_use_ssl False --oper ''' @@ -72,6 +74,7 @@ def _parse_args(self, args_str): defaults = { 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, 'oper': 'add', } ksopts = { @@ -106,6 +109,8 @@ def _parse_args(self, args_str): parser.add_argument( "--api_server_ip", help="IP address of api server", required=True) parser.add_argument("--api_server_port", help="Port of api server") + parser.add_argument("--api_server_use_ssl", + help="Use SSL to connect with API server") parser.add_argument( "--oper", default='add', help="Provision operation to be done(add or del)") diff --git a/src/config/utils/provision_control.py b/src/config/utils/provision_control.py index 62ec9fc5fb8..c9d61b3e651 100755 --- a/src/config/utils/provision_control.py +++ b/src/config/utils/provision_control.py @@ -22,7 +22,8 @@ def __init__(self, args_str=None): self._vnc_lib = VncApi( self._args.admin_user, self._args.admin_password, self._args.admin_tenant_name, self._args.api_server_ip, - self._args.api_server_port, '/') + self._args.api_server_port, '/', + api_server_use_ssl=self._args.api_server_use_ssl) # Update global system config also with this ASN gsc_obj = self._vnc_lib.global_system_config_read( @@ -55,7 +56,8 @@ def __init__(self, args_str=None): bp_obj = BgpProvisioner( self._args.admin_user, self._args.admin_password, self._args.admin_tenant_name, - self._args.api_server_ip, self._args.api_server_port) + self._args.api_server_ip, self._args.api_server_port, + api_server_use_ssl=self._args.api_server_use_ssl) if self._args.oper == 'add': bp_obj.add_bgp_router('control-node', self._args.host_name, self._args.host_ip, self._args.router_asn, @@ -94,6 +96,7 @@ def _parse_args(self, args_str): --ibgp_auto_mesh|--no_ibgp_auto_mesh --api_server_ip 127.0.0.1 --api_server_port 8082 + --api_server_use_ssl False --oper --md5 |None(optional) --graceful-restart-time 100 @@ -115,6 +118,7 @@ def _parse_args(self, args_str): 'ibgp_auto_mesh': None, 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, 'oper': None, 'admin_user': None, 'admin_password': None, @@ -160,6 +164,8 @@ def _parse_args(self, args_str): parser.add_argument( "--api_server_ip", help="IP address of api server", required=True) parser.add_argument("--api_server_port", help="Port of api server", required=True) + parser.add_argument("--api_server_use_ssl", + help="Use SSL to connect with API server") parser.add_argument( "--oper", help="Provision operation to be done(add or del)") diff --git a/src/config/utils/provision_database_node.py b/src/config/utils/provision_database_node.py index 7455d805064..c6c3f508f47 100755 --- a/src/config/utils/provision_database_node.py +++ b/src/config/utils/provision_database_node.py @@ -29,7 +29,8 @@ def __init__(self, args_str=None): self._args.admin_tenant_name, self._args.api_server_ip, self._args.api_server_port, '/', - auth_host=self._args.openstack_ip) + auth_host=self._args.openstack_ip, + api_server_use_ssl=self._args.api_server_use_ssl) connected = True except ResourceExhaustionError: # haproxy throws 503 if tries < 10: @@ -58,6 +59,7 @@ def _parse_args(self, args_str): --host_ip 10.1.1.1 --api_server_ip 127.0.0.1 --api_server_port 8082 + --api_server_use_ssl False --oper ''' @@ -72,6 +74,7 @@ def _parse_args(self, args_str): defaults = { 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, 'oper': 'add', } ksopts = { @@ -106,6 +109,8 @@ def _parse_args(self, args_str): parser.add_argument( "--api_server_ip", help="IP address of api server", required=True) parser.add_argument("--api_server_port", help="Port of api server") + parser.add_argument("--api_server_use_ssl", + help="Use SSL to connect with API server") parser.add_argument( "--oper", default='add', help="Provision operation to be done(add or del)") diff --git a/src/config/utils/provision_encap.py b/src/config/utils/provision_encap.py index 1ef99e31284..6bab1638dda 100755 --- a/src/config/utils/provision_encap.py +++ b/src/config/utils/provision_encap.py @@ -21,7 +21,8 @@ def __init__(self, args_str=None): self._args.admin_user, self._args.admin_password, self._args.admin_tenant_name, self._args.api_server_ip, - self._args.api_server_port, '/') + self._args.api_server_port, '/', + api_server_use_ssl=self._args.api_server_use_ssl) encap_obj=EncapsulationPrioritiesType(encapsulation=self._args.encap_priority.split(",")) try: current_config=self._vnc_lib.global_vrouter_config_read( @@ -55,6 +56,7 @@ def _parse_args(self, args_str): Eg. python provision_encap.py --api_server_ip 127.0.0.1 --api_server_port 8082 + --api_server_use_ssl False --encap_priority "MPLSoUDP,MPLSoGRE,VXLAN" --vxlan_vn_id_mode "automatic" --oper @@ -71,6 +73,7 @@ def _parse_args(self, args_str): defaults = { 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, 'oper': 'add', 'encap_priority': 'MPLSoUDP,MPLSoGRE,VXLAN', 'vxlan_vn_id_mode' : 'automatic' @@ -104,6 +107,8 @@ def _parse_args(self, args_str): parser.add_argument( "--api_server_ip", help="IP address of api server") parser.add_argument("--api_server_port", help="Port of api server") + parser.add_argument("--api_server_use_ssl", + help="Use SSL to connect with API server") parser.add_argument( "--encap_priority", help="List of Encapsulation priority", required=True) parser.add_argument( diff --git a/src/config/utils/provision_forwarding_mode.py b/src/config/utils/provision_forwarding_mode.py index c948a89aa8a..2aa82c96841 100644 --- a/src/config/utils/provision_forwarding_mode.py +++ b/src/config/utils/provision_forwarding_mode.py @@ -21,7 +21,8 @@ def __init__(self, args_str=None): self._args.admin_user, self._args.admin_password, self._args.admin_tenant_name, self._args.api_server_ip, - self._args.api_server_port, '/') + self._args.api_server_port, '/', + api_server_use_ssl=self._args.api_server_use_ssl) #import pdb;pdb.set_trace() vxlan_id = self._args.vxlan_id @@ -75,6 +76,7 @@ def _parse_args(self, args_str): defaults = { 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, 'oper': 'add', 'control_names': [], 'route_table_name': 'CustomRouteTable', diff --git a/src/config/utils/provision_linklocal.py b/src/config/utils/provision_linklocal.py index 416bf071639..6a3ec98078e 100755 --- a/src/config/utils/provision_linklocal.py +++ b/src/config/utils/provision_linklocal.py @@ -21,7 +21,8 @@ def __init__(self, args_str=None): self._args.admin_user, self._args.admin_password, self._args.admin_tenant_name, self._args.api_server_ip, - self._args.api_server_port, '/') + self._args.api_server_port, '/', + api_server_use_ssl=self._args.api_server_use_ssl) linklocal_obj=LinklocalServiceEntryType( linklocal_service_name=self._args.linklocal_service_name, @@ -76,6 +77,7 @@ def _parse_args(self, args_str): Eg. python provision_metadata.py --api_server_ip 127.0.0.1 --api_server_port 8082 + --api_server_use_ssl False --linklocal_service_name name --linklocal_service_ip 1.2.3.4 --linklocal_service_port 1234 @@ -96,6 +98,7 @@ def _parse_args(self, args_str): defaults = { 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, 'linklocal_service_name': '', 'linklocal_service_ip': '', 'linklocal_service_port': 0, @@ -133,6 +136,8 @@ def _parse_args(self, args_str): parser.add_argument( "--api_server_ip", help="IP address of api server") parser.add_argument("--api_server_port", help="Port of api server") + parser.add_argument("--api_server_use_ssl", + help="Use SSL to connect with API server") parser.add_argument( "--linklocal_service_name", help="Service Name") parser.add_argument( diff --git a/src/config/utils/provision_mx.py b/src/config/utils/provision_mx.py index 14cfdf483c0..9e582b9c4c2 100755 --- a/src/config/utils/provision_mx.py +++ b/src/config/utils/provision_mx.py @@ -21,7 +21,8 @@ def __init__(self, args_str=None): bp_obj = BgpProvisioner( self._args.admin_user, self._args.admin_password, self._args.admin_tenant_name, - self._args.api_server_ip, self._args.api_server_port) + self._args.api_server_ip, self._args.api_server_port, + self._args.api_server_use_ssl) if self._args.oper == 'add': bp_obj.add_bgp_router('router', self._args.router_name, @@ -42,6 +43,7 @@ def _parse_args(self, args_str): --router_asn 64512 --api_server_ip 127.0.0.1 --api_server_port 8082 + --api_server_use_ssl False --oper ''' @@ -57,6 +59,7 @@ def _parse_args(self, args_str): 'router_asn': '64512', 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, 'oper': 'add', 'admin_user': None, 'admin_password': None, @@ -90,6 +93,8 @@ def _parse_args(self, args_str): parser.add_argument( "--api_server_ip", help="IP address of api server") parser.add_argument("--api_server_port", help="Port of api server") + parser.add_argument("--api_server_use_ssl", + help="Use SSL to connect with API server") parser.add_argument( "--oper", default='add', help="Provision operation to be done(add or del)") diff --git a/src/config/utils/provision_physical_device.py b/src/config/utils/provision_physical_device.py index 727c5b442e0..5eed2a3c06e 100755 --- a/src/config/utils/provision_physical_device.py +++ b/src/config/utils/provision_physical_device.py @@ -28,6 +28,7 @@ def __init__(self, args_str=None): self._args.admin_tenant_name, self._args.api_server_ip, self._args.api_server_port, '/', + api_server_use_ssl=self._args.api_server_use_ssl, auth_host=self._args.openstack_ip) connected = True except ResourceExhaustionError: # haproxy throws 503 @@ -58,6 +59,7 @@ def _parse_args(self, args_str): --device_tsn nodec45 --api_server_ip 10.204.221.33 --api_server_port 8082 + --api_server_use_ssl False --oper --admin_user admin --admin_password contrail123 @@ -79,6 +81,7 @@ def _parse_args(self, args_str): defaults = { 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, 'oper': 'add', } ksopts = { @@ -131,6 +134,8 @@ def _parse_args(self, args_str): "--api_server_ip", help="IP address of api server", required=True) parser.add_argument( "--api_server_port", help="Port of api server") + parser.add_argument("--api_server_use_ssl", + help="Use SSL to connect with API server") parser.add_argument( "--openstack_ip", help="Openstack node ip") parser.add_argument( diff --git a/src/config/utils/provision_static_route.py b/src/config/utils/provision_static_route.py index b1340c2f43e..6cabbe0cca5 100644 --- a/src/config/utils/provision_static_route.py +++ b/src/config/utils/provision_static_route.py @@ -27,7 +27,8 @@ def __init__(self, args_str=None): self._args.user, self._args.password, self._args.tenant_name, self._args.api_server_ip, - self._args.api_server_port, '/') + self._args.api_server_port, '/', + api_server_use_ssl=self._args.api_server_use_ssl) prefix = self._args.prefix vmi_id_got = self._args.virtual_machine_interface_id @@ -123,6 +124,7 @@ def _parse_args(self, args_str): Eg. python provision_static_route.py --api_server_ip 127.0.0.1 --api_server_port 8082 + --api_server_use_ssl False --prefix 2.2.2.0/24 --virtual_machine_interface_id 242717c9-8e78-4c67-94a8-5fbef1f2f096 --route_table_name "MyRouteTable" @@ -141,6 +143,7 @@ def _parse_args(self, args_str): defaults = { 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, 'oper': 'add', 'control_names': [], 'route_table_name': 'CustomRouteTable', @@ -176,6 +179,8 @@ def _parse_args(self, args_str): parser.add_argument( "--api_server_ip", help="IP address of api server") parser.add_argument("--api_server_port", help="Port of api server") + parser.add_argument("--api_server_use_ssl", + help="Use SSL to connect with API server") parser.add_argument( "--oper", default='add', help="Provision operation to be done(add or del)") diff --git a/src/config/utils/service-instance.py b/src/config/utils/service-instance.py index bfc15924aea..2a0c3a136a1 100755 --- a/src/config/utils/service-instance.py +++ b/src/config/utils/service-instance.py @@ -52,7 +52,8 @@ def __init__(self, args_str=None): self._novaclient_init() self._vnc_lib = VncApi('u', 'p', api_server_host=self._args.api_server_ip, - api_server_port=self._args.api_server_port) + api_server_port=self._args.api_server_port, + api_server_use_ssl=self._args.api_server_use_ssl) # end __init__ def _parse_args(self, args_str): @@ -74,6 +75,7 @@ def _parse_args(self, args_str): 'right_vn': None, 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, } if not args.conf_file: diff --git a/src/config/utils/service-policy.py b/src/config/utils/service-policy.py index 2e3d6dc6976..a65df609c1d 100755 --- a/src/config/utils/service-policy.py +++ b/src/config/utils/service-policy.py @@ -39,7 +39,8 @@ def __init__(self, args_str=None): self._vnc_lib = VncApi('u', 'p', api_server_host=self._args.api_server_ip, - api_server_port=self._args.api_server_port) + api_server_port=self._args.api_server_port, + api_server_use_ssl=self._args.api_server_use_ssl) # end __init__ def _parse_args(self, args_str): @@ -58,6 +59,7 @@ def _parse_args(self, args_str): 'vn_list': None, 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl_': False, } if not args.conf_file: diff --git a/src/config/utils/service-template.py b/src/config/utils/service-template.py index 3ba39da21e9..93e4a978686 100755 --- a/src/config/utils/service-template.py +++ b/src/config/utils/service-template.py @@ -40,7 +40,8 @@ def __init__(self, args_str=None): self._vnc_lib = VncApi('u', 'p', api_server_host=self._args.api_server_ip, - api_server_port=self._args.api_server_port) + api_server_port=self._args.api_server_port, + api_server_use_ssl=self._args.api_server_use_ssl) # end __init__ def _parse_args(self, args_str): @@ -60,6 +61,7 @@ def _parse_args(self, args_str): 'svc_type': 'firewall', 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, } if not args.conf_file: diff --git a/src/config/utils/use_floating_pool.py b/src/config/utils/use_floating_pool.py index 275b9592b71..7d6fc2f6651 100644 --- a/src/config/utils/use_floating_pool.py +++ b/src/config/utils/use_floating_pool.py @@ -30,7 +30,8 @@ def __init__(self, args_str=None): self._args.admin_user, self._args.admin_password, self._args.admin_tenant_name, self._args.api_server_ip, - self._args.api_server_port, '/') + self._args.api_server_port, '/', + api_server_use_ssl=self._args.api_server_use_ssl) vnc_lib = self._vnc_lib fq_name = self._args.project_name.split(':') @@ -56,6 +57,7 @@ def _parse_args(self, args_str): --floating_ip_pool_name default-domain:default-proj:pub-vn:fip_pool --api_server_ip 127.0.0.1 --api_server_port 8082 + --api_server_use_ssl False ''' # Source any specified config/ini file @@ -72,6 +74,7 @@ def _parse_args(self, args_str): 'floating_ip_pool_name': 'fip_pool', 'api_server_ip': '127.0.0.1', 'api_server_port': '8082', + 'api_server_use_ssl': False, } ksopts = { 'admin_user': 'user1',