PSARC 2015/110 OpenStack service updates for Juno PSARC 2014/302 oslo.messaging - OpenStack RPC and notifications PSARC 2014/303 concurrent.futures - high-level Python interface for asynchronous execution PSARC 2014/304 networkx - Python module for complex networks PSARC 2014/305 taskflow - Python module for task execution PSARC 2014/329 pycadf - Python interface for CADF (cloud auditing) PSARC 2014/330 posix_ipc - POSIX IPC primitives for Python PSARC 2014/331 oauthlib - Python implementation of OAuth request-signing logic PSARC 2015/058 oslo - OpenStack common libraries (context, db, i18n, middleware, serialization, utils, vmware) PSARC 2015/059 glance_store - Glance storage library PSARC 2015/060 ipaddr - an IPv4/IPv6 manipulation library in Python PSARC 2015/061 simplegeneric - single-dispatch generic Python functions PSARC 2015/062 wsme - Web Services Made Easy PSARC 2015/063 retrying - General purpose Python retrying library PSARC 2015/065 osprofiler - an OpenStack cross-project profiling library PSARC 2015/066 OpenStack client for Sahara (Hadoop as a Service) PSARC 2015/067 keystonemiddleware - Middleware for OpenStack Identity PSARC 2015/068 pyScss - Compiler for the SCSS flavor of the Sass language PSARC 2015/069 django-pyscss - pyScss support for Django PSARC 2015/073 barbicanclient - OpenStack client for Barbican (Key Management) PSARC 2015/074 pysendfile - Python interface to sendfile PSARC 2015/097 ldappool - a connection pool for python-ldap PSARC 2015/098 rfc3986 - URI reference validation module for Python PSARC 2015/102 iniparse - python .ini file parsing module 20667775 OpenStack service updates for Juno (Umbrella) 17511386 sqlalchemy-migrate should lose its bypass-gen tags once sqlalchemy is in the CBE 18293987 /usr/bin/alembic should be shipped 18293992 boto's demo scripts aren't delivered executable 18377642 py.test has a requirement on py 18615101 Horizon should prevent network, subnet, and port names with hyphens in them 18772068 instance failed to launch with NoValidHost but no reason 18887457 openstack shouldn't deliver .po files 18905324 hostname.xml should set config/ignore_dhcp_hostname = true 18961031 Duplicate names for role-create and user-create are allowed 19015363 Users should not be allowed to attempt to create volumes when quota exceed 19044301 boto's dependencies need work 19050335 user appears logged in but unauthorised after horizon reboot 19065699 cinderclient-34 lost in recent upgrade 19131218 solaris.css: 'Delete Interface' button in Router pop-up menu broken 19131507 solaris.css: 'Project Limits' section of Launch Instance pop-up menu broken 19144215 Instance manipulation buttons greyed out after all instances terminated 19249066 heat stack-preview doesn't appear to do anything 19313272 Need bottom slidebar in horizon for small browser windows 19439030 'nova migration-list' returns python error 19462265 The Python module oslo.messaging should be added to Userland 19462397 The Python module futures should be added to Userland 19476604 The Python module networkx should be added to Userland 19476953 The Python module taskflow should be added to Userland 19519227 The Python module pycadf should be added to Userland 19582394 The Python module posix_ipc should be added to Userland 19596691 instance failed to launch, cinder hit resource busy in stmfadm 19598430 The Python module oauthlib should be added to Userland 19649055 FC connection fails when the target_lun is assigned 0 19815780 nova package should have dependencies on brand-solaris and brand-solaris-kz 19883623 Image snapshots are missing 'instance_uuid' property 19887874 horizon should set up apache log rotation 19888859 six should enable its tests now. 19987962 Cinder lists additional volumes attached to instance with linuxy device names 20027791 horizon should be migrated to Apache 2.4 20046570 rabbitmq & rad-evs-controller should be added to group package 20052466 remove _ai_health_check() from driver.py now that 18857274 is integrated 20164815 The Python module django-pyscss should be added to Userland 20173049 The Python module retrying should be added to Userland 20174489 The Python module WSME should be added to Userland 20176001 The Python module keystonemiddleware should be added to Userland 20182039 The Python module pysendfile should be added to Userland 20200162 The Python module pyScss should be added to Userland 20222184 horizon doesn't send start request on shutdown instance 20312312 The Python module python-saharaclient should be added to Userland 20388250 problem in SERVICE/GLANCE 20433402 The fix for 20388250 is incomplete 20514287 wrong vnic label name used for dhcp vnic in evs 20596802 The Python module oslo.middleware should be added to Userland 20596803 The Python module barbicanclient should be added to Userland 20596804 The Python module oslo.context should be added to Userland 20596805 The Python module iniparse should be added to Userland 20596806 The Python module oslo.vmware should be added to Userland 20596807 The Python module osprofiler should be added to Userland 20596808 The Python module oslo.i18n should be added to Userland 20596809 The Python module oslo.utils should be added to Userland 20596811 The Python module ipaddr should be added to Userland 20596812 The Python module glance_store should be added to Userland 20596813 The Python module oslo.serialization should be added to Userland 20596814 The Python module oslo.db should be added to Userland 20596815 The Python module simplegeneric should be added to Userland 20602690 The Python module ldappool should be added to Userland 20602722 The Python module rfc3986 should be added to Userland 20638369 compilemessages.py requires GNU msgfmt without calling gmsgfmt 20715741 cinder 2014.2.2 20715742 glance 2014.2.2 20715743 heat 2014.2.2 20715744 horizon 2014.2.2 20715745 keystone 2014.2.2 20715746 neutron 2014.2.2 20715747 nova 2014.2.2 20715748 swift 2.2.2 20715749 alembic 0.7.4 20715750 amqp 1.4.6 20715751 boto 2.34.0 20715752 ceilometerclient 1.0.12 20715753 cinderclient 1.1.1 20715754 cliff 1.9.0 20715756 django 1.4.19 20739229 Update django to 1.4.20 20715757 django_compressor 1.4 20715758 django_openstack_auth 1.1.9 20715759 eventlet 0.15.2 20715761 glanceclient 0.15.0 20715762 greenlet 0.4.5 20715763 heatclient 0.2.12 20715764 keystoneclient 1.0.0 20715765 kombu 3.0.7 20715766 mysql 1.2.5 20715767 netaddr 0.7.13 20715769 netifaces 0.10.4 20715770 neutronclient 2.3.10 20715771 novaclient 2.20.0 20715772 oslo.config 1.6.0 20715773 py 1.4.26 20715774 pyflakes 0.8.1 20715775 pytest 2.6.4 20715776 pytz 2014.10 20715777 requests 2.6.0 20715778 simplejson 3.6.5 20715779 six 1.9.0 20715780 sqlalchemy-migrate 0.9.1 20715781 sqlalchemy 0.9.8 20715782 stevedore 1.2.0 20715783 swiftclient 2.3.1 20715784 tox 1.8.1 20715785 troveclient 1.0.8 20715786 virtualenv 12.0.7 20715787 websockify 0.6.0 20739215 problem in PYTHON-MOD/DJANGO 20739295 problem in PYTHON-MOD/DJANGO 20816861 zone-vnc-console instance goes in to maintenance 20829672 support flat network type in neutron

     1

