Update aaf client module

Remove aaf submodules and update aaf client
module.

Issue-id: AAF-21
Change-Id: I750ec9e26596652a142b014db94aabd082880130
Signed-off-by: sg481n <sg481n@att.com>

11 files changed, 0 insertions, 1115 deletions

diff --git a/authz-cmd/src/main/java/com/att/cmd/role/CreateDelete.java b/authz-cmd/src/main/java/com/att/cmd/role/CreateDelete.java
deleted file mode 100644
index 450682d0..00000000
--- a/authz-cmd/src/main/java/com/att/cmd/role/CreateDelete.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************

- * ============LICENSE_START====================================================

- * * org.onap.aaf

- * * ===========================================================================

- * * Copyright © 2017 AT&T Intellectual Property. 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.

- * * ============LICENSE_END====================================================

- * *

- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

- * *

- ******************************************************************************/

-package com.att.cmd.role;

-

-import com.att.aft.dme2.internal.jetty.http.HttpStatus;

-import com.att.cadi.CadiException;

-import com.att.cadi.LocatorException;

-import com.att.cadi.client.Future;

-import com.att.cadi.client.Rcli;

-import com.att.cadi.client.Retryable;

-import com.att.cmd.AAFcli;

-import com.att.cmd.Cmd;

-import com.att.cmd.Param;

-import com.att.cssa.rserv.HttpMethods;

-import com.att.inno.env.APIException;

-

-import aaf.v2_0.RoleRequest;

-

-/**

- * 

- *

- */

-public class CreateDelete extends Cmd {

-	private static final String ROLE_PATH = "/authz/role";

-	private final static String[] options = {"create","delete"};

-	public CreateDelete(Role parent) {

-		super(parent,null, 

-				new Param(optionsToString(options),true),

-				new Param("name",true)); 

-	}

-

-	@Override

-	public int _exec(final int index, final String ... args) throws CadiException, APIException, LocatorException {

-		return same(new Retryable<Integer>() {

-			@Override

-			public Integer code(Rcli<?> client) throws CadiException, APIException {

-				int idx = index;

-				String action = args[idx++];

-				int option = whichOption(options, action);

-		

-				RoleRequest rr = new RoleRequest();

-				rr.setName(args[idx++]);

-		

-				// Set Start/End commands

-				setStartEnd(rr);

-				

-				Future<RoleRequest> fp = null;

-				String verb = null;

-				int rv;

-				switch(option) {

-					case 0:

-						fp = client.create(

-							ROLE_PATH,

-							getDF(RoleRequest.class),

-							rr

-							);

-						verb = "Create";

-						break;

-					case 1:

-						// Send "Force" if set

-						setQueryParamsOn(client);

-						fp = client.delete(

-								ROLE_PATH, // +args[idx++], 

-								getDF(RoleRequest.class),

-								rr

-								);

-						verb = "Delete";

-						break;

-					default: // note, if not an option, whichOption throws Exception

-						break;

-						

-				}

-				boolean rolesSupplied = (args.length>idx);

-				if(fp.get(AAFcli.timeout())) {

-					rv=fp.code();

-					pw().print(verb);

-					pw().println("d Role");

-					if(rolesSupplied) {

-						for(;args.length>idx;++idx ) {

-							try {

-								if(201!=(rv=((Role)parent)._exec(0,new String[] {"user","add",rr.getName(),args[idx]}))) {

-									rv = HttpStatus.PARTIAL_CONTENT_206;

-								}

-							} catch (LocatorException e) {

-								throw new CadiException(e);

-							}

-						}

-					}

-				} else {

-					if((rv=fp.code())==202) {

-						pw().print("Role ");

-						pw().print(verb);

-						pw().println(" Accepted, but requires Approvals before actualizing");

-					} else {

-						error(fp);

-					}

-				}

-				return rv;

-			}

-		});

-	}

-

-	@Override

-	public void detailedHelp(int indent, StringBuilder sb) {

-		detailLine(sb,indent,"Create OR Delete a Role");

-		detailLine(sb,indent+2,"name - Name of Role to create");

-		api(sb,indent,HttpMethods.POST,"authz/role",RoleRequest.class,true);

-		api(sb,indent,HttpMethods.DELETE,"authz/role",RoleRequest.class,false);

-	}

-

-}

