@@ -147,6 +147,18 @@ openshift start \

   --etcd-dir="${ETCD_DATA_DIR}" \

   --images="${USE_IMAGES}"

+# validate config that was generated

+[ "$(openshift ex validate master-config ${MASTER_CONFIG_DIR}/master-config.yaml 2>&1 | grep SUCCESS)" ]

+[ "$(openshift ex validate node-config ${NODE_CONFIG_DIR}/node-config.yaml 2>&1 | grep SUCCESS)" ]

+# breaking the config fails the validation check

+cp ${MASTER_CONFIG_DIR}/master-config.yaml ${TEMP_DIR}/master-config-broken.yaml

+sed -i '5,10d' ${TEMP_DIR}/master-config-broken.yaml

+[ "$(openshift ex validate master-config ${TEMP_DIR}/master-config-broken.yaml 2>&1 | grep error)" ]

+

+cp ${NODE_CONFIG_DIR}/node-config.yaml ${TEMP_DIR}/node-config-broken.yaml

+sed -i '5,10d' ${TEMP_DIR}/node-config-broken.yaml

+[ "$(openshift ex validate node-config ${TEMP_DIR}/node-config-broken.yaml 2>&1 | grep ERROR)" ]

+echo "validation: ok"

 # Don't try this at home.  We don't have flags for setting etcd ports in the config, but we want deconflicted ones.  Use sed to replace defaults in a completely unsafe way

 sed -i "s/:4001$/:${ETCD_PORT}/g" ${SERVER_CONFIG_DIR}/master/master-config.yaml

new file mode 100644

@@ -0,0 +1,16 @@

+package admin

+

+const (

+	BashCompletionFunc = `

+__custom_func() {

+    case ${last_command} in

+        oadm_validate_master-config | oadm_validate_node-config)

+            _filedir

+            return

+            ;;

+        *)

+            ;;

+    esac

+}

+`

+)

new file mode 100644

@@ -0,0 +1,176 @@

+package validate

+

+import (

+	"errors"

+	"fmt"

+	"io"

+	"os"

+	"text/tabwriter"

+

+	"github.com/spf13/cobra"

+

+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

+	"k8s.io/kubernetes/pkg/util/fielderrors"

+

+	configapilatest "github.com/openshift/origin/pkg/cmd/server/api/latest"

+	"github.com/openshift/origin/pkg/cmd/server/api/validation"

+)

+

+const (

+	ValidateMasterConfigRecommendedName = "master-config"

+

+	validateMasterConfigLong = `

+Validate the configuration file for a master server.

+

+This command validates that a configuration file intended to be used for a master server is valid.

+`

+

+	validateMasterConfigExample = ` // Validate master server configuration file

+  $ %s openshift.local.config/master/master-config.yaml`

+)

+

+type ValidateMasterConfigOptions struct {

+	// MasterConfigFile is the location of the config file to be validated

+	MasterConfigFile string

+

+	// Out is the writer to write output to

+	Out io.Writer

+}

+

+// NewCommandValidateMasterConfig provides a CLI handler for the `validate all-in-one` command

+func NewCommandValidateMasterConfig(name, fullName string, out io.Writer) *cobra.Command {

+	options := &ValidateMasterConfigOptions{

+		Out: out,

+	}

+

+	cmd := &cobra.Command{

+		Use:     fmt.Sprintf("%s SOURCE", name),

+		Short:   "Validate the configuration file for a master server",

+		Long:    validateMasterConfigLong,

+		Example: fmt.Sprintf(validateMasterConfigExample, fullName),

+		Run: func(c *cobra.Command, args []string) {

+			if err := options.Complete(args); err != nil {

+				cmdutil.CheckErr(cmdutil.UsageError(c, err.Error()))

+			}

+

+			ok, err := options.Run()

+			cmdutil.CheckErr(err)

+			if !ok {

+				fmt.Fprintf(options.Out, "FAILURE: Validation failed for file: %s\n", options.MasterConfigFile)

+				os.Exit(1)

+			}

+

+			fmt.Fprintf(options.Out, "SUCCESS: Validation succeded for file: %s\n", options.MasterConfigFile)

+		},

+	}

+

+	return cmd

+}