#!/usr/bin/python2.6

     2

     3

# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.

     4

#

     5

#    Licensed under the Apache License, Version 2.0 (the "License"); you may

     6

#    not use this file except in compliance with the License. You may obtain

     7

#    a copy of the License at

     8

#

     9

#         http://www.apache.org/licenses/LICENSE-2.0

    10

#

    11

#    Unless required by applicable law or agreed to in writing, software

    12

#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

    13

#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

    14

#    License for the specific language governing permissions and limitations

    15

#    under the License.

    16

    17

import errno

    18

import os

    19

import pwd

    20

import smf_include

    21

import subprocess

    22

import sys

    23

import time

    24

    25

from subprocess import CalledProcessError, check_call, Popen

    26

from tempfile import mkstemp

    27

    28

GTF = "/usr/bin/gtf"

    29

SVCCFG = "/usr/sbin/svccfg"

    30

SVCPROP = "/usr/bin/svcprop"

    31

VNCSERVER = "/usr/bin/vncserver"

    32

XRANDR = "/usr/bin/xrandr"

    33

XSTARTUPHDR = "# WARNING: THIS FILE GENERATED BY SMF.\n" + \

    34

              "#   DO NOT EDIT THIS FILE.  EDITS WILL BE LOST.\n"

    35

XRESOURCES = "[[ -f ~/.Xresources ]] && /usr/bin/xrdb -merge ~/.Xresources\n"

    36