diff --git a/authz-cmd/src/main/java/com/att/cmd/role/Describe.java b/authz-cmd/src/main/java/com/att/cmd/role/Describe.java
deleted file mode 100644
index 52eaac75..00000000
--- a/authz-cmd/src/main/java/com/att/cmd/role/Describe.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************

- * ============LICENSE_START====================================================

- * * org.onap.aaf

- * * ===========================================================================

- * * Copyright © 2017 AT&T Intellectual Property. 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.

- * * ============LICENSE_END====================================================

- * *

- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

- * *

- ******************************************************************************/

-package com.att.cmd.role;

-

-import com.att.cadi.CadiException;

-import com.att.cadi.LocatorException;

-import com.att.cadi.client.Future;

-import com.att.cadi.client.Rcli;

-import com.att.cadi.client.Retryable;

-import com.att.cmd.AAFcli;

-import com.att.cmd.Cmd;

-import com.att.cmd.Param;

-import com.att.cssa.rserv.HttpMethods;

-import com.att.inno.env.APIException;

-

-import aaf.v2_0.RoleRequest;

-

-public class Describe extends Cmd {

-	private static final String ROLE_PATH = "/authz/role";

-	public Describe(Role parent) {

-		super(parent,"describe", 

-				new Param("name",true),

-				new Param("description",true)); 

-	}

-

-	@Override

-	public int _exec(final int index, final String ... args) throws CadiException, APIException, LocatorException {

-		return same(new Retryable<Integer>() {

-			@Override

-			public Integer code(Rcli<?> client) throws CadiException, APIException {

-				int idx = index;

-				String role = args[idx++];

-				StringBuilder desc = new StringBuilder();

-				while (idx < args.length) {

-					desc.append(args[idx++] + ' ');

-				}

-		

-				RoleRequest rr = new RoleRequest();

-				rr.setName(role);

-				rr.setDescription(desc.toString());

-		

-				// Set Start/End commands

-				setStartEnd(rr);

-				

-				Future<RoleRequest> fp = null;

-				int rv;

-

-				fp = client.update(

-					ROLE_PATH,

-					getDF(RoleRequest.class),

-					rr

-					);

-

-				if(fp.get(AAFcli.timeout())) {

-					rv=fp.code();

-					pw().println("Description added to role");

-				} else {

-					if((rv=fp.code())==202) {

-						pw().print("Adding description");

-						pw().println(" Accepted, but requires Approvals before actualizing");

-					} else {

-						error(fp);

-					}

-				}

-				return rv;

-			}

-		});

-	}

-

-	@Override

-	public void detailedHelp(int indent, StringBuilder sb) {

-		detailLine(sb,indent,"Add a description to a role");

-		api(sb,indent,HttpMethods.PUT,"authz/role",RoleRequest.class,true);

-	}

-}

diff --git a/authz-cmd/src/main/java/com/att/cmd/role/List.java b/authz-cmd/src/main/java/com/att/cmd/role/List.java
deleted file mode 100644
index 8980d72c..00000000
--- a/authz-cmd/src/main/java/com/att/cmd/role/List.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************

- * ============LICENSE_START====================================================

- * * org.onap.aaf

- * * ===========================================================================

- * * Copyright © 2017 AT&T Intellectual Property. 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.

- * * ============LICENSE_END====================================================

- * *

- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

- * *

- ******************************************************************************/

-package com.att.cmd.role;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.Comparator;

-import java.util.HashMap;

-

-import com.att.cadi.CadiException;

-import com.att.cadi.client.Future;

-import com.att.cadi.client.Rcli;

-import com.att.cadi.client.Retryable;

-import com.att.cmd.AAFcli;

-import com.att.cmd.BaseCmd;

-import com.att.inno.env.APIException;

-

-import aaf.v2_0.Nss;

-import aaf.v2_0.Pkey;

-import aaf.v2_0.Roles;

-

-

-

