Merge "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" into R3.1

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(

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 = []

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()

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):

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(

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(

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')

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,

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(

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 <add | del>
         '''
 
@@ -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)")

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):

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 <add | del>
         '''
 
@@ -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)")

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 <add | del>
                                         --md5 <key value>|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)")

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 <add | del>
         '''
 
@@ -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)")