e64883a5c7
The support of interactive execute is similar to attach but the docker exec endpoint doesn't support websocket as the attach endpoint. Therefore, this commit introduced an HTTP client for streaming. The common code between websocketclient and HTTP client are consolidated into a base class. This patch relies on the server to return the URL of Docker Engine [1] and leverage the URL to connect to the container and execute commands interactively. A sample workflow would be as following. 1. Create a container that never exited (by using the command "tail -f /dev/null"): [host]$ zun run --name test ubuntu tail -f /dev/null 2. Enter the container with a Bash shell: [host]$ zun exec -i test bash 3. Once you are inside, you can run any command you want: [container]# apt-get update 4. Once finished, exit the container: [container]# exit [1] https://review.openstack.org/#/c/452505/ Implements: blueprint support-interactive-mode Depends-On: If987222ecf5419a305810858e304a4c2b4a78474 Change-Id: If02b20df46496d2687e60fefce46046d7377f441
43 lines
1.7 KiB
Python
43 lines
1.7 KiB
Python
# Copyright 2015 OpenStack LLC.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import mock
|
|
import testtools
|
|
|
|
from zunclient.common.websocketclient import websocketclient
|
|
|
|
CONTAINER_ID = "0f96db5a-26dc-4550-b1a8-b110bd9247cb"
|
|
ESCAPE_FLAG = "~"
|
|
URL = "ws://localhost:2375/v1.17/containers/201e4e22c5b2/" \
|
|
"attach/ws?logs=0&stream=1&stdin=1&stdout=1&stderr=1"
|
|
URL1 = "ws://10.10.10.10:2375/v1.17/containers/***********/" \
|
|
"attach/ws?logs=0&stream=1&stdin=1&stdout=1&stderr=1"
|
|
WAIT_TIME = 0.5
|
|
|
|
|
|
class WebSocketClientTest(testtools.TestCase):
|
|
|
|
def test_websocketclient_variables(self):
|
|
mock_client = mock.Mock()
|
|
wsclient = websocketclient.WebSocketClient(zunclient=mock_client,
|
|
url=URL,
|
|
id=CONTAINER_ID,
|
|
escape=ESCAPE_FLAG,
|
|
close_wait=WAIT_TIME)
|
|
self.assertEqual(wsclient.url, URL)
|
|
self.assertEqual(wsclient.id, CONTAINER_ID)
|
|
self.assertEqual(wsclient.escape, ESCAPE_FLAG)
|
|
self.assertEqual(wsclient.close_wait, WAIT_TIME)
|