-public class List extends BaseCmd<Role> {

-	private static final String LIST_ROLES_BY_NAME = "list roles for role";

-

-	public List(Role parent) {

-		super(parent,"list");

-		cmds.add(new ListByUser(this));

-		cmds.add(new ListByRole(this));

-		cmds.add(new ListByNS(this));

-		cmds.add(new ListByNameOnly(this));

-		cmds.add(new ListByPerm(this));

-		cmds.add(new ListActivity(this));

-	}

-	

-	// Package Level on purpose

-	abstract class ListRoles extends Retryable<Integer> {

-		protected int list(Future<Roles> fp,Rcli<?> client, String header) throws APIException, CadiException {

-			if(fp.get(AAFcli.timeout())) {

-				Future<Nss> fn = null;

-				ArrayList<String> roleNss = null;

-				ArrayList<String> permNss = null;

-				if (aafcli.isDetailed()) {

-					roleNss = new ArrayList<String>();

-					permNss = new ArrayList<String>();

-					for(aaf.v2_0.Role p : fp.value.getRole()) {

-						String roleNs = p.getName();

-						do {

-							roleNs = p.getName().substring(0,roleNs.lastIndexOf('.'));

-							fn = client.read("/authz/nss/"+roleNs,getDF(Nss.class));

-						} while (!fn.get(AAFcli.timeout()));

-						roleNss.add(roleNs);

-		

-						for(Pkey perm : p.getPerms()) {

-							if (perm.getType().contains(roleNs))

-								permNss.add(roleNs);

-							else {

-								Future<Nss> fpn = null;

-								String permType = perm.getType();

-								String permNs = permType;

-								do {

-									permNs = permType.substring(0,permNs.lastIndexOf('.'));

-									fpn = client.read("/authz/nss/"+permNs,getDF(Nss.class));

-								} while (!fpn.get(AAFcli.timeout()));

-								permNss.add(permNs);

-							}

-						}

-					}

-				}

-				report(fp,roleNss,permNss,null,header);

-			} else {

-				error(fp);

-			}

-			return fp.code();

-		}

-	}

-

-	private final static String roleFormat = "%-50s\n";

-	

-	private static final Comparator<aaf.v2_0.Role> roleCompare = new Comparator<aaf.v2_0.Role>() {

-		@Override

-		public int compare(aaf.v2_0.Role a, aaf.v2_0.Role b) {

-			return a.getName().compareTo(b.getName());

-		}

-	};

-	public void report(Future<Roles> fp, ArrayList<String> roleNss, ArrayList<String> permNss,

-			HashMap<String,Boolean> expiredMap, String ... str) {

-		reportHead(str);

-		if (fp != null && aafcli.isDetailed() && str[0].toLowerCase().contains(LIST_ROLES_BY_NAME)) {

-			String description = fp.value.getRole().get(0).getDescription();

-			if (description == null) description = "";

-			reportColHead("%-80s\n","Description: " + description);

-		} 			

-

-		if(fp==null) {

-			pw().println("<No Roles Found>");

-		} else if (aafcli.isDetailed()){

-			String permFormat = "   %-20s %-15s %-30s %-15s\n";

-			String fullFormat = roleFormat+permFormat;

-			reportColHead(fullFormat,"[ROLE NS].Name","PERM NS","Type","Instance","Action");

-			Collections.sort(fp.value.getRole(),roleCompare);

-			for(aaf.v2_0.Role p : fp.value.getRole()) {

-				String roleNs = roleNss.remove(0);

-				pw().format(roleFormat, "["+roleNs+"]"+p.getName().substring(roleNs.length()));

-				for(Pkey perm : p.getPerms()) {

-					String permNs = permNss.remove(0);

-					pw().format(permFormat, 

-							permNs,

-							perm.getType().substring(permNs.length()+1),

-							perm.getInstance(),

-							perm.getAction());

-				}

-			}

-		} else {

-			String permFormat = "   %-30s %-30s %-15s\n";

-			String fullFormat = roleFormat+permFormat;

-			reportColHead(fullFormat,"ROLE Name","PERM Type","Instance","Action");

-			Collections.sort(fp.value.getRole(),roleCompare);

-			for(aaf.v2_0.Role p : fp.value.getRole()) {

-				if (expiredMap != null) {

-					String roleName = p.getName();

-					Boolean b = expiredMap.get(roleName);

-					if (b != null && b.booleanValue())

-						pw().format(roleFormat, roleName+"*");

-					else {

-						pw().format(roleFormat, roleName);

-						for(Pkey perm : p.getPerms()) {

-							pw().format(permFormat, 

-									perm.getType(),

-									perm.getInstance(),

-									perm.getAction());

-						}

-					}

-				} else {

-					pw().format(roleFormat, p.getName());

-					for(Pkey perm : p.getPerms()) {

-						pw().format(permFormat, 

-								perm.getType(),

-								perm.getInstance(),

-								perm.getAction());

-					}

-				}

-			}

-		}

-	}

-

-}