+

+func (o *ValidateMasterConfigOptions) Complete(args []string) error {

+	if len(args) != 1 {

+		return errors.New("exactly one source file is required")

+	}

+	o.MasterConfigFile = args[0]

+	return nil

+}

+

+// Run runs the master config validation and returns the result of the validation as a boolean as well as any errors

+// that occured trying to validate the file

+func (o *ValidateMasterConfigOptions) Run() (bool, error) {

+	masterConfig, err := configapilatest.ReadAndResolveMasterConfig(o.MasterConfigFile)

+	if err != nil {

+		return true, err

+	}

+

+	results := validation.ValidateMasterConfig(masterConfig)

+	writer := tabwriter.NewWriter(o.Out, minColumnWidth, tabWidth, padding, padchar, flags)

+	err = prettyPrintValidationResults(results, writer)

+	if err != nil {

+		return len(results.Errors) == 0, fmt.Errorf("could not print results: %v", err)

+	}

+	writer.Flush()

+	return len(results.Errors) == 0, nil

+}

+

+const (

+	minColumnWidth          = 4

+	tabWidth                = 4

+	padding                 = 2

+	padchar                 = byte(' ')

+	flags                   = 0

+	validationErrorHeadings = "ERROR\tFIELD\tVALUE\tDETAILS\n"

+)

+

+// prettyPrintValidationResults prints the contents of the ValidationResults into the buffer of a tabwriter.Writer.

+// The writer must be Flush()ed after calling this to write the buffered data.

+func prettyPrintValidationResults(results validation.ValidationResults, writer *tabwriter.Writer) error {

+	if len(results.Errors) > 0 {

+		fmt.Fprintf(writer, "VALIDATION ERRORS:\t\t\t\n")

+		err := prettyPrintValidationErrorList(results.Errors, writer)

+		if err != nil {

+			return err

+		}

+	}

+	if len(results.Warnings) > 0 {

+		fmt.Fprintf(writer, "VALIDATION WARNINGS:\t\t\t\n")

+		err := prettyPrintValidationErrorList(results.Errors, writer)

+		if err != nil {

+			return err

+		}

+	}

+	return nil

+}

+

+// prettyPrintValidationErrorList prints the contents of the ValidationErrorList into the buffer of a tabwriter.Writer.

+// The writer must be Flush()ed after calling this to write the buffered data.

+func prettyPrintValidationErrorList(validationErrors fielderrors.ValidationErrorList, writer *tabwriter.Writer) error {

+	if len(validationErrors) > 0 {

+		fmt.Fprintf(writer, validationErrorHeadings)

+		for _, err := range validationErrors {

+			switch validationError := err.(type) {

+			case (*fielderrors.ValidationError):

+				err := prettyPrintValidationError(validationError, writer)

+				if err != nil {

+					return err

+				}

+			default:

+				// This is not a validation error but we can grab the error message for details nonetheless

+				err := prettyPrintGenericError(validationError, writer)

+				if err != nil {

+					return err

+				}

+			}

+		}

+	}

+	return nil

+}

+

+// prettyPrintValidationError prints the contents of the ValidationError into the buffer of a tabwriter.Writer.

+// The writer must be Flush()ed after calling this to write the buffered data.

+func prettyPrintValidationError(validationError *fielderrors.ValidationError, writer *tabwriter.Writer) error {

+	_, printError := fmt.Fprintf(writer, "%s\t%s\t%s\t%s\n",

+		toString(validationError.Type),

+		validationError.Field,

+		toString(validationError.BadValue),

+		validationError.Detail)

+

+	return printError

+}

+

