Merge pull request #270 from hpe-container-platform-community/enable-kubectl

initial try

Author: snowch

hpecp/cli/k8scluster.py

@@ -64,6 +64,7 @@ def __dir__(self):
             "statuses",
             "upgrade_cluster",
             "wait_for_status",
+            "run_kubectl_command"
         ]
 
     def __init__(self):
@@ -551,3 +552,29 @@ def import_generic_cluster_with_json(
                 json_content
             )
         )
+
+    @base.intercept_exception
+    def run_kubectl_command(
+        self, id, op, yaml
+    ):
+        """Run a kubectl command on k8s cluster.
+    
+        Parameters
+        ------
+        :param id: The k8s cluster ID, integer number in resource path /api/v2/k8scluster/<id>
+        :param op: operation to pass to kubectl, one of 'create', 'delete', 'update'
+        :param yaml: base64 encoded yaml file to operate
+
+        Returns
+        -------
+        TODO
+
+        Raises
+        ------
+        APIException
+        """
+        print(
+            base.get_client().k8s_cluster.run_kubectl_command(
+                id, op, yaml
+            )
+        )

hpecp/k8s_cluster.py

@@ -671,3 +671,39 @@ def import_generic_cluster_with_json(self, json):
             data=json,
         )
         return CaseInsensitiveDict(response.headers)["Location"]
+
+    def run_kubectl_command(self, id, op='create', yaml=''):
+        """Run a kubectl command on k8s cluster.
+    
+        Parameters
+        ------
+        id: str
+            The k8s cluster ID (ID = 1 or 2 etc, not the base path as /api/v2/k8s_cluster/1)
+        op: str
+            op can be one of create,delete,update
+        yaml: str
+            base64 encoding of the yaml file
+
+        Returns
+        -------
+        TODO
+
+        Raises
+        ------
+        APIException
+        """
+
+        data = {
+            "op": op,
+            "data": yaml
+            }
+
+        response = self.client._request(
+            url="/api/v2/k8scluster/{id}/kubectl",
+            http_method="post",
+            description=(
+                "K8sClusterController/" "run_kubectl_command"
+            ),
+            data=json,
+        )
+        return response.json()

tests/_HPECP-REST-API-SOAPUI.xml

@@ -15,58 +15,58 @@ def queryString = mockRequest.getRequest().getQueryString()
 log.info "QueryString: " + queryString
 
 
-/*
-// Script dispatcher is used to select a response based on the incoming request.
-// Here are few examples showing how to match based on path, query param, header and body
-
-// Match based on path
-def requestPath = mockRequest.getPath()
-log.info "Path: "+ requestPath
-
-if( requestPath.contains("json") )
-{
-    // return the name of the response you want to dispatch
-    return "JSON Response"
-}
-
-
-// Match based on query parameter
-def queryString = mockRequest.getRequest().getQueryString()
-log.info "QueryString: " + queryString
-
-if( queryString.contains("stockholm") )
-{
-    // return the name of the response you want to dispatch
-    return "Response Stockholm"
-}
-else if( queryString.contains("london") )
-{
-    // return the name of the response you want to dispatch
-    return "Response London"
-}
-
-
-// Match based on header
-def acceptEncodingHeaderList = mockRequest.getRequestHeaders().get("Accept-Encoding")
-log.info "AcceptEncoding Header List: " + acceptEncodingHeaderList
-
-if( acceptEncodingHeaderList.contains("gzip,deflate") )
-{
-    // return the name of the response you want to dispatch
-    return "GZiped Response"
-}
-
-
-// Match based on body
-def requestBody = mockRequest.getRequestContent()
-log.info "Request body: " + requestBody
-
-if( requestBody.contains("some data") )
-{
-    // return the name of the response you want to dispatch
-    return "Response N"
-}
-*/
+/*
+// Script dispatcher is used to select a response based on the incoming request.
+// Here are few examples showing how to match based on path, query param, header and body
+
+// Match based on path
+def requestPath = mockRequest.getPath()
+log.info "Path: "+ requestPath
+
+if( requestPath.contains("json") )
+{
+    // return the name of the response you want to dispatch
+    return "JSON Response"
+}
+
+
+// Match based on query parameter
+def queryString = mockRequest.getRequest().getQueryString()
+log.info "QueryString: " + queryString
+
+if( queryString.contains("stockholm") )
+{
+    // return the name of the response you want to dispatch
+    return "Response Stockholm"
+}
+else if( queryString.contains("london") )
+{
+    // return the name of the response you want to dispatch
+    return "Response London"
+}
+
+
+// Match based on header
+def acceptEncodingHeaderList = mockRequest.getRequestHeaders().get("Accept-Encoding")
+log.info "AcceptEncoding Header List: " + acceptEncodingHeaderList
+
+if( acceptEncodingHeaderList.contains("gzip,deflate") )
+{
+    // return the name of the response you want to dispatch
+    return "GZiped Response"
+}
+
+
+// Match based on body
+def requestBody = mockRequest.getRequestContent()
+log.info "Request body: " + requestBody
+
+if( requestBody.contains("some data") )
+{
+    // return the name of the response you want to dispatch
+    return "Response N"
+}
+*/
 </con:dispatchPath><con:response name="Success Reponse" id="c2e01668-af95-4107-a0ee-e7e3bb76f9cd" httpResponseStatus="200" mediaType="application/json"><con:settings/><con:responseContent>{
   "_links": {
     "self": {
@@ -205,56 +205,56 @@ if( requestBody.contains("some data") )
     return "Response N"
 }
 */
-</con:dispatchPath><con:response name="Login Success Response" id="64361075-ae39-4ed8-8fbd-e837ad26e2bf" httpResponseStatus="200" mediaType="application/json"><con:settings/><con:responseContent/><con:header><con:name>location</con:name><con:value>/api/v1/session/df1bfacb-xxxx-xxxx-xxxx-c8f57d8f3c7</con:value></con:header></con:response><con:response name="Login Failed Reponse" id="30731a63-ba64-41c1-820d-fbee088e4023" httpResponseStatus="401"><con:settings/><con:responseContent/></con:response></con:restMockAction><con:restMockAction name="/api/v1/license" method="GET" resourcePath="/api/v1/license" id="777458a5-c2f1-434f-bc62-93536aec73b0"><con:settings/><con:dispatchStyle>SEQUENCE</con:dispatchStyle><con:dispatchPath>/*
-// Script dispatcher is used to select a response based on the incoming request.
-// Here are few examples showing how to match based on path, query param, header and body
-
-// Match based on path
-def requestPath = mockRequest.getPath()
-log.info "Path: "+ requestPath
-
-if( requestPath.contains("json") )
-{
-    // return the name of the response you want to dispatch
-    return "JSON Response"
-}
-
-
-// Match based on query parameter
-def queryString = mockRequest.getRequest().getQueryString()
-log.info "QueryString: " + queryString
-
-if( queryString.contains("stockholm") )
-{
-    // return the name of the response you want to dispatch
-    return "Response Stockholm"
-}
-else if( queryString.contains("london") )
-{
-    // return the name of the response you want to dispatch
-    return "Response London"
-}
-
-
-// Match based on header
-def acceptEncodingHeaderList = mockRequest.getRequestHeaders().get("Accept-Encoding")
-log.info "AcceptEncoding Header List: " + acceptEncodingHeaderList
-
-if( acceptEncodingHeaderList.contains("gzip,deflate") )
-{
-    // return the name of the response you want to dispatch
-    return "GZiped Response"
-}
-
-
-// Match based on body
-def requestBody = mockRequest.getRequestContent()
-log.info "Request body: " + requestBody
-
-if( requestBody.contains("some data") )
-{
-    // return the name of the response you want to dispatch
-    return "Response N"
-}
-*/
-</con:dispatchPath><con:response name="Success Response" id="99316eed-7a8f-43b6-8b94-14c737654ed9" httpResponseStatus="200"><con:settings/><con:responseContent/></con:response></con:restMockAction></con:restMockService><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/></con:soapui-project>
+</con:dispatchPath><con:response name="Login Success Response" id="64361075-ae39-4ed8-8fbd-e837ad26e2bf" httpResponseStatus="200" mediaType="application/json"><con:settings/><con:responseContent/><con:header><con:name>location</con:name><con:value>/api/v1/session/df1bfacb-xxxx-xxxx-xxxx-c8f57d8f3c7</con:value></con:header></con:response><con:response name="Login Failed Reponse" id="30731a63-ba64-41c1-820d-fbee088e4023" httpResponseStatus="401"><con:settings/><con:responseContent/></con:response></con:restMockAction><con:restMockAction name="/api/v2/license" method="GET" resourcePath="/api/v2/license" id="777458a5-c2f1-434f-bc62-93536aec73b0"><con:settings/><con:dispatchStyle>SEQUENCE</con:dispatchStyle><con:dispatchPath>/*
+// Script dispatcher is used to select a response based on the incoming request.
+// Here are few examples showing how to match based on path, query param, header and body
+
+// Match based on path
+def requestPath = mockRequest.getPath()
+log.info "Path: "+ requestPath
+
+if( requestPath.contains("json") )
+{
+    // return the name of the response you want to dispatch
+    return "JSON Response"
+}
+
+
+// Match based on query parameter
+def queryString = mockRequest.getRequest().getQueryString()
+log.info "QueryString: " + queryString
+
+if( queryString.contains("stockholm") )
+{
+    // return the name of the response you want to dispatch
+    return "Response Stockholm"
+}
+else if( queryString.contains("london") )
+{
+    // return the name of the response you want to dispatch
+    return "Response London"
+}
+
+
+// Match based on header
+def acceptEncodingHeaderList = mockRequest.getRequestHeaders().get("Accept-Encoding")
+log.info "AcceptEncoding Header List: " + acceptEncodingHeaderList
+
+if( acceptEncodingHeaderList.contains("gzip,deflate") )
+{
+    // return the name of the response you want to dispatch
+    return "GZiped Response"
+}
+
+
+// Match based on body
+def requestBody = mockRequest.getRequestContent()
+log.info "Request body: " + requestBody
+
+if( requestBody.contains("some data") )
+{
+    // return the name of the response you want to dispatch
+    return "Response N"
+}
+*/
+</con:dispatchPath><con:response name="Success Response" id="99316eed-7a8f-43b6-8b94-14c737654ed9" httpResponseStatus="200"><con:settings/><con:responseContent/></con:response></con:restMockAction></con:restMockService><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/><con:oAuth1ProfileContainer/></con:soapui-project>