diff --git a/authz-cmd/src/main/java/com/att/cmd/role/ListActivity.java b/authz-cmd/src/main/java/com/att/cmd/role/ListActivity.java
deleted file mode 100644
index dd5a0c64..00000000
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListActivity.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************

- * ============LICENSE_START====================================================

- * * org.onap.aaf

- * * ===========================================================================

- * * Copyright © 2017 AT&T Intellectual Property. 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.

- * * ============LICENSE_END====================================================

- * *

- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

- * *

- ******************************************************************************/

-package com.att.cmd.role;

-

-import com.att.cadi.CadiException;

-import com.att.cadi.LocatorException;

-import com.att.cadi.client.Future;

-import com.att.cadi.client.Rcli;

-import com.att.cadi.client.Retryable;

-import com.att.cmd.AAFcli;

-import com.att.cmd.Cmd;

-import com.att.cmd.Param;

-import com.att.cssa.rserv.HttpMethods;

-import com.att.inno.env.APIException;

-

-import aaf.v2_0.History;

-

-/**

- *

- */

-public class ListActivity extends Cmd {

-	private static final String HEADER = "List Activity of Role";

-

-	public ListActivity(List parent) {

-		super(parent,"activity", 

-				new Param("name",true));

-	}

-

-	@Override

-	public int _exec(int _idx, final String ... args) throws CadiException, APIException, LocatorException {

-	        int idx = _idx;

-		final String role = args[idx++];

-		return same(new Retryable<Integer>() {

-			@Override

-			public Integer code(Rcli<?> client) throws CadiException, APIException {

-				Future<History> fp = client.read(

-						"/authz/hist/role/"+role, 

-						getDF(History.class)

-						);

-				if(fp.get(AAFcli.timeout())) {

-					activity(fp.value,HEADER + " [ " + role + " ]");

-				} else {

-					error(fp);

-				}

-				return fp.code();

-			}

-		});

-	}

-

-	@Override

-	public void detailedHelp(int indent, StringBuilder sb) {

-		detailLine(sb,indent,HEADER);

-		api(sb,indent,HttpMethods.GET,"authz/hist/role/<role>",History.class,true);

-	}

-}

diff --git a/authz-cmd/src/main/java/com/att/cmd/role/ListByNS.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByNS.java
deleted file mode 100644
index 87edee69..00000000
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByNS.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************

- * ============LICENSE_START====================================================

- * * org.onap.aaf

- * * ===========================================================================

- * * Copyright © 2017 AT&T Intellectual Property. 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.

- * * ============LICENSE_END====================================================

- * *

- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

- * *

- ******************************************************************************/

-package com.att.cmd.role;

-

-import com.att.cadi.CadiException;

-import com.att.cadi.LocatorException;

-import com.att.cadi.client.Future;

-import com.att.cadi.client.Rcli;

-import com.att.cmd.Cmd;

-import com.att.cmd.Param;

-import com.att.cssa.rserv.HttpMethods;

-import com.att.inno.env.APIException;

-

-import aaf.v2_0.Roles;

-

-/**

- * Return Roles by NS

- * 

- *

- */

-public class ListByNS extends Cmd {

-	private static final String HEADER = "List Roles by NS ";

-	

-	public ListByNS(List parent) {

-		super(parent,"ns", 

-				new Param("name",true)); 

-	}

-

-	@Override

-	public int _exec( int idx, final String ... args) throws CadiException, APIException, LocatorException {

-		final String ns=args[idx];

-

-		return same(((List)parent).new ListRoles() {

-			@Override

-			public Integer code(Rcli<?> client) throws CadiException, APIException {

-				Future<Roles> fp = client.read(

-						"/authz/roles/ns/"+ns, 

-						getDF(Roles.class)

-						);

-				return list(fp,client, HEADER+"["+ns+"]");

-			}

-		});

-	}

-	

-	@Override

-	public void detailedHelp(int indent, StringBuilder sb) {

-		detailLine(sb,indent,HEADER);

-		api(sb,indent,HttpMethods.GET,"authz/roles/name/<ns>",Roles.class,true);

-	}

-

-

-}

diff --git a/authz-cmd/src/main/java/com/att/cmd/role/ListByNameOnly.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByNameOnly.java
deleted file mode 100644
index 912be45c..00000000
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByNameOnly.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************

- * ============LICENSE_START====================================================

- * * org.onap.aaf

- * * ===========================================================================

- * * Copyright © 2017 AT&T Intellectual Property. 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.

- * * ============LICENSE_END====================================================

- * *

- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

- * *

- ******************************************************************************/

-package com.att.cmd.role;

-

-import com.att.cadi.CadiException;

-import com.att.cadi.LocatorException;

-import com.att.cadi.client.Future;

-import com.att.cadi.client.Rcli;

-import com.att.cmd.Cmd;

-import com.att.cmd.Param;

-import com.att.cssa.rserv.HttpMethods;

-import com.att.inno.env.APIException;

-

-import aaf.v2_0.Roles;

-

-/**

- * Return Roles by NS

- * 

- *

- */

-public class ListByNameOnly extends Cmd {

-	private static final String HEADER = "List Roles by Name ";

-	

-	public ListByNameOnly(List parent) {

-		super(parent,"name", 

-				new Param("name",true)); 

-	}

-

-	@Override

-	public int _exec( int idx, final String ... args) throws CadiException, APIException, LocatorException {

-		final String name=args[idx];

-

-		return same(((List)parent).new ListRoles() {

-			@Override

-			public Integer code(Rcli<?> client) throws CadiException, APIException {

-				Future<Roles> fp = client.read(

-						"/authz/roles/name/"+name, 

-						getDF(Roles.class)

-						);

-				return list(fp,client, HEADER+"["+name+"]");

-			}

-		});

-	}

-	

-	@Override

-	public void detailedHelp(int indent, StringBuilder sb) {

-		detailLine(sb,indent,HEADER);

-		api(sb,indent,HttpMethods.GET,"authz/roles/name/<name>",Roles.class,true);

-	}

-

-

-}

diff --git a/authz-cmd/src/main/java/com/att/cmd/role/ListByPerm.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByPerm.java
deleted file mode 100644
index f57c542b..00000000
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByPerm.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************

- * ============LICENSE_START====================================================

- * * org.onap.aaf

- * * ===========================================================================

- * * Copyright © 2017 AT&T Intellectual Property. 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.

- * * ============LICENSE_END====================================================

- * *

- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

- * *

- ******************************************************************************/

-package com.att.cmd.role;

-

-import com.att.cadi.CadiException;

-import com.att.cadi.LocatorException;

-import com.att.cadi.client.Future;

-import com.att.cadi.client.Rcli;

-import com.att.cmd.Cmd;

-import com.att.cmd.Param;

-import com.att.cssa.rserv.HttpMethods;

-import com.att.inno.env.APIException;

-

-import aaf.v2_0.Roles;

-

-/**

- * Return Roles by NS

- * 

- *

- */

-public class ListByPerm extends Cmd {

-	private static final String HEADER = "List Roles by Perm ";

-	

-	public ListByPerm(List parent) {

-		super(parent,"perm", 

-				new Param("type",true),

-				new Param("instance", true),

-				new Param("action", true)); 

-	}

-

-	@Override

-	public int _exec(int _idx, final String ... args) throws CadiException, APIException, LocatorException {

-	        int idx = _idx;

-		final String type=args[idx];

-		final String instance=args[++idx];

-		final String action=args[++idx];

-

-		return same(((List)parent).new ListRoles() {

-			@Override

-			public Integer code(Rcli<?> client) throws CadiException, APIException {

-

-				Future<Roles> fp = client.read(

-						"/authz/roles/perm/"+type+'/'+instance+'/'+action, 

-						getDF(Roles.class)

-						);

-				return list(fp,client, HEADER+type+'|'+instance+'|'+action);

-			}

-		});

-	}

-	

-	@Override

-	public void detailedHelp(int indent, StringBuilder sb) {

-		detailLine(sb,indent,HEADER);

-		api(sb,indent,HttpMethods.GET,"authz/roles/user/<user>",Roles.class,true);

-	}

-

-

-}

diff --git a/authz-cmd/src/main/java/com/att/cmd/role/ListByRole.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByRole.java
deleted file mode 100644
index c75bdf43..00000000
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByRole.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************

- * ============LICENSE_START====================================================

- * * org.onap.aaf

- * * ===========================================================================

- * * Copyright © 2017 AT&T Intellectual Property. 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.

- * * ============LICENSE_END====================================================

- * *

- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

- * *

- ******************************************************************************/

-package com.att.cmd.role;

-

-import com.att.cadi.CadiException;

-import com.att.cadi.LocatorException;

-import com.att.cadi.client.Future;

-import com.att.cadi.client.Rcli;

-import com.att.cmd.Cmd;

-import com.att.cmd.Param;

-import com.att.cssa.rserv.HttpMethods;

-import com.att.inno.env.APIException;

-

-import aaf.v2_0.Roles;

-

-/**

- * 

- *

- */

-public class ListByRole extends Cmd {

-	private static final String HEADER="List Roles for Role";

-	

-	public ListByRole(List parent) {

-		super(parent,"role", 

-				new Param("role",true)); 

-	}

-

-	@Override

-	public int _exec(final int idx, final String ... args) throws CadiException, APIException, LocatorException {

-		return same(((List)parent).new ListRoles() {

-			@Override

-			public Integer code(Rcli<?> client) throws CadiException, APIException {

-				String role=args[idx];	

-				Future<Roles> fp = client.read(

-						"/authz/roles/"+role, 

-						getDF(Roles.class) 

-						);

-				return list(fp,client,HEADER+"["+role+"]");

-			}

-		});

-	}

-	

-	@Override

-	public void detailedHelp(int indent, StringBuilder sb) {

-		detailLine(sb,indent,HEADER);

-		api(sb,indent,HttpMethods.GET,"authz/roles/<role>",Roles.class,true);

-	}

-

-}

diff --git a/authz-cmd/src/main/java/com/att/cmd/role/ListByUser.java b/authz-cmd/src/main/java/com/att/cmd/role/ListByUser.java
deleted file mode 100644
index 08466a67..00000000
--- a/authz-cmd/src/main/java/com/att/cmd/role/ListByUser.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************

- * ============LICENSE_START====================================================

- * * org.onap.aaf

- * * ===========================================================================

- * * Copyright © 2017 AT&T Intellectual Property. 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.

- * * ============LICENSE_END====================================================

- * *

- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

- * *

- ******************************************************************************/

-package com.att.cmd.role;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-

-import com.att.cadi.CadiException;

-import com.att.cadi.LocatorException;

-import com.att.cadi.client.Future;

-import com.att.cadi.client.Rcli;

-import com.att.cadi.client.Retryable;

-import com.att.cmd.AAFcli;

-import com.att.cmd.Cmd;

-import com.att.cmd.Param;

-import com.att.cssa.rserv.HttpMethods;

-import com.att.inno.env.APIException;

-import com.att.inno.env.util.Chrono;

-

-import aaf.v2_0.Nss;

-import aaf.v2_0.Pkey;

-import aaf.v2_0.Roles;

-import aaf.v2_0.Users;

-

-/**

- * p

- *

- */