+const missingValue = "<none>"

+

+func toString(v interface{}) string {

+	value := fmt.Sprintf("%v", v)

+	if len(value) == 0 {

+		value = missingValue

+	}

+	return value

+}

+

+// prettyPrintGenericError prints the contents of the generic error into the buffer of a tabwriter.Writer.

+// The writer must be Flush()ed after calling this to write the buffered data.

+func prettyPrintGenericError(err error, writer *tabwriter.Writer) error {

+	_, printError := fmt.Fprintf(writer, "\t\t\t%s\n", err.Error())

+	return printError

+}

new file mode 100644

@@ -0,0 +1,93 @@

+package validate

+

+import (

+	"errors"

+	"fmt"

+	"io"

+	"os"

+	"text/tabwriter"

+

+	"github.com/spf13/cobra"

+

+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

+

+	configapilatest "github.com/openshift/origin/pkg/cmd/server/api/latest"

+	"github.com/openshift/origin/pkg/cmd/server/api/validation"

+)

+

+const (

+	ValidateNodeConfigRecommendedName = "node-config"

+

+	validateNodeConfigLong = `

+Validate the configuration file for a node.

+

+This command validates that a configuration file intended to be used for a node is valid.

+`

+

+	valiateNodeConfigExample = ` // Validate node configuration file

+  $ %s openshift.local.config/master/node-config.yaml`

+)

+

+type ValidateNodeConfigOptions struct {

+	// NodeConfigFile is the location of the config file to be validated

+	NodeConfigFile string

+

+	// Out is the writer to write output to

+	Out io.Writer

+}

+

+// NewCommandValidateMasterConfig provides a CLI handler for the `validate all-in-one` command

+func NewCommandValidateNodeConfig(name, fullName string, out io.Writer) *cobra.Command {

+	options := &ValidateNodeConfigOptions{

+		Out: out,

+	}

+

+	cmd := &cobra.Command{

+		Use:     fmt.Sprintf("%s SOURCE", name),

+		Short:   "Validate the configuration file for a node",

+		Long:    validateNodeConfigLong,

+		Example: fmt.Sprintf(valiateNodeConfigExample, fullName),

+		Run: func(c *cobra.Command, args []string) {

+			if err := options.Complete(args); err != nil {

+				cmdutil.CheckErr(cmdutil.UsageError(c, err.Error()))

+			}

+

+			ok, err := options.Run()

+			cmdutil.CheckErr(err)

+			if !ok {

+				fmt.Fprintf(options.Out, "FAILURE: Validation failed for file: %s\n", options.NodeConfigFile)

+				os.Exit(1)

+			}

+

+			fmt.Fprintf(options.Out, "SUCCESS: Validation succeded for file: %s\n", options.NodeConfigFile)

+		},

+	}

+

+	return cmd

+}

+

+func (o *ValidateNodeConfigOptions) Complete(args []string) error {

+	if len(args) != 1 {

+		return errors.New("exactly one source file is required")

+	}

+	o.NodeConfigFile = args[0]

+	return nil

+}

+

+// Run runs the node config validation and returns the result of the validation as a boolean as well as any errors

+// that occured trying to validate the file

+func (o *ValidateNodeConfigOptions) Run() (ok bool, err error) {

+	nodeConfig, err := configapilatest.ReadAndResolveNodeConfig(o.NodeConfigFile)

+	if err != nil {

+		return true, err

+	}

+

+	results := validation.ValidateNodeConfig(nodeConfig)

+	writer := tabwriter.NewWriter(o.Out, minColumnWidth, tabWidth, padding, padchar, flags)

+	err = prettyPrintValidationErrorList(results, writer)

+	if err != nil {

+		return len(results) == 0, fmt.Errorf("could not print results: %v", err)

+	}

+	writer.Flush()

+	return len(results) == 0, nil

+}

new file mode 100644

@@ -0,0 +1,32 @@

+package validate

