Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

API for Dataset/Dataset Member Allocation #244

Open
wants to merge 16 commits into
base: v1.x/staging
Choose a base branch
from
Open

API for Dataset/Dataset Member Allocation #244

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f16b592
Merge staging with dataset creation pr#60
Sep 21, 2021
bb132a9
Add method for dataset member creation, todo: remove printfs, comment…
Sep 23, 2021
9bfe59e
Remove commented code, remove printf, remove unnecessary unalloc
Sep 23, 2021
b7b9fb0
Refactor
Sep 24, 2021
3db3676
Refactor into c equiv of switch statment
Sep 27, 2021
30224dc
Fix syntax error
Sep 27, 2021
b6e426c
Remove comments
Sep 27, 2021
b56c424
Remove printf
Sep 27, 2021
c566cd5
More refactoring
Sep 27, 2021
f5717d5
Merge branch 'staging' of github.com:zowe/zowe-common-c into feature/…
Sep 27, 2021
807e2c1
Change function parameters to reuse inputs. Remove strtok. change saf…
Oct 11, 2021
19ae6ae
Merge branch 'staging' of github.com:zowe/zowe-common-c into feature/…
Oct 11, 2021
878357b
Merge branch 'staging' of github.com:zowe/zowe-common-c into feature/…
Oct 21, 2021
9b31fcd
Replace unprintable chars
Oct 26, 2021
c1c74c3
Add a call to dynallocUnallocDatasetByDDName
Oct 26, 2021
027d069
Merge pull request #1 from lchudinov/feature/dynunalloc
timgerstel Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
340 changes: 340 additions & 0 deletions c/datasetjson.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "bpxnet.h"
#include "logging.h"
#include "unixfile.h"
#include "errno.h"
#ifdef __ZOWE_OS_ZOS
#include "zos.h"
#endif
Expand Down Expand Up @@ -58,6 +59,11 @@ static char vsamCSITypes[5] = {'R', 'D', 'G', 'I', 'C'};

static char getRecordLengthType(char *dscb);
static int getMaxRecordLength(char *dscb);
static int getDSCB(char* datasetName, char* dscb, int bufferSize);
static int updateInputParmsProperty(JsonObject *object, int *configsCount, DynallocNewTextUnit *textUnit);
static void setTextUnitString(int size, char* data, int *configsCount, int key, DynallocNewTextUnit *textUnit);
static void setTextUnitCharOrInt(int size, int data, int *configsCount, int key, DynallocNewTextUnit *textUnit);
static void setTextUnitBool(int *configsCount, int key, DynallocNewTextUnit *textUnit);

