summaryrefslogtreecommitdiffstats
path: root/auth/auth-gui/src/main/java
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-07-12 11:14:10 -0500
committerInstrumental <jonathan.gathman@att.com>2018-07-12 11:15:07 -0500
commit9ec2895301056a9e8967eadb139e56f03776fe26 (patch)
tree6a25ad45269de5149462c51a020b60e245e18ddd /auth/auth-gui/src/main/java
parentd37b5467a3b8b375b603579d2888a4443a8b06a7 (diff)
Configuration Agent and MS for AAF
Issue-ID: AAF-361 Change-Id: I26f3d49e3d7eae4a932489bd677cf0b903fb7977 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-gui/src/main/java')
-rw-r--r--auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java20
1 files changed, 5 insertions, 15 deletions
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java
index c65e7db5..7cd79dab 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/CMArtiChangeForm.java
@@ -61,7 +61,7 @@ public class CMArtiChangeForm extends Page {
static final String NAME = "ArtifactChange";
static final String fields[] = {"id","machine","ns","directory","ca","osuser","renewal","notify","cmd","others","types[]","sans"};
- static final String types[] = {"jks","file","script"};
+ static final String types[] = {"pkcs12","jks","file","script"};
static final String UPDATE = "Update";
static final String CREATE = "Create";
static final String COPY = "Copy";
@@ -169,7 +169,7 @@ public class CMArtiChangeForm extends Page {
arti.setRenewDays(30);
arti.setNotification("mailto:"+user.email());
arti.getType().add(types[0]);
- arti.getType().add(types[2]);
+ arti.getType().add(types[3]);
submitText = CREATE;
delete = false;
} else {
@@ -179,24 +179,14 @@ public class CMArtiChangeForm extends Page {
arti.setNotification("mailto:"+user.email());
}
}
- // CSO Approval no longer required for SAN use
-// final String mechID = arti.getMechid();
-// boolean maySans=gui.lur.fish(new Principal() {
-// @Override
-// public String getName() {
-// return mechID;
-// }},getPerm(arti.getCa(),"san"));
-// if(!maySans) {
-// arti.getSans().clear();
-// }
Mark table = new Mark(TABLE);
hgen.incr(table)
- .input(fields[0],"MechID*",true,"value="+arti.getMechid())
+ .input(fields[0],"AppID*",true,"value="+arti.getMechid())
.input("sponsor", "Sponsor",false,"value="+arti.getSponsor(),"readonly","style=border:none;background-color:white;")
- .input(fields[1],"Machine*",true,"value="+arti.getMachine(),"style=width:130%;");
+ .input(fields[1],"FQDN*",true,"value="+arti.getMachine(),"style=width:130%;");
// if(maySans) {
hgen.incr(HTMLGen.TR).incr(HTMLGen.TD).end()
- .incr(HTMLGen.TD,"class=subtext").text("Use full machine names, ");
+ .incr(HTMLGen.TD,"class=subtext").text("Use Fully Qualified Domain Names (that will be in DNS), ");
if(!trans.fish(getPerm(arti.getCa(),"ip"))) {
hgen.text("NO ");
}