-public class ListByUser extends Cmd {

-	private static final String HEADER = "List Roles for User ";

-	

-	public ListByUser(List parent) {

-		super(parent,"user", 

-				new Param("id",true)); 

-	}

-

-	@Override

-	public int _exec( int idx, final String ... args) throws CadiException, APIException, LocatorException {

-		String user=args[idx];

-		String realm = getOrgRealm();

-		final String fullUser;

-		if (user.indexOf('@') < 0 && realm != null) {

-		    fullUser = user + '@' + realm;

-		} else {

-		    fullUser = user;

-		}

-

-		return same(new Retryable<Integer>() {

-			@Override

-			public Integer code(Rcli<?> client) throws CadiException, APIException {

-

-				Future<Roles> fp = client.read(

-						"/authz/roles/user/"+fullUser, 

-						getDF(Roles.class)

-						);

-				if(fp.get(AAFcli.timeout())) {

-					Future<Nss> fn = null;

-					ArrayList<String> roleNss = null;

-					ArrayList<String> permNss = null;

-					HashMap<String, Boolean> expiredMap = new HashMap<String, Boolean>();

-					if (aafcli.isDetailed()) {

-						roleNss = new ArrayList<String>();

-						permNss = new ArrayList<String>();

-						for(aaf.v2_0.Role p : fp.value.getRole()) {

-							String roleNs = p.getName();

-							do {

-								roleNs = p.getName().substring(0,roleNs.lastIndexOf('.'));

-								fn = client.read("/authz/nss/"+roleNs,getDF(Nss.class));

-							} while (!fn.get(AAFcli.timeout()));

-							roleNss.add(roleNs);

-	

-							for(Pkey perm : p.getPerms()) {

-								if (perm.getType().contains(roleNs)) {

-								    permNss.add(roleNs);

-								} else {

-									Future<Nss> fpn = null;

-									String permType = perm.getType();

-									String permNs = permType;

-									do {

-										permNs = permType.substring(0,permNs.lastIndexOf('.'));

-										fpn = client.read("/authz/nss/"+permNs,getDF(Nss.class));

-									} while (!fpn.get(AAFcli.timeout()));

-									permNss.add(permNs);

-								}

-							}

-						}

-					}

-					

-					if (fp.value != null) {

-						for(aaf.v2_0.Role p : fp.value.getRole()) {

-							Future<Users> fu = client.read(

-									"/authz/userRole/"+fullUser+"/"+p.getName(), 

-									getDF(Users.class)

-									);

-							if (fu.get(5000)) {

-								if(fu.value != null) {

-								    for (Users.User u : fu.value.getUser()) {

-								    	if(u.getExpires().normalize().compare(Chrono.timeStamp().normalize()) > 0) {

-								    		expiredMap.put(p.getName(), new Boolean(false));

-								    	} else {

-								    		expiredMap.put(p.getName(), new Boolean(true));

-								    	}

-								    }

-								}

-							}

-						}	

-					}

-					

-					((List)parent).report(fp,roleNss,permNss,expiredMap,HEADER,fullUser);

-				} else {

-					error(fp);

-				}

-				return fp.code();

-			}

-		});

-	}

-	

-	@Override

-	public void detailedHelp(int indent, StringBuilder sb) {

-		detailLine(sb,indent,HEADER);

-		api(sb,indent,HttpMethods.GET,"authz/roles/user/<user>",Roles.class,true);

-	}

-

-

-}

diff --git a/authz-cmd/src/main/java/com/att/cmd/role/Role.java b/authz-cmd/src/main/java/com/att/cmd/role/Role.java
deleted file mode 100644
index 288cd11c..00000000
--- a/authz-cmd/src/main/java/com/att/cmd/role/Role.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************

- * ============LICENSE_START====================================================

- * * org.onap.aaf

- * * ===========================================================================

- * * Copyright © 2017 AT&T Intellectual Property. 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.

- * * ============LICENSE_END====================================================

- * *

- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

- * *

- ******************************************************************************/

-package com.att.cmd.role;

-

-import com.att.cmd.AAFcli;

-import com.att.cmd.BaseCmd;

-import com.att.inno.env.APIException;

-

-public class Role extends BaseCmd<Role> {

-	public List list;

-

-	public Role(AAFcli aafcli) throws APIException {

-		super(aafcli, "role");

-		cmds.add(new CreateDelete(this));

-//		cmds.add(new Delete(this));

-		cmds.add(new User(this));

-		cmds.add(new Describe(this));

-		cmds.add(list = new List(this));

-	}

-}

diff --git a/authz-cmd/src/main/java/com/att/cmd/role/User.java b/authz-cmd/src/main/java/com/att/cmd/role/User.java
deleted file mode 100644
index 97689131..00000000
--- a/authz-cmd/src/main/java/com/att/cmd/role/User.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************

- * ============LICENSE_START====================================================

- * * org.onap.aaf

- * * ===========================================================================

- * * Copyright © 2017 AT&T Intellectual Property. 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.

- * * ============LICENSE_END====================================================

- * *

- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

- * *

- ******************************************************************************/

-package com.att.cmd.role;

-

-import com.att.cadi.CadiException;

-import com.att.cadi.LocatorException;

-import com.att.cadi.client.Future;

-import com.att.cadi.client.Rcli;

-import com.att.cadi.client.Retryable;

-import com.att.cmd.AAFcli;

-import com.att.cmd.Cmd;

-import com.att.cmd.Param;

-import com.att.cssa.rserv.HttpMethods;

-import com.att.inno.env.APIException;

-

-import aaf.v2_0.UserRoleRequest;

-

-/**

- * p

- *

- */

