Skip to content

Commit

Permalink
Merge pull request #2679 from planetf1/backport-pr2678
Browse files Browse the repository at this point in the history 
Release 1.5 - Backport pr2678
  • Loading branch information
@mandy-chessell
mandy-chessell authored Mar 2, 2020
2 parents e57d66a + d3d5d64 commit f5a03a3
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 196 deletions.
14 changes: 9 additions & 5 deletions open-metadata-distribution/open-metadata-assemblies/src/main/assemblies/egeria-deploy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,15 @@
<fileSet>
<directory>../../open-metadata-resources/open-metadata-labs</directory>
<outputDirectory>./notebooks</outputDirectory>
<includes>
<include>**/*.ipynb</include>
<include>**/*.md</include>
<include>**/resources/**</include>
</includes>
<excludes>
<exclude>pom.xml</exclude>
<exclude>*.iml</exclude>
<exclude>.classpath</exclude>
<exclude>.project</exclude>
<exclude>.settings/**</exclude>
<exclude>.ipynb_checkpoints/**</exclude>
<exclude>**/target/**</exclude>
</excludes>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
Expand Down
220 changes: 29 additions & 191 deletions ...ta-resources/open-metadata-labs/conformance-testing-labs/run-conformance-test-suite.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,9 @@
},
{
"cell_type": "code",
"execution_count": 21,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"\n",
"Checking OMAG Server Platform availability...\n",
" ... CTS OMAG Server Platform at http://localhost:8082 is active - ready to begin\n",
"Done.\n"
]
}
],
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"import requests\n",
"import pprint\n",
Expand Down Expand Up @@ -123,7 +112,7 @@
},
{
"cell_type": "code",
"execution_count": 22,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -141,7 +130,7 @@
},
{
"cell_type": "code",
"execution_count": 23,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -157,7 +146,7 @@
},
{
"cell_type": "code",
"execution_count": 24,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -183,7 +172,7 @@
},
{
"cell_type": "code",
"execution_count": 25,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -203,7 +192,7 @@
},
{
"cell_type": "code",
"execution_count": 26,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -221,7 +210,7 @@
},
{
"cell_type": "code",
"execution_count": 27,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -243,7 +232,7 @@
},
{
"cell_type": "code",
"execution_count": 28,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -343,7 +332,7 @@
},
{
"cell_type": "code",
"execution_count": 29,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -352,47 +341,9 @@
},
{
"cell_type": "code",
"execution_count": 30,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Configuring CTS_Server...\n",
"\n",
" ... Configuring the platform the server will run on...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/CTS_Server/server-url-root?url=http://localhost:8082 )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
" ... Configuring the server's type...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/CTS_Server/server-type?typeName=Conformance Suite Server )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
" ... Configuring the server's userId...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/CTS_Server/server-user-id?id=CTS1npa )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
" ... Configuring the server's password (optional)...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/CTS_Server/server-user-password?password=CTS1passw0rd )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
" ... Configuring the event bus for this server...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/CTS_Server/event-bus )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
" ... Configuring the membership of the cohort...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/CTS_Server/cohorts/devCohort )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
" ... Configuring the repository workbench for this server...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/CTS_Server/conformance-suite-workbenches/repository-workbench/repositories )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
"Done.\n"
]
}
],
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"ctsServerType = \"Conformance Suite Server\"\n",
"ctsServerUserId = \"CTS1npa\"\n",
Expand Down Expand Up @@ -439,51 +390,9 @@
},
{
"cell_type": "code",
"execution_count": 31,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Configuring SUT_Server...\n",
"\n",
" ... Configuring the platform the server will run on...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/SUT_Server/server-url-root?url=http://localhost:8082 )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
" ... Configuring the server's type...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/SUT_Server/server-type?typeName=Metadata Repository Server )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
" ... Configuring the server's userId...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/SUT_Server/server-user-id?id=SUTnpa )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
" ... Configuring the server's password (optional)...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/SUT_Server/server-user-password?password=SUTpassw0rd )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
" ... Configuring the metadata repository...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/SUT_Server/local-repository/mode/in-memory-repository )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
" ... Configuring the short descriptive name of the metadata stored in this server...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/SUT_Server/local-repository/metadata-collection-name/SUT_MDR )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
" ... Configuring the event bus for this server...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/SUT_Server/event-bus )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
" ... Configuring the membership of the cohort...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/SUT_Server/cohorts/devCohort )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
"Done.\n"
]
}
],
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"sutServerType = \"Metadata Repository Server\"\n",
"sutServerUserId = \"SUTnpa\"\n",
Expand Down Expand Up @@ -527,26 +436,9 @@
},
{
"cell_type": "code",
"execution_count": 32,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"\n",
"Deploying server configuration documents to appropriate platforms...\n",
" ... deploying CTS_Server to the http://localhost:8082 platform...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/CTS_Server/configuration/deploy )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
" ... deploying SUT_Server to the http://localhost:8082 platform...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/SUT_Server/configuration/deploy )\n",
" ...... Success. Response: {'class': 'VoidResponse', 'relatedHTTPCode': 200}\n",
"\n",
"Done.\n"
]
}
],
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"def deployServerToPlatform(serverName, platformURL):\n",
" print(\" ... deploying\", serverName, \"to the\", platformURL, \"platform...\")\n",
Expand Down Expand Up @@ -586,7 +478,7 @@
},
{
"cell_type": "code",
"execution_count": 33,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -604,28 +496,9 @@
},
{
"cell_type": "code",
"execution_count": 34,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"\n",
"Starting the CTS server ...\n",
" ... starting server CTS_Server ...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/CTS_Server/instance )\n",
" ...... Success. Response: {'class': 'SuccessMessageResponse', 'relatedHTTPCode': 200, 'successMessage': 'Tue Feb 25 17:49:41 GMT 2020 CTS_Server is running the following services: [Open Metadata Repository Services (OMRS), Connected Asset Services, Conformance Suite Services]'}\n",
"\n",
"Starting the SUT server ...\n",
" ... starting server SUT_Server ...\n",
" ...... (POST http://localhost:8082/open-metadata/admin-services/users/garygeeke/servers/SUT_Server/instance )\n",
" ...... Success. Response: {'class': 'SuccessMessageResponse', 'relatedHTTPCode': 200, 'successMessage': 'Tue Feb 25 17:49:46 GMT 2020 SUT_Server is running the following services: [Open Metadata Repository Services (OMRS)]'}\n",
"\n",
"Done.\n"
]
}
],
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"def startServer(serverName, platformURL):\n",
" print(\" ... starting server\", serverName, \"...\")\n",
Expand Down Expand Up @@ -686,25 +559,11 @@
},
{
"cell_type": "code",
"execution_count": 35,
"execution_count": null,
"metadata": {
"scrolled": true
},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"\n",
"Retrieve repository-workbench status ...\n",
" ... retrieving completion status from server CTS_Server ...\n",
"\n",
" ...... (GET http://localhost:8082/servers/CTS_Server/open-metadata/conformance-suite/users/garygeeke/status/workbenches/repository-workbench )\n",
"\n",
"Workbench repository-workbench is complete.\n"
]
}
],
"outputs": [],
"source": [
"import pandas\n",
"from pandas import json_normalize\n",
Expand Down Expand Up @@ -752,25 +611,11 @@
},
{
"cell_type": "code",
"execution_count": 37,
"execution_count": null,
"metadata": {
"scrolled": true
},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"\n",
"Retrieve Conformance Suite results ...\n",
" ... retrieving test report from server CTS_Server ...\n",
"\n",
" ...... (GET http://localhost:8082/servers/CTS_Server/open-metadata/conformance-suite/users/garygeeke/report )\n",
"\n",
"Done.\n"
]
}
],
"outputs": [],
"source": [
"report_json = None\n",
"\n",
Expand Down Expand Up @@ -897,13 +742,6 @@
"\n",
" display(repositoryWorkbenchResultsSummary.head(15))"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand All @@ -922,7 +760,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.3"
"version": "3.7.6"
}
},
"nbformat": 4,
Expand Down

0 comments on commit f5a03a3

Please sign in to comment.