XTERM = "/usr/bin/xterm"

    37

# Borderless, Monospsce font, point size 14, white foreground on black

    38

# background are reasonable defaults.

    39

XTERMOPTS = ' -b 0 -fa Monospace -fs 14 -fg white -bg black -title ' + \

    40

            '"Zone Console: $ZONENAME"'

    41

XWININFO = "/usr/bin/xwininfo"

    42

# Enclose command in comments to prevent xterm consuming zlogin opts

    43

ZLOGINOPTS = ' -e "/usr/bin/pfexec /usr/sbin/zlogin -C -E $ZONENAME"\n'

    44

XSTARTUP = XSTARTUPHDR + XRESOURCES + XTERM + XTERMOPTS + ZLOGINOPTS

    45

    46

    47

def start():

    48

    check_vncserver()

    49

    homedir = os.environ.get('HOME')

    50

    if not homedir:

    51

        homedir = pwd.getpwuid(os.getuid()).pw_dir

    52

        os.putenv("HOME", homedir)

    53

    set_xstartup(homedir)

    54

    55

    try:

    56

        fmri = os.environ['SMF_FMRI']

    57

        zonename = fmri.rsplit(':', 1)[1]

    58

        os.putenv("ZONENAME", zonename)

    59

        desktop_name = zonename + ' console'

    60

        # NOTE: 'geometry' below is that which matches the size of standard

    61

        # 80 character undecorated xterm window using font style specified in

    62

        # XTERMOPTS. The geometry doesn't matter too much because the display

    63

        # will be resized using xrandr once the xterm geometry is established.

    64

        cmd = [VNCSERVER, "-name", desktop_name, "-SecurityTypes=None",

    65

               "-geometry", "964x580", "-localhost", "-autokill"]

    66

        vnc = Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,

    67

                    env=None)

    68

        out, err = vnc.communicate()

    69

        vncret = vnc.wait()

    70

        if vncret != 0:

    71

            print "Error starting VNC server: " + err

    72

            return smf_include.SMF_EXIT_ERR_FATAL

    73

    except Exception as e:

    74

        print e

    75

        return smf_include.SMF_EXIT_ERR_FATAL

    76

    77

    output = err.splitlines()

    78

    for line in output:

    79

        if line.startswith("New '%s' desktop is" % desktop_name):

    80

            display = line.rpartition(' ')[2]

    81

            host, display_num = display.split(':', 1)

    82

            # set host prop

    83

            port = 5900 + int(display_num)

    84

            print "VNC port: %d" % port

    85

            # set port num prop

    86

            cmd = [SVCCFG, '-s', fmri, 'setprop', 'vnc/port', '=', 'integer:',

    87

                   str(port)]

    88

    89

            svccfg = subprocess.Popen(cmd, stdout=subprocess.PIPE,

    90

                                      stderr=subprocess.PIPE)

    91

            out, err = svccfg.communicate()

    92

            retcode = svccfg.wait()

    93

            if retcode != 0:

    94

                print "Error updating 'vnc/port' property: " + err

    95

                return smf_include.SMF_EXIT_ERR_FATAL

    96

    resize_xserver(display, zonename)

    97

    98

    return smf_include.SMF_EXIT_OK

    99

   100

   101

def stop():

   102

    try:

   103

        # first kill the SMF contract

   104

        check_call(["/usr/bin/pkill", "-c", sys.argv[2]])

   105

    except CalledProcessError as cpe:

   106

        # 1 is returncode if no SMF contract processes were matched,

   107

        # meaning they have already terminated.

   108

        if cpe.returncode != 1:

   109

                print "failed to kill the SMF contract: %s" % cpe

   110

                return smf_include.SMF_EXIT_ERR_FATAL

   111

   112

    try:

   113

        fmri = os.environ['SMF_FMRI']

   114

        # reset port num prop to initial zero value

   115

        cmd = [SVCCFG, '-s', fmri, 'setprop', 'vnc/port', '=', 'integer:',

   116

               '0']

   117

        svccfg = subprocess.Popen(cmd, stdout=subprocess.PIPE,

   118

                                  stderr=subprocess.PIPE,)

   119

        out, err = svccfg.communicate()

   120

        retcode = svccfg.wait()

   121

        if retcode != 0:

   122

            print "Error resetting 'vnc/port' property: " + err

   123

            return smf_include.SMF_EXIT_ERR_FATAL

   124

    except Exception as e:

   125

        print e

   126

        return smf_include.SMF_EXIT_ERR_FATAL

   127

   128

   129

def check_vncserver():

   130

    if not os.path.exists(VNCSERVER):

   131

        print("VNC console service not available on this compute node. "

   132

              "%s is missing. Run 'pkg install x11/server/xvnc'"

   133

              % VNCSERVER)

   134

        return smf_include.SMF_EXIT_ERR_FATAL

   135

    if not os.path.exists(XTERM):

   136

        print("VNC console service not available on this compute node. "

   137

              "%s is missing. Run 'pkg install terminal/xterm'"

   138

              % XTERM)

   139

        return smf_include.SMF_EXIT_ERR_FATAL

   140

   141

   142

def set_xstartup(homedir):

   143

    vncdir = os.path.join(homedir, '.vnc')

   144

    xstartup_path = os.path.join(vncdir, 'xstartup')

   145

   146

    try:

   147

        os.mkdir(vncdir)

   148

    except OSError as ose:

   149

        if ose.errno != errno.EEXIST:

   150

            raise

   151

   152

    # Always clobber xstartup

   153

    # stemp tuple = [fd, path]

   154

    stemp = mkstemp(dir=vncdir)

   155

    os.write(stemp[0], XSTARTUP)

   156

    os.close(stemp[0])

   157

    os.chmod(stemp[1], 0700)

   158

    os.rename(stemp[1], xstartup_path)

   159

   160

   161

def resize_xserver(display, zonename):

   162

    """ Try to determine xterm window geometry and resize the Xvnc display

   163

        to match using XRANDR. Treat failure as non-fatal since an

   164

        incorrectly sized console is arguably better than none.

   165

    """

   166

    class UninitializedWindowError(Exception):

   167

        pass

   168

   169

    class UnmappedWindowError(Exception):

   170

        pass

   171

   172

    def _get_window_geometry(display, windowname):

   173

        """ Find the xterm xwindow by name/title and extract its geometry

   174

            Returns: tuple of window [width, height]

   175

            Raises:

   176

                UninitializedWindowError if window not yet initialized

   177

                UnmappedWindowError if window is not viewable/mapped

   178

        """

   179

        cmd = [XWININFO, '-d', display, '-name', windowname]

   180

        xwininfo = subprocess.Popen(cmd, stdout=subprocess.PIPE,

   181

                                    stderr=subprocess.PIPE)

   182

        out, err = xwininfo.communicate()

   183

        retcode = xwininfo.wait()

   184

        if retcode != 0:

   185

            print "Error finding console xwindow info: " + err

   186

            raise UninitializedWindowError

   187

   188

        width = None

   189

        height = None

   190

        mapped = False

   191

        for line in out.splitlines():

   192

            line = line.strip()

   193

            if line.startswith("Map State:"):

   194

                if line.split()[-1] != "IsViewable":

   195

                    # Window is not mapped yet.

   196

                    raise UnmappedWindowError

   197

                else:

   198

                    mapped = True

   199

            if line.startswith("Width:"):

   200

                width = int(line.split()[1])

   201

            elif line.startswith("Height:"):

   202

                height = int(line.split()[1])

   203

            if width and height and mapped:

   204

                return [width, height]

   205

        else:

   206

            # What, no width and height???

   207

            print "No window geometry info returned by " + XWINFINFO

   208

            raise UnmappedWindowError

   209

   210

    retries = 10

   211

    sleep = 1

   212

    uninit_count = 0

   213

    unmap_count = 0

   214

    width = 0

   215

    height = 0

   216

    while uninit_count < retries and unmap_count < retries:

   217

        try:

   218

            width, height = _get_window_geometry(display,

   219

                                                 'Zone Console: ' + zonename)

   220

            print "Discovered xterm geometry: %d x %d" % (width, height)

   221

            break

   222

        except UninitializedWindowError:

   223

            if uninit_count < retries:

   224

                print "xterm window not initialized yet. Retrying in %ds" \

   225

                    % sleep

   226

                uninit_count += 1

   227

                time.sleep(sleep)

   228

                continue

   229

            else:

   230

                print "xterm window is taking too long to initialize"

   231

                break

   232

        except UnmappedWindowError:

   233

            if unmap_count < retries:

   234

                print "Discovered xterm not mapped yet. Retrying in %ds" \

   235

                    % sleep

   236

                unmap_count += 1

   237

                time.sleep(sleep)

   238

                continue

   239

            else:

   240

                print "Discovered xterm window is taking too long to map"

   241

                break

   242

    else:

   243

        print "Too many failed attempts to discover xterm window geometry"

   244

        return

   245

   246

    # Generate a mode line for width and height, with a refresh of 60.0Hz

   247

    cmd = [GTF, str(width), str(height), '60.0', '-x']

   248

    gtf = subprocess.Popen(cmd, stdout=subprocess.PIPE,

   249

                           stderr=subprocess.PIPE)

   250

    out, err = gtf.communicate()

   251

    retcode = gtf.wait()

   252

    if retcode != 0:

   253

        print "Error creating new modeline for VNC display: " + err

   254

        return

   255

   256

    for line in out.splitlines():

   257

        line = line.strip()

   258

        if line.startswith('Modeline'):

   259

            modeline = line.split('Modeline')[1]

   260

            print "New optimal modeline for Xvnc server: " + modeline

   261

            mode = modeline.split()

   262

            break

   263

   264

    # Create a new mode for the Xvnc server using the modeline generated by gtf

   265

    cmd = [XRANDR, '-d', display, '--newmode']

   266

    cmd.extend(mode)

   267

    newmode = subprocess.Popen(cmd, stdout=subprocess.PIPE,

   268

                               stderr=subprocess.PIPE)

   269

    out, err = newmode.communicate()

   270

    retcode = newmode.wait()

   271

    if retcode != 0:

   272

        print "Error creating new xrandr modeline for VNC display: " + err

   273

        return

   274

   275

    # Add the new mode to the default display output

   276

    modename = mode[0]

   277

    cmd = [XRANDR, '-d', display, '--addmode', 'default', modename]

   278

    addmode = subprocess.Popen(cmd, stdout=subprocess.PIPE,

   279

                               stderr=subprocess.PIPE)

   280

    out, err = addmode.communicate()

   281

    retcode = addmode.wait()

   282

    if retcode != 0:

   283

        print "Error adding new xrandr modeline for VNC display: " + err

   284

        return

   285

   286

    # Activate the new mode on the default display output

   287

    cmd = [XRANDR, '-d', display, '--output', 'default', '--mode', modename]

   288

    addmode = subprocess.Popen(cmd, stdout=subprocess.PIPE,

   289

                               stderr=subprocess.PIPE)

   290

    out, err = addmode.communicate()

   291

    retcode = addmode.wait()

   292

    if retcode != 0:

   293

        print "Error setting new xrandr modeline for VNC display: " + err

   294

        return

   295

   296

if __name__ == "__main__":

   297

    os.putenv("LC_ALL", "C")

   298

    smf_include.smf_main()