-public class User extends Cmd {

-	private final static String[] options = {"add","del","setTo","extend"};

-	public User(Role parent) {

-		super(parent,"user", 

-				new Param(optionsToString(options),true),

-				new Param("role",true),

-				new Param("id[,id]* (not required for setTo)",false)); 

-	}

-

-	@Override

-	public int _exec(final int index, final String ... args) throws CadiException, APIException, LocatorException {

-		return same(new Retryable<Integer>() {

-			@Override

-			public Integer code(Rcli<?> client) throws CadiException, APIException {

-				int idx = index;

-				String realm = getOrgRealm();

-				String action = args[idx++];

-				int option = whichOption(options, action);

-				UserRoleRequest urr = new UserRoleRequest();

-				urr.setRole(args[idx++]);

-				// Set Start/End commands

-				setStartEnd(urr);

-				

-				Future<?> fp = null;

-				

-				if (option != 2) {

-					String[] ids = args[idx++].split(",");

-					String verb=null,participle=null;

-					// You can request to be added or removed from role.

-					setQueryParamsOn(client);

-

-					for(String id: ids) {

-						if (id.indexOf('@') < 0 && realm != null) id += '@' + realm;

-						urr.setUser(id);

-						switch(option) {

-							case 0:

-								fp = client.create(

-										"/authz/userRole", 

-										getDF(UserRoleRequest.class), 

-										urr);

-								verb = "Added";

-								participle = "] to Role [" ;

-								break;

-							case 1:

-								fp = client.delete(

-										"/authz/userRole/"+urr.getUser()+'/'+urr.getRole(), 

-										Void.class);

-								verb = "Removed";

-								participle = "] from Role [" ;

-								break;

-						    case 3:

-								fp = client.update("/authz/userRole/extend/" + urr.getUser() + '/' + urr.getRole());

-								verb = "Extended";

-								participle = "] in Role [" ;

-								break;

-

-							default: // actually, should never get here...

-								throw new CadiException("Invalid action [" + action + ']');

-						}

-						if(fp.get(AAFcli.timeout())) {

-							pw().print(verb);

-							pw().print(" User [");

-							pw().print(urr.getUser());

-							pw().print(participle);

-							pw().print(urr.getRole());

-							pw().println(']');

-						} else {

-							switch(fp.code()) {

-								case 202:

-									pw().print("User Role ");

-									pw().print(action);

-									pw().println(" is Accepted, but requires Approvals before actualizing");

-									break;

-								case 404:

-									if(option==3) {

-										pw().println("Failed with code 404: UserRole is not found, or you do not have permission to view");

-										break;

-									}

-								default:

-									error(fp);

-							}

-						}

-					}

-				} else {

-					String allUsers = "";

-					if (idx < args.length) 

-						allUsers = args[idx++];

-					StringBuilder finalUsers = new StringBuilder();	

-					for (String u : allUsers.split(",")) {

-						if (u != "") {

-							if (u.indexOf('@') < 0 && realm != null) u += '@' + realm;

-							if (finalUsers.length() > 0) finalUsers.append(",");

-							finalUsers.append(u);

-						}

-					}

-

-					urr.setUser(finalUsers.toString());

-					fp = client.update(

-							"/authz/userRole/role", 

-							getDF(UserRoleRequest.class), 

-							urr);

-					if(fp.get(AAFcli.timeout())) {

-						pw().println("Set the Role to Users [" + allUsers + "]");

-					} else {

-						error(fp);

-					}		

-				}

-				return fp==null?0:fp.code();

-			}

-		});

-	}

-	

-	@Override

-	public void detailedHelp(int indent, StringBuilder sb) {

-		detailLine(sb,indent,"Add OR Delete a User to/from a Role OR");

-		detailLine(sb,indent,"Set a User's Roles to the roles supplied");

-		detailLine(sb,indent+2,"role  - Name of Role to create");

-		detailLine(sb,indent+2,"id(s) - ID or IDs to add to the Role");

-		sb.append('\n');

-		detailLine(sb,indent+2,"Note: this is the same as \"user role add...\" except allows");

-		detailLine(sb,indent+2,"assignment of role to multiple userss");

-		detailLine(sb,indent+2,"WARNING: Users supplied with setTo will be the ONLY users attached to this role");

-		detailLine(sb,indent+2,"If no users are supplied, the users attached to this role are reset.");

-		api(sb,indent,HttpMethods.POST,"authz/userRole",UserRoleRequest.class,true);

-		api(sb,indent,HttpMethods.DELETE,"authz/userRole/<user>/<role>",Void.class,false);

-		api(sb,indent,HttpMethods.PUT,"authz/userRole/<role>",UserRoleRequest.class,false);

-	}

-

-}