[Kimchi-devel] [PATCH V8 2/2] Modify vnc_proxy_port to display_proxy_port

[Aline Manera]

On 01/16/2014 03:32 AM, zhoumeina wrote:
> Becasue vnc and spice are using the same port, and get the port from
> back-end. So this var should be changed to display_proxy_port so that
> it can be used by vnc and spice.
> Signed-off-by: zhoumeina <zhoumein at linux.vnet.ibm.com>
> ---
>   docs/API.md                  |    2 +-
>   src/kimchi.conf.in           |    2 +-
>   src/kimchi/config.py.in      |    4 ++--
>   src/kimchi/control/config.py |    2 +-
>   src/kimchi/vnc.py            |    2 +-
>   5 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/docs/API.md b/docs/API.md
> index 6e240eb..f872eab 100644
> --- a/docs/API.md
> +++ b/docs/API.md
> @@ -470,7 +470,7 @@ Contains information about the application environment and configuration.
>
>   * **GET**: Retrieve configuration information
>       * http_port: The port number on which the server is listening
> -    * vnc_proxy_port: Port for vnc's websocket proxy to listen on
> +    * display_proxy_port: Port for vnc and spice's websocket proxy to listen on
>   * **POST**: *See Configuration Actions*
>
>   **Actions (POST):**
> diff --git a/src/kimchi.conf.in b/src/kimchi.conf.in
> index ac5a1f5..f48901d 100644
> --- a/src/kimchi.conf.in
> +++ b/src/kimchi.conf.in
> @@ -32,4 +32,4 @@
>
>   [novnc]

You need to change "novnc" to "display" as you did below

>   # Port for vnc's websocket proxy to listen on

And also fix the comment above


I will fix it and apply.

> -#vnc_proxy_port = 64667
> +#display_proxy_port = 64667
> diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in
> index 8d9b5e1..22fe614 100644
> --- a/src/kimchi/config.py.in
> +++ b/src/kimchi/config.py.in
> @@ -182,8 +182,8 @@ def _get_config():
>       config.add_section("logging")
>       config.set("logging", "log_dir", get_default_log_dir())
>       config.set("logging", "log_level", DEFAULT_LOG_LEVEL)
> -    config.add_section("novnc")
> -    config.set("novnc", "vnc_proxy_port", "64667")
> +    config.add_section("display")
> +    config.set("display", "display_proxy_port", "64667")
>
>       config_file = os.path.join(get_config_dir(), 'kimchi.conf')
>       if os.path.exists(config_file):
> diff --git a/src/kimchi/control/config.py b/src/kimchi/control/config.py
> index 5186ddd..f3d2279 100644
> --- a/src/kimchi/control/config.py
> +++ b/src/kimchi/control/config.py
> @@ -40,7 +40,7 @@ class Config(Resource):
>       @property
>       def data(self):
>           return {'http_port': cherrypy.server.socket_port,
> -                'vnc_proxy_port': config.get('novnc', 'vnc_proxy_port')}
> +                'display_proxy_port': config.get('display', 'display_proxy_port')}
>
>
>   class Capabilities(Resource):
> diff --git a/src/kimchi/vnc.py b/src/kimchi/vnc.py
> index dc70b46..780be70 100644
> --- a/src/kimchi/vnc.py
> +++ b/src/kimchi/vnc.py
> @@ -40,7 +40,7 @@ def new_ws_proxy():
>               pass
>
>       cmd = os.path.join(os.path.dirname(__file__), 'websockify.py')
> -    args = ['python', cmd, config.get('novnc', 'vnc_proxy_port'),
> +    args = ['python', cmd, config.get('display', 'display_proxy_port'),
>               '--target-config', WS_TOKENS_DIR]
>       p = subprocess.Popen(args, close_fds=True)
>       return p