+

+import (

+	"io"

+

+	"github.com/spf13/cobra"

+

+	cmdutil "github.com/openshift/origin/pkg/cmd/util"

+)

+

+const ValidateRecommendedName = "validate"

+

+const validateLong = `Validate configuration file integrity

+

+The commands here allow administrators to validate the integrity of configuration files.

+`

+

+func NewCommandValidate(name, fullName string, out io.Writer) *cobra.Command {

+	// Parent command to which all subcommands are added.

+	cmds := &cobra.Command{

+		Use:   name,

+		Short: "Validate configuration file integrity",

+		Long:  validateLong,

+		Run:   cmdutil.DefaultSubCommandRun(out),

+	}

+

+	cmds.AddCommand(NewCommandValidateMasterConfig(ValidateMasterConfigRecommendedName,

+		fullName+" "+ValidateMasterConfigRecommendedName, out))

+	cmds.AddCommand(NewCommandValidateNodeConfig(ValidateNodeConfigRecommendedName,

+		fullName+" "+ValidateNodeConfigRecommendedName, out))

+	return cmds

+}

@@ -9,6 +9,7 @@ import (

 	"github.com/spf13/cobra"

 	"github.com/openshift/origin/pkg/cmd/admin"

+	"github.com/openshift/origin/pkg/cmd/admin/validate"

 	"github.com/openshift/origin/pkg/cmd/cli"

 	"github.com/openshift/origin/pkg/cmd/cli/cmd"

 	"github.com/openshift/origin/pkg/cmd/experimental/buildchain"

@@ -152,10 +153,12 @@ func newExperimentalCommand(name, fullName string) *cobra.Command {

 			c.SetOutput(out)

 			c.Help()

 		},

+		BashCompletionFunction: admin.BashCompletionFunc,

 	}

 	f := clientcmd.New(experimental.PersistentFlags())

+	experimental.AddCommand(validate.NewCommandValidate(validate.ValidateRecommendedName, fullName+" "+validate.ValidateRecommendedName, out))

 	experimental.AddCommand(tokens.NewCmdTokens(tokens.TokenRecommendedCommandName, fullName+" "+tokens.TokenRecommendedCommandName, f, out))

 	experimental.AddCommand(exipfailover.NewCmdIPFailoverConfig(f, fullName, "ipfailover", out))

 	experimental.AddCommand(buildchain.NewCmdBuildChain(name, fullName+" "+buildchain.BuildChainRecommendedCommandName, f, out))

@@ -86,7 +86,7 @@ func ReadYAMLFile(filename string, obj runtime.Object) error {

 		return err

 	}

 	err = Codec.DecodeInto(data, obj)

-	return captureSurroundingJSONForError(fmt.Sprintf("could not load config file %q due to a error: ", filename), data, err)

+	return captureSurroundingJSONForError(fmt.Sprintf("could not load config file %q due to an error: ", filename), data, err)

 }

 // TODO: we ultimately want a better decoder for JSON that allows us exact line numbers and better

@@ -4099,6 +4099,53 @@ _openshift_kube()

     must_have_one_noun=()

 }

+_openshift_ex_validate_master-config()

+{

+    last_command="openshift_ex_validate_master-config"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+}

+

+_openshift_ex_validate_node-config()

+{

+    last_command="openshift_ex_validate_node-config"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+}

+

+_openshift_ex_validate()

+{

+    last_command="openshift_ex_validate"

+    commands=()

+    commands+=("master-config")

+    commands+=("node-config")

+

+    flags=()

+    two_word_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+}

+

 _openshift_ex_tokens_validate-token()

 {

     last_command="openshift_ex_tokens_validate-token"

@@ -4249,6 +4296,7 @@ _openshift_ex()

 {

     last_command="openshift_ex"

     commands=()

+    commands+=("validate")

     commands+=("tokens")

     commands+=("ipfailover")

     commands+=("build-chain")