typedef struct DatasetName_tag {
char value[44]; /* space-padded */
Expand Down Expand Up @@ -2244,6 +2250,340 @@ void respondWithHLQNames(HttpResponse *response, MetadataQueryCache *metadataQue
}


static int updateInputParmsProperty(JsonObject *object, int *configsCount, DynallocNewTextUnit *textUnit) {
JsonProperty *currentProp = jsonObjectGetFirstProperty(object);
//printf("Updating input parms");
Json *value;
while(currentProp != NULL){
value = jsonPropertyGetValue(currentProp);
char *valueString = jsonAsString(value);

if(valueString != NULL){
errno = 0;
int valueStrLen = strlen(valueString);
char *propString = jsonPropertyGetKey(currentProp);

if (!strcmp(propString, "dsorg")) {
setTextUnitCharOrInt(sizeof(short), !strcmp(valueString, "PS") ? DALDSORG_PS : DALDSORG_PO, configsCount, DALDSORG, textUnit);
} else if(!strcmp(propString, "blksz")) {
long toi = strtol(valueString, NULL, 0);
if(errno != ERANGE){
if (toi <= 0x7FF8 && toi >= 0) { //<-- If DASD, if tape, it can be 80000000
setTextUnitCharOrInt(sizeof(short), toi, configsCount, DALBLKSZ, textUnit);
} else if (toi <= 0x80000000){
setTextUnitCharOrInt(sizeof(long long), toi, configsCount, DALBLKSZ, textUnit);
}
}
} else if(!strcmp(propString, "lrecl")) {
long toi = strtol(valueString, NULL, 0);
if (errno != ERANGE){
if (toi == 0x8000) {
setTextUnitCharOrInt(sizeof(short), toi, configsCount, DALLRECL, textUnit);
}
else if (toi <= 0x7FF8 && toi >= 0) {
setTextUnitCharOrInt(sizeof(short), toi, configsCount, DALLRECL, textUnit);
}
}
} else if(!strcmp(propString, "volser")) {
if (valueStrLen <= VOLSER_SIZE){
setTextUnitString(VOLSER_SIZE, &(valueString)[0], configsCount, DALVLSER, textUnit);
}
} else if(!strcmp(propString, "recfm")) {
int setRECFM = 0;
if (indexOf(valueString, valueStrLen, 'A', 0) != -1){
setRECFM = setRECFM | DALRECFM_A;
}
if (indexOf(valueString, valueStrLen, 'B', 0) != -1){
setRECFM = setRECFM | DALRECFM_B;
}
if (indexOf(valueString, valueStrLen, 'V', 0) != -1){
setRECFM = setRECFM | DALRECFM_V;
}
if (indexOf(valueString, valueStrLen, 'F', 0) != -1){
setRECFM = setRECFM | DALRECFM_F;
}
if (indexOf(valueString, valueStrLen, 'U', 0) != -1){
setRECFM = setRECFM | DALRECFM_U;
}
setTextUnitCharOrInt(sizeof(char), setRECFM, configsCount, DALRECFM, textUnit);
} else if(!strcmp(propString, "space")) {
setTextUnitBool(configsCount, !strcmp(valueString, "cyl") ? DALCYL : DALTRK, textUnit);
} else if(!strcmp(propString, "blkln")) {
long toi = strtol(valueString, NULL, 0);
if (toi <= 0xFFFF || toi >= 0) {
if (errno != ERANGE){
setTextUnitCharOrInt(INT24_SIZE, toi, configsCount, DALBLKLN, textUnit);
}
}
} else if(!strcmp(propString, "status")) {
if (!strcmp(valueString, "OLD")){
setTextUnitCharOrInt(sizeof(char), DISP_OLD, configsCount, DALSTATS, textUnit);
} else if (!strcmp(valueString, "MOD")){
setTextUnitCharOrInt(sizeof(char), DISP_MOD, configsCount, DALSTATS, textUnit);
} else if (!strcmp(valueString, "SHARE")){
setTextUnitCharOrInt(sizeof(char), DISP_SHARE, configsCount, DALSTATS, textUnit);
} else {
setTextUnitCharOrInt(sizeof(char), DISP_NEW, configsCount, DALSTATS, textUnit);
}
} else if (!strcmp(propString, "ndisp")) {
if (!strcmp(valueString, "UNCATLG")){
setTextUnitCharOrInt(sizeof(char), DISP_UNCATLG, configsCount, DALNDISP, textUnit);
} else if (!strcmp(valueString, "DELETE")){
setTextUnitCharOrInt(sizeof(char), DISP_DELETE, configsCount, DALNDISP, textUnit);
} else if (!strcmp(valueString, "KEEP")){
setTextUnitCharOrInt(sizeof(char), DISP_KEEP, configsCount, DALNDISP, textUnit);
} else {
setTextUnitCharOrInt(sizeof(char), DISP_CATLG, configsCount, DALNDISP, textUnit);
}
} else if(!strcmp(propString, "unit")) {
setTextUnitString(valueStrLen, &(valueString)[0], configsCount, DALUNIT, textUnit);
} else if(!strcmp(propString, "sysout")) {
if (!strcmp(valueString, "default")){
for(int i = 0; i < *configsCount; i++) {
if (textUnit[i].key == DALSTATS || textUnit[i].key == DALNDISP) {
textUnit[i].type = TEXT_UNIT_NULL;
}
}
setTextUnitBool(configsCount, DALSYSOU, textUnit);
} else if (isalnum(valueString[0])) {
for(int i = 0; i < *configsCount; i++) {
if (textUnit[i].key == DALSTATS || textUnit[i].key == DALNDISP) {
textUnit[i].type == TEXT_UNIT_NULL;
}
}
setTextUnitCharOrInt(1, valueString[0], configsCount, DALSYSOU, textUnit);
}
} else if(!strcmp(propString, "spgnm")) {
if (valueStrLen <= CLASS_WRITER_SIZE){
setTextUnitString(valueStrLen, &(valueString)[0], configsCount, DALSPGNM, textUnit);
}
} else if(!strcmp(propString, "close") || !strcmp(propString, "dummy")) {
if (!strcmp(valueString, "true")){
setTextUnitBool(configsCount, !strcmp(propString, "close") ? DALCLOSE : DALDUMMY, textUnit);
}
} else if(!strcmp(propString, "dcbdd") || !strcmp(propString, "retdd")) {
if (valueStrLen <= DD_NAME_LEN){
setTextUnitString(DD_NAME_LEN, &(valueString)[0], configsCount, !strcmp(propString, "dcbdd") ? DALDCBDD : DALRTDDN, textUnit);
}
} else if(!strcmp(propString, "spin")) {
if (!strcmp(valueString, "UNALLOC")){
setTextUnitCharOrInt(1, SPIN_UNALLOC, configsCount, DALSPIN, textUnit);
} else if (!strcmp(valueString, "ENDJOB")){
setTextUnitCharOrInt(1, SPIN_ENDJOB, configsCount, DALSPIN, textUnit);
}
} else if(!strcmp(propString, "strcls")) {
if (valueStrLen <= CLASS_WRITER_SIZE){
setTextUnitString(8, &(valueString)[0], configsCount, DALSTCL, textUnit);
}
} else if(!strcmp(propString, "mngcls") || !strcmp(propString, "datacls")) {
if (valueStrLen <= CLASS_WRITER_SIZE){
setTextUnitString(CLASS_WRITER_SIZE, &(valueString)[0], configsCount, !strcmp(propString, "mngcls") ? DALMGCL : DALDACL, textUnit);
}
}
}
currentProp = jsonObjectGetNextProperty(currentProp);
}
}

static void setTextUnitString(int size, char* data, int *configsCount, int key, DynallocNewTextUnit *textUnit) {
textUnit[*configsCount].size = size;
textUnit[*configsCount].type = TEXT_UNIT_STRING;
textUnit[*configsCount].key = key;
textUnit[*configsCount].data.string = data;
(*configsCount)++;
}

static void setTextUnitCharOrInt(int size, int data, int *configsCount, int key, DynallocNewTextUnit *textUnit) {
textUnit[*configsCount].size = size;
textUnit[*configsCount].type = TEXT_UNIT_CHARINT;
textUnit[*configsCount].key = key;
textUnit[*configsCount].data.number = data;
(*configsCount)++;
}

static void setTextUnitBool(int *configsCount, int key, DynallocNewTextUnit *textUnit) {
textUnit[*configsCount].type = TEXT_UNIT_BOOLEAN;
textUnit[*configsCount].key = key;
(*configsCount)++;
}

static int getDSCB(char* datasetName, char* dscb, int bufferSize){
if (bufferSize < INDEXED_DSCB){
zowelog(NULL, LOG_COMP_RESTDATASET, ZOWE_LOG_WARNING,
"DSCB of size %d is too small, must be at least %d", bufferSize, INDEXED_DSCB);
return 1;
}
Volser volser = {0};

DatasetName dsn = {0};
memcpy(dsn.value, datasetName, DATASET_PATH_MAX);
lchudinov marked this conversation as resolved.
Show resolved Hide resolved

int volserSuccess = getVolserForDataset(&dsn, &volser);
if(!volserSuccess){
int rc = obtainDSCB1(dsn.value, sizeof(dsn.value),
volser.value, sizeof(volser.value),
dscb);
if (rc == 0){
if (DSCB_TRACE){
zowelog(NULL, LOG_COMP_RESTDATASET, ZOWE_LOG_WARNING, "DSCB for %.*s found\n", sizeof(dsn.value), dsn.value);
dumpbuffer(dscb,INDEXED_DSCB);
}
}
return 0;
}
else {
return 1;
}
}

void newDatasetMember(HttpResponse* response, char* datasetPath, char* memberName) {
lchudinov marked this conversation as resolved.
Show resolved Hide resolved
char dscb[INDEXED_DSCB] = {0};
int bufferSize = sizeof(dscb);
if (getDSCB(datasetPath, dscb, bufferSize) != 0) {
respondWithJsonError(response, "Error decoding dataset", 400, "Bad Request");
}
else {
if (!isPartionedDataset(dscb)) {
respondWithJsonError(response, "Dataset must be PDS/E", 400, "Bad Request");
}
else {
char *overwriteParam = getQueryParam(response->request,"overwrite");
int overwrite = !strcmp(overwriteParam, "true") ? TRUE : FALSE;
char fullPath[DATASET_MEMBER_MAXLEN + 1] = {0};
//concatenates dataset name with member name
char *dsName = strtok(datasetPath, " ");
lchudinov marked this conversation as resolved.
Show resolved Hide resolved
char *memName = strtok(memberName, " ");
lchudinov marked this conversation as resolved.
Show resolved Hide resolved
snprintf(fullPath, DATASET_MEMBER_MAXLEN + 1, "//'%s(%s)'", dsName, memName);
FILE* memberExists = fopen(fullPath,"r");
if (memberExists && overwrite != TRUE) {//Member already exists and overwrite wasn't specified
if (fclose(memberExists) != 0) {
zowelog(NULL, LOG_COMP_RESTDATASET, ZOWE_LOG_WARNING, "ERROR CLOSING FILE");
respondWithJsonError(response, "Could not close dataset", 500, "Internal Server Error");
}
else {
respondWithJsonError(response, "Member already exists and overwrite not specified", 400, "Bad Request");
}
}
else { // Member doesn't exist
if (memberExists) {
if (fclose(memberExists) != 0) {
zowelog(NULL, LOG_COMP_RESTDATASET, ZOWE_LOG_WARNING, "ERROR CLOSING FILE");
respondWithJsonError(response, "Could not close dataset", 500, "Internal Server Error");
return;
}
}
FILE* newMember = fopen(fullPath, "w");
if (!newMember){
respondWithJsonError(response, "Bad dataset name", 400, "Bad Request");
return;
}
if (fclose(newMember) == 0){
response200WithMessage(response, "Successfully created member");
}
else {
zowelog(NULL, LOG_COMP_RESTDATASET, ZOWE_LOG_WARNING, "ERROR CLOSING FILE");
respondWithJsonError(response, "Could not close dataset", 500, "Internal Server Error");
}
}
}
}
}

void newDataset(HttpResponse* response, char* absolutePath, int jsonMode){
#ifdef __ZOWE_OS_ZOS
HttpRequest *request = response->request;
if (!isDatasetPathValid(absolutePath)) {
respondWithError(response, HTTP_STATUS_BAD_REQUEST, "Invalid dataset name");
return;
}

DatasetName datasetName;
DatasetMemberName memberName;
extractDatasetAndMemberName(absolutePath, &datasetName, &memberName);
DynallocDatasetName daDatasetName;
DynallocMemberName daMemberName;
memcpy(daDatasetName.name, datasetName.value, sizeof(daDatasetName.name));
memcpy(daMemberName.name, memberName.value, sizeof(daMemberName.name));
DynallocDDName daDDName = {.name = "????????"};

int daRC = RC_DYNALLOC_OK, daSysReturnCode = 0, daSysReasonCode = 0;

bool isMemberEmpty = IS_DAMEMBER_EMPTY(daMemberName);

if(!isMemberEmpty){
return newDatasetMember(response, daDatasetName.name, daMemberName.name);
}

int configsCount = 0;
DynallocNewTextUnit textUnits[TOTAL_TEXT_UNITS];
setTextUnitString(DATASET_NAME_LEN, &datasetName.value[0], &configsCount, DALDSNAM, &textUnits[0]);
setTextUnitString(DD_NAME_LEN, "MVD00000", &configsCount, DALDDNAM, &textUnits[0]);

if (jsonMode != TRUE) { /*TODO add support for updating files with raw bytes instead of JSON*/
respondWithError(response, HTTP_STATUS_BAD_REQUEST,"Cannot update file without JSON formatted record request");
return;
}

FileInfo info;

char *contentBody = request->contentBody;
int bodyLength = strlen(contentBody);

char *convertedBody = safeMalloc(bodyLength*4,"writeDatasetConvert");
int conversionBufferLength = bodyLength*4;
int translationLength;
int outCCSID = NATIVE_CODEPAGE;
int reasonCode;

int returnCode = convertCharset(contentBody,
bodyLength,
CCSID_UTF_8,
CHARSET_OUTPUT_USE_BUFFER,
&convertedBody,
conversionBufferLength,
outCCSID,
NULL,
&translationLength,
&reasonCode);

if(returnCode == 0) {

ShortLivedHeap *slh = makeShortLivedHeap(0x10000,0x10);
char errorBuffer[2048];
Json *json = jsonParseUnterminatedString(slh,
convertedBody, translationLength,
errorBuffer, sizeof(errorBuffer));
if (json) {
if (jsonIsObject(json)){
JsonObject * jsonObject = jsonAsObject(json);
updateInputParmsProperty(jsonObject, &configsCount, &textUnits[0]);
}
} else {
respondWithError(response, HTTP_STATUS_BAD_REQUEST, "Invalid JSON request body");
}
}

returnCode = dynallocNewDataset(&reasonCode, &textUnits[0], configsCount);
int ddNumber = 1;
char buffer[DD_NAME_LEN + 1];
while (reasonCode==0x4100000 && ddNumber < 100000) {
sprintf(buffer, "MVD%05d", ddNumber);
int ddconfig = 1;
setTextUnitString(DD_NAME_LEN, buffer, &ddconfig, DALDDNAM, &textUnits[0]);
returnCode = dynallocNewDataset(&reasonCode, &textUnits[0], configsCount);
ddNumber++;
}
if (returnCode) {
respondWithError(response, HTTP_STATUS_INTERNAL_SERVER_ERROR, "Unable to allocate a DD for ACB");
return;
}
else {
response200WithMessage(response, "Successfully created dataset");
return;
}
#endif
}

#endif /* not METTLE - the whole module */


Expand Down
Loading