Commit 7808bee5 authored by harshit aggarwal's avatar harshit aggarwal
Browse files

Azure Impl

parent b0f1788f
Pipeline #12706 passed with stages
in 14 minutes and 30 seconds
......@@ -38,3 +38,5 @@ target/
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
.gitkeep
\ No newline at end of file
......@@ -103,7 +103,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
<version>0.0.17</version>
<version>0.0.23</version>
<scope>test</scope>
</dependency>
<dependency>
......
......@@ -76,10 +76,10 @@ public class IntegrationTestStepDefs implements En {
});
And("Required schema are created", () -> {
String payload = this.context.getFileUtils().read(getFileName(rawSchemaForWhichMappingIsPresent));
String payload = this.context.getFileUtils().read(rawSchemaForWhichMappingIsPresent);
postToStorageSchema(payload);
payload = this.context.getFileUtils().read(getFileName(rawSchemaForWhichMappingIsNotPresent));
payload = this.context.getFileUtils().read(rawSchemaForWhichMappingIsNotPresent);
postToStorageSchema(payload);
});
......@@ -728,12 +728,12 @@ public class IntegrationTestStepDefs implements En {
.httpMethod(HttpRequest.GET).requestHeaders(this.context.getAuthHeaders()).build();
HttpResponse response = HttpClientFactory.getInstance().send(httpRequest);
LOGGER.log(Level.INFO, "Storage schema Response : " + response.getBody());
if (String.valueOf(response).equals(AutomationConstants.RECORD_NOT_FOUND)) {
if (String.valueOf(response.getCode()).equals(AutomationConstants.RECORD_NOT_FOUND)) {
httpRequest = HttpRequest.builder().url(storageURL + AutomationConstants.STORAGE_SCHEMA_POST_ENDPOINT)
.body(jsonBody.toString()).httpMethod(HttpRequest.POST)
.requestHeaders(this.context.getAuthHeaders()).build();
response = HttpClientFactory.getInstance().send(httpRequest);
assertTrue("", String.valueOf(response).equals(AutomationConstants.RECORD_CREATED));
assertTrue("", String.valueOf(response.getCode()).equals(AutomationConstants.RECORD_CREATED));
}
}
......
......@@ -42,7 +42,7 @@
},
"legal": {
"legaltags": [
"opendes-storage-1594757987127"
"opendes-public-usa-dataset-7643990"
],
"otherRelevantDataCountries": [
"BR"
......
......@@ -16,7 +16,7 @@
},
"legal": {
"legaltags": [
"opendes-storage-1594757987127"
"opendes-public-usa-dataset-7643990"
],
"otherRelevantDataCountries": [
"BR"
......@@ -45,7 +45,7 @@
},
"legal": {
"legaltags": [
"opendes-storage-1594757987127"
"opendes-public-usa-dataset-7643990"
],
"otherRelevantDataCountries": [
"BR"
......@@ -74,7 +74,7 @@
},
"legal": {
"legaltags": [
"opendes-storage-1594757987127"
"opendes-public-usa-dataset-7643990"
],
"otherRelevantDataCountries": [
"BR"
......
......@@ -17,7 +17,7 @@
},
"legal": {
"legaltags": [
"opendes-storage-1594757987127"
"opendes-public-usa-dataset-7643990"
],
"otherRelevantDataCountries": [
"BR"
......
......@@ -41,7 +41,7 @@
},
"legal": {
"legaltags": [
"opendes-storage-1594757987127"
"opendes-public-usa-dataset-7643990"
],
"otherRelevantDataCountries": [
"BR"
......
......@@ -17,7 +17,7 @@
},
"legal": {
"legaltags": [
"opendes-storage-1594757987127"
"opendes-public-usa-dataset-7643990"
],
"otherRelevantDataCountries": [
"BR"
......
......@@ -17,7 +17,7 @@
},
"legal": {
"legaltags": [
"opendes-storage-1594757987127"
"opendes-public-usa-dataset-7643990"
],
"otherRelevantDataCountries": [
"BR"
......
......@@ -17,7 +17,7 @@
},
"legal": {
"legaltags": [
"opendes-storage-1594757987127"
"opendes-public-usa-dataset-7643990"
],
"otherRelevantDataCountries": [
"BR"
......
......@@ -17,7 +17,7 @@
},
"legal": {
"legaltags": [
"opendes-storage-1594757987127"
"opendes-public-usa-dataset-7643990"
],
"otherRelevantDataCountries": [
"BR"
......
{
"wellbores": {
"ids": [
"opendes:wks:wellbore-b3BlbmRlczphdDp3ZWxsYm9yZS1yZWNvcmQxRm9yTXVsdGlwbGVSZWxhdGVkRW50aXR5Q2hlY2s",
"opendes:wks:wellbore-b3BlbmRlczphdDp3ZWxsYm9yZS1yZWNvcmQyRm9yTXVsdGlwbGVSZWxhdGVkRW50aXR5Q2hlY2s"
],
"names": [
"record1ForMultipleRelatedEntityCheck",
"record2ForMultipleRelatedEntityCheck"
],
"confidences": [
70,
30
]
}
}
\ No newline at end of file
{
"wellbore": {
"id": "opendes:wks:wellbore-b3BlbmRlczphdDp3ZWxsYm9yZS1NdWx0aXBsZVJlY29yZFZlcnNpb24"
}
}
{
"wellbore": {
"id": "opendes:wks:wellbore-b3BlbmRlczphdDp3ZWxsYm9yZS1yYXdIYXZpbmdXa3NDcmVhdGVk"
}
}
[
{
"data": {
"Spud date": "atspud",
"UWI": "rawHavingWksCreated"
},
"id": "opendes:at:wellbore-record1ForMultipleRelatedEntityCheck",
"kind": "opendes:at:wellbore:1.0.0",
"acl": {
"viewers": [
"data.test1@opendes.contoso.com"
],
"owners": [
"data.test1@opendes.contoso.com"
]
},
"legal": {
"legaltags": [
"opendes-public-usa-dataset-7643990"
],
"otherRelevantDataCountries": [
"US"
],
"status": "compliant"
},
"createUser": "integrationtester"
},
{
"data": {
"Spud date": "atspud",
"UWI": "rawHavingWksCreated"
},
"id": "opendes:at:wellbore-record2ForMultipleRelatedEntityCheck",
"kind": "opendes:at:wellbore:1.0.0",
"acl": {
"viewers": [
"data.default.viewers@opendes.p4d.cloud.slb-ds.com"
],
"owners": [
"data.default.owners@opendes.p4d.cloud.slb-ds.com"
]
},
"legal": {
"legaltags": [
"opendes-public-usa-dataset-1"
],
"otherRelevantDataCountries": [
"US"
],
"status": "compliant"
},
"createUser": "integrationtester"
}
]
[
{
"data": {
"UWI": "wksWithLowerMajorVersion"
},
"id": "opendes:wks:wksMapping-lowerMajorVersion",
"kind": "opendes:wks:wksMapping:1.0.0",
"acl": {
"viewers": [
"data.test1@opendes.contoso.com"
],
"owners": [
"data.test1@opendes.contoso.com"
]
},
"legal": {
"legaltags": [
"opendes-public-usa-dataset-7643990"
],
"otherRelevantDataCountries": [
"US"
],
"status": "compliant"
},
"ancestry": {
"parents": [
"opendes:no:wksMapping-rawHavingMultipleWksCreated:<rawRecordLatestVersion>"
]
}
},
{
"data": {
"UWI": "wksWithHigherMajorVersion"
},
"id": "opendes:wks:wksMapping-higherMajorVersion",
"kind": "opendes:wks:wksMapping:2.0.0",
"acl": {
"viewers": [
"data.default.viewers@opendes.p4d.cloud.slb-ds.com"
],
"owners": [
"data.default.owners@opendes.p4d.cloud.slb-ds.com"
]
},
"legal": {
"legaltags": [
"opendes-public-usa-dataset-1"
],
"otherRelevantDataCountries": [
"US"
],
"status": "compliant"
},
"ancestry": {
"parents": [
"opendes:no:wksMapping-rawHavingMultipleWksCreated:<rawRecordLatestVersion>"
]
